Another merge with master.

Change Doxygen error codes to start at 740 instead of at 720 as the latter was taken by Scilab in the meanwhile. Resolve conflicts in autodoc_runme.py once again.
swig · Feb 16, 2015 · 300ccce · 300ccce
2 parents b7160d9 + 9842bad
commit 300ccce
Show file tree

Hide file tree

Showing 419 changed files with 18,684 additions and 1,324 deletions.
diff --git a/.gitignore b/.gitignore
@@ -67,6 +67,7 @@ CCache/config.h
 CCache/config.log
 CCache/config.status
 Examples/Makefile
+Examples/d/example.mk
 Examples/guile/Makefile
 Examples/test-suite/*/Makefile
 Examples/xml/Makefile
@@ -121,16 +122,29 @@ Examples/test-suite/pike/*/
 Examples/test-suite/python/*/
 Examples/test-suite/r/*/
 Examples/test-suite/ruby/*/
+Examples/test-suite/scilab/*/
 Examples/test-suite/tcl/*/
 Examples/test-suite/uffi/*/
 *_wrap.c
 *_wrap.cxx
 *-gypcopy.cxx
 
+# Scratch directories
+Examples/scratch
+
+# Out of source tree build directories
+*build*/
+
+########## Language specific files ##########
+
 # C# generated files
 *_runme.exe.mdb
 *_runme.exe
 
+# Go generated files
+*.[5689]
+*_gc.c
+
 # Javascript generated files
 *.gyp
 
@@ -144,12 +158,6 @@ Examples/test-suite/octave/*.oct
 */__pycache__/
 /__pycache__/
 
-# Go generated files
-*.[5689]
-*_gc.c
+# Scilab generated files
+loader.sce
 
-# Scratch directories
-Examples/scratch
-
-# Out of source tree build directories
-*build*/
diff --git a/.travis.yml b/.travis.yml
@@ -50,12 +50,21 @@ matrix:
       env: SWIGLANG=python SWIG_FEATURES=-builtin
     - compiler: gcc
       env: SWIGLANG=python SWIG_FEATURES=-builtin PY3=3
+    - compiler: gcc
+      env: SWIGLANG=python SWIG_FEATURES=-classic
     - compiler: gcc
       env: SWIGLANG=ruby
+    - compiler: gcc
+      env: SWIGLANG=scilab
     - compiler: gcc
       env: SWIGLANG=tcl
   allow_failures:
-    # None
+    # Occasional gcc internal compiler error
+    - compiler: gcc
+      env: SWIGLANG=octave SWIGJOBS=-j3 VER=3.8
+    # Not quite working yet
+    - compiler: gcc
+      env: SWIGLANG=python SWIG_FEATURES=-classic
 before_install:
   - date -u
   - uname -a
@@ -77,40 +86,13 @@ before_install:
   - if test "$SWIGLANG" = "python"; then git clone https://github.com/jcrocholl/pep8.git && pushd pep8 && git checkout tags/1.5.7 && python ./setup.py build && sudo python ./setup.py install && popd; fi
   - if test "$SWIGLANG" = "python" -a "$PY3" -a -z "$VER"; then sudo apt-get install -qq python3-dev; fi
   - if test "$SWIGLANG" = "python" -a "$VER"; then sudo add-apt-repository -y ppa:fkrull/deadsnakes && sudo apt-get -qq update && sudo apt-get -qq install python${VER}-dev && export CONFIGOPTS="--with-python${PY3}=python${VER}"; fi
+  - if test "$SWIGLANG" = "scilab"; then sudo apt-get -qq install scilab; fi
   - if test "$SWIGLANG" = "tcl"; then sudo apt-get -qq install tcl8.4-dev; fi
-  # Stricter compile flags for examples. Various headers and SWIG generated code prevents full use of -pedantic.
-  - declare -A CFLAGS_EXAMPLES && CFLAGS_EXAMPLES=(
-        ["csharp"]="-Werror -std=gnu89 -fdiagnostics-show-option -Wno-long-long -Wreturn-type"
-             ["d"]="-Werror -std=gnu89 -fdiagnostics-show-option -Wno-long-long -Wreturn-type"
-            ["go"]="-Werror -std=gnu89 -fdiagnostics-show-option -Wno-long-long -Wreturn-type"
-         ["guile"]="-Werror -std=gnu89 -fdiagnostics-show-option -Wno-long-long -Wreturn-type"
-          ["java"]="-Werror -std=gnu89 -fdiagnostics-show-option -pedantic -Wno-long-long -Wreturn-type"
-    ["javascript"]="-Werror -std=gnu89 -fdiagnostics-show-option -pedantic -Wno-long-long -Wreturn-type"
-           ["lua"]="-Werror -std=gnu89 -fdiagnostics-show-option -pedantic -Wno-long-long -Wreturn-type"
-        ["octave"]="-Werror -std=gnu89 -fdiagnostics-show-option -pedantic -Wno-long-long -Wreturn-type"
-         ["perl5"]="-Werror -std=gnu89 -fdiagnostics-show-option -Wno-long-long -Wreturn-type"
-           ["php"]="-Werror -std=gnu89 -fdiagnostics-show-option -Wno-long-long -Wreturn-type"
-        ["python"]="-Werror -std=gnu89 -fdiagnostics-show-option -Wno-long-long -Wreturn-type"
-          ["ruby"]="-Werror -std=gnu89 -fdiagnostics-show-option -Wno-long-long -Wreturn-type"
-           ["tcl"]="-Werror -std=gnu89 -fdiagnostics-show-option -Wno-long-long -Wreturn-type"
-    )
-  - declare -A CXXFLAGS_EXAMPLES && CXXFLAGS_EXAMPLES=(
-        ["csharp"]="-Werror -std=c++98 -fdiagnostics-show-option -pedantic -Wno-long-long -Wreturn-type"
-             ["d"]="-Werror -std=c++98 -fdiagnostics-show-option -pedantic -Wno-long-long -Wreturn-type"
-            ["go"]="-Werror -std=c++98 -fdiagnostics-show-option -pedantic -Wno-long-long -Wreturn-type"
-         ["guile"]="-Werror -std=c++98 -fdiagnostics-show-option -Wno-long-long -Wreturn-type"
-          ["java"]="-Werror -std=c++98 -fdiagnostics-show-option -pedantic -Wno-long-long -Wreturn-type"
-    ["javascript"]="-Werror -std=c++98 -fdiagnostics-show-option -pedantic -Wno-long-long -Wreturn-type"
-           ["lua"]="-Werror -std=c++98 -fdiagnostics-show-option -pedantic -Wno-long-long -Wreturn-type"
-        ["octave"]="-Werror -std=c++98 -fdiagnostics-show-option -Wno-long-long -Wreturn-type"
-         ["perl5"]="-Werror -std=c++98 -fdiagnostics-show-option -Wno-long-long -Wreturn-type"
-           ["php"]="-Werror -std=c++98 -fdiagnostics-show-option -pedantic -Wno-long-long -Wreturn-type"
-        ["python"]="-Werror -std=c++98 -fdiagnostics-show-option -pedantic -Wno-long-long -Wreturn-type"
-          ["ruby"]="-Werror -std=c++98 -fdiagnostics-show-option -pedantic -Wno-long-long -Wreturn-type"
-           ["tcl"]="-Werror -std=c++98 -fdiagnostics-show-option -Wno-long-long -Wreturn-type"
-    )
   - $CC --version
   - $CXX --version
+  # Stricter compile flags for examples. Various headers and SWIG generated code prevents full use of -pedantic.
+  - export cflags=$(./testflags.py --language $SWIGLANG --cflags) && echo $cflags
+  - export cxxflags=$(./testflags.py --language $SWIGLANG --cxxflags) && echo $cxxflags
 script:
   - echo 'Configuring...' && echo -en 'travis_fold:start:script.1\\r'
   - ./autogen.sh && mkdir -p build/build && cd build/build && ../../configure $CONFIGOPTS
@@ -123,11 +105,12 @@ script:
   - if test -z "$SWIGLANG"; then sudo make -s install && swig -version && ccache-swig -V; fi
   - echo -en 'travis_fold:end:script.2\\r'
   - if test -n "$SWIGLANG"; then make -s check-$SWIGLANG-version; fi
-  - if test -n "$SWIGLANG"; then make -k $SWIGJOBS check-$SWIGLANG-examples CFLAGS="${CFLAGS_EXAMPLES[$SWIGLANG]}" CXXFLAGS="${CXXFLAGS_EXAMPLES[$SWIGLANG]}"; fi
-  - if test -n "$SWIGLANG"; then make -k $SWIGJOBS check-$SWIGLANG-test-suite; fi
+  - if test -n "$SWIGLANG"; then make $SWIGJOBS check-$SWIGLANG-examples CFLAGS="$cflags" CXXFLAGS="$cxxflags"; fi
+  - if test -n "$SWIGLANG"; then make $SWIGJOBS check-$SWIGLANG-test-suite CFLAGS="$cflags" CXXFLAGS="$cxxflags"; fi
   - echo 'Cleaning...' && echo -en 'travis_fold:start:script.3\\r'
   - make check-maintainer-clean && ../../configure $CONFIGOPTS
   - echo -en 'travis_fold:end:script.3\\r'
 branches:
   only:
     - master
+    - error-declaration-after-statement
diff --git a/ANNOUNCE b/ANNOUNCE
@@ -1,8 +1,8 @@
-*** ANNOUNCE: SWIG 3.0.3 (in progress) ***
+*** ANNOUNCE: SWIG 3.0.6 (in progress) ***
 
 http://www.swig.org
 
-We're pleased to announce SWIG-3.0.3, the latest SWIG release.
+We're pleased to announce SWIG-3.0.6, the latest SWIG release.
 
 What is SWIG?
 =============
@@ -11,21 +11,22 @@ SWIG is a software development tool that reads C/C++ header files and
 generates the wrapper code needed to make C and C++ code accessible
 from other programming languages including Perl, Python, Tcl, Ruby,
 PHP, C#, Go, Java, Javascript, Lua, Scheme (Guile, MzScheme, CHICKEN),
-D, Ocaml, Pike, Modula-3, Octave, R, Common Lisp (CLISP, Allegro CL,
-CFFI, UFFI).  SWIG can also export its parse tree in the form of XML
-and Lisp s-expressions.  Major applications of SWIG include generation
-of scripting language extension modules, rapid prototyping, testing,
-and user interface development for large C/C++ systems.
+D, Ocaml, Pike, Modula-3, Octave, R, Scilab, Common Lisp (CLISP,
+Allegro CL, CFFI, UFFI).  SWIG can also export its parse tree in
+the form of XML and Lisp s-expressions.  Major applications of SWIG
+include generation of scripting language extension modules, rapid
+prototyping, testing, and user interface development for large
+C/C++ systems.
 
 Availability
 ============
 The release is available for download on Sourceforge at
 
-     http://prdownloads.sourceforge.net/swig/swig-3.0.3.tar.gz
+     http://prdownloads.sourceforge.net/swig/swig-3.0.6.tar.gz
 
 A Windows version is also available at
 
-     http://prdownloads.sourceforge.net/swig/swigwin-3.0.3.zip
+     http://prdownloads.sourceforge.net/swig/swigwin-3.0.6.zip
 
 Please report problems with this release to the swig-devel mailing list,
 details at http://www.swig.org/mail.html.