diff options
| author | Simon Marchetto <simon.marchetto@scilab-enterprises.com> | 2014-06-06 16:33:16 +0200 |
|---|---|---|
| committer | Simon Marchetto <simon.marchetto@scilab-enterprises.com> | 2014-06-06 16:33:16 +0200 |
| commit | 07b06a408962f129a1c8b54dfc33a7e7c672fc72 (patch) | |
| tree | 961950048a0fd8de33f234bfb34dc3d34818bc57 /.gitignore | |
| parent | 9dda9285eabfcc8c4b4ae4df339ba3fe23224f09 (diff) | |
| parent | ef4cb2f57465025203961a484fd8f7a0a8c9faa7 (diff) | |
| download | swig-07b06a408962f129a1c8b54dfc33a7e7c672fc72.tar.gz | |
Merge branch 'master' into gsoc2012-scilab
Conflicts:
.gitignore
.travis.yml
COPYRIGHT
Examples/Makefile.in
Examples/test-suite/constructor_copy.i
Makefile.in
configure.ac
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore index 63fe6ddc9..ce576445d 100644 --- a/.gitignore +++ b/.gitignore @@ -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*/ |