jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into gsoc2012-scilab

Browse source 
Conflicts:
	.gitignore
	.travis.yml
	COPYRIGHT
	Examples/Makefile.in
	Examples/test-suite/constructor_copy.i
	Makefile.in
	configure.ac
This commit is contained in:
Simon Marchetto 2014-06-06 16:33:16 +02:00
commit 07b06a4089
1502 changed files with 46955 additions and 11374 deletions
Download patch file Download diff file Expand all files Collapse all files

34
.gitignore vendored
View file

@ -3,8 +3,10 @@
*.class
# Editor files and various other junk
*.sw?
.*.sw?
*.bak
*.log
.DS_Store
# Local PCRE
pcre
@ -23,6 +25,7 @@ pcre
*.so
*.so.*
*.dylib
*.bundle
# C/C++ static libraries, based on:
# https://github.com/github/gitignore/blob/master/C.gitignore
@ -67,11 +70,11 @@ Examples/Makefile
Examples/guile/Makefile
Examples/test-suite/*/Makefile
Examples/xml/Makefile
Lib/ocaml/swigp4.ml
/Makefile
Source/Include/stamp-h1
Source/Include/swigconfig.h
Source/Makefile
Tools/javascript/Makefile
.deps
config.log
config.status
@ -82,10 +85,14 @@ swig.spec
.dirstamp
CCache/ccache-swig
CCache/ccache-swig.1
CCache/web/ccache-man.html
Lib/swigwarn.swg
Source/CParse/parser.c
Source/CParse/parser.h
Source/eswig
Source/TAGS
swig
Tools/javascript/javascript
# Generated documentation
Doc/Manual/CCache.html
@ -103,6 +110,7 @@ Examples/test-suite/d/*/
Examples/test-suite/go/*/
Examples/test-suite/guile/*/
Examples/test-suite/java/*/
Examples/test-suite/javascript/*/
Examples/test-suite/lua/*/
Examples/test-suite/mzscheme/*/
Examples/test-suite/ocaml/*/
@ -115,11 +123,19 @@ Examples/test-suite/r/*/
Examples/test-suite/ruby/*/
Examples/test-suite/tcl/*/
Examples/test-suite/uffi/*/
*_wrap.c
*_wrap.cxx
*-gypcopy.cxx
# SWIG generated files in examples
Examples/**/*_wrap.c
Examples/**/*_wrap.cxx
Examples/**/*_wrap.cpp
# C# generated files
*_runme.exe.mdb
*_runme.exe
# Javascript generated files
*.gyp
# Octave generated files
swigexample*.oct
# Python generated files, based on:
# https://github.com/github/gitignore/blob/master/Python.gitignore
@ -127,10 +143,6 @@ Examples/**/*_wrap.cpp
*/__pycache__/
/__pycache__/
# C# generated files
*_runme.exe.mdb
*_runme.exe
# Scilab generated files
builder.sce
loader.sce
@ -143,3 +155,5 @@ lib*.hxx
# Scratch directories
Examples/scratch
# Out of source tree build directories
*build*/