Merge pull request #148 from swig-fortran/merge-upstream

Merge upstream SWIG

Author: sethrj

.gitignore

@@ -169,7 +169,7 @@ Examples/test-suite/javascript/*/
 # OCaml
 Examples/test-suite/ocaml/*.ml*
 Examples/test-suite/ocaml/*.cm*
-Examples/test-suite/ocaml/runme
+Examples/test-suite/ocaml/*_runme
 !Examples/test-suite/ocaml/*runme.ml
 Examples/ocaml/**/example.ml*
 Examples/ocaml/**/runme
@@ -201,13 +201,15 @@ Examples/php/*/example.php
 /__pycache__/
 Examples/test-suite/python/*.py
 !Examples/test-suite/python/*runme.py
-Examples/python/**/example.py
 Examples/python/**/bar.py
 Examples/python/**/base.py
+Examples/python/**/example.py
 Examples/python/**/foo.py
-Examples/python/**/spam.py
 Examples/python/**/robin.py
+Examples/python/**/runme3.py
+Examples/python/**/spam.py
 Examples/python/import_packages/module_is_init/pkg1/__init__.py
+Examples/python/import_packages/namespace_pkg/path4.zip
 Examples/python/doxygen/example.html
 
 # R

.travis.yml

@@ -2,47 +2,39 @@ language: cpp
 matrix:
   include:
     - compiler: gcc
-      env: SWIGLANG=fortran # Note: C++98
+      env: SWIGLANG=fortran
       sudo: required
-      dist: trusty
+      dist: xenial
     - os: linux
-      env: SWIGLANG=fortran SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1
+      env: SWIGLANG=fortran CPP11=1
       sudo: required
-      dist: trusty
+      dist: xenial
     - os: linux
-      env: SWIGLANG=fortran SWIG_CC=gcc-6 SWIG_CXX=g++-6 CPP14=1
+      env: SWIGLANG=fortran GCC=6 CPP14=1
       sudo: required
-      dist: trusty
+      dist: xenial
     - os: linux
-      env: SWIGLANG=fortran SWIG_CC=gcc-7 SWIG_CXX=g++-7 CPP14=1 FCSTD=f2008
-      sudo: required
-      dist: trusty
-    - compiler: gcc
-      os: linux
-      env: SWIGLANG=java
+      env: SWIGLANG=fortran GCC=9 CPP17=1 FCSTD=f2003
       sudo: required
       dist: xenial
+
 before_install:
   - date -u
   - uname -a
   - if test "$TRAVIS_OS_NAME" = "linux"; then lscpu && cat /proc/cpuinfo | grep "model name" && cat /proc/meminfo | grep MemTotal; fi
   - if test "$TRAVIS_OS_NAME" = "osx"; then sysctl -a | grep brand_string; fi
-    # Travis overrides CC environment with compiler predefined values
-  - if test -n "$SWIG_CC"; then export CC="$SWIG_CC"; fi
-  - if test -n "$SWIG_CXX"; then export CXX="$SWIG_CXX"; fi
+  # Travis overrides CC environment with compiler predefined values
+  - if test -n "$GCC"; then export CC="gcc-$GCC" && export CXX="g++-$GCC"; fi
 install:
   - if test "$TRAVIS_OS_NAME" = "linux"; then source Tools/travis-linux-install.sh; fi
   - if test "$TRAVIS_OS_NAME" = "osx"; then source Tools/travis-osx-install.sh; fi
-  - if test -n "$CPP11"; then CONFIGOPTS+=(--enable-cpp11-testing --without-maximum-compile-warnings "CXXFLAGS=-std=c++11 -Wall -Wextra" "CFLAGS=-std=c11 -Wall -Wextra") && export CSTD=c11 && export CPPSTD=c++11; fi
-  - if test -n "$CPP14"; then CONFIGOPTS+=(--enable-cpp11-testing --without-maximum-compile-warnings "CXXFLAGS=-std=c++14 -Wall -Wextra" "CFLAGS=-std=c11 -Wall -Wextra") && export CSTD=c11 && export CPPSTD=c++14; fi
-  - if test -n "$CPP17"; then CONFIGOPTS+=(--enable-cpp11-testing --without-maximum-compile-warnings "CXXFLAGS=-std=c++17 -Wall -Wextra" "CFLAGS=-std=c17 -Wall -Wextra") && export CSTD=c17 && export CPPSTD=c++17; fi
-  - ls -la $(which $CC)
-  - ls -la $(which $CXX)
-  - $CC --version
-  - $CXX --version
+  - ls -la $(which $CC) $(which $CXX) && $CC --version && $CXX --version
   - if test -n "$FC"; then $FC --version; fi
 script:
   - echo 'Configuring...' && echo -en 'travis_fold:start:script.1\\r'
+  - if test -n "$CPP11"; then CONFIGOPTS+=(--enable-cpp11-testing --without-maximum-compile-warnings "CXXFLAGS=-std=c++11 -Wall -Wextra" "CFLAGS=-std=c11 -Wall -Wextra") && export CSTD=c11 && export CPPSTD=c++11; fi
+  - if test -n "$CPP14"; then CONFIGOPTS+=(--enable-cpp11-testing --without-maximum-compile-warnings "CXXFLAGS=-std=c++14 -Wall -Wextra" "CFLAGS=-std=c11 -Wall -Wextra") && export CSTD=c11 && export CPPSTD=c++14; fi
+  - if test -n "$CPP17"; then CONFIGOPTS+=(--enable-cpp11-testing --without-maximum-compile-warnings "CXXFLAGS=-std=c++17 -Wall -Wextra" "CFLAGS=-std=c17 -Wall -Wextra") && export CSTD=c17 && export CPPSTD=c++17; fi
   - if test -n "$SWIGLANG"; then CONFIGOPTS+=(--without-alllang --with-$WITHLANG); fi
   - echo "${CONFIGOPTS[@]}"
   - ./autogen.sh && mkdir -p build/build && cd build/build && ../../configure "${CONFIGOPTS[@]}"

ANNOUNCE

@@ -1,22 +1,20 @@
-*** ANNOUNCE: SWIG 4.0.0 (in progress) ***
+*** ANNOUNCE: SWIG 4.0.2 (in progress) ***
 
 http://www.swig.org
 
-We're pleased to announce SWIG-4.0.0, the latest SWIG release.
+We're pleased to announce SWIG-4.0.2, the latest SWIG release.
 
 What is SWIG?
 =============
 
 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, 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.
+PHP, C#, Go, Java, Javascript, Lua, Scheme (Guile, MzScheme), D,
+Ocaml, Octave, R, Scilab.  SWIG can also export its parse tree in
+the form of XML.  Major applications of SWIG include generation of
+scripting language extension modules, rapid prototyping, testing,
+and user interface development for large C/C++ systems.
 
 Release Notes
 =============
@@ -27,11 +25,11 @@ Availability
 ============
 The release is available for download on Sourceforge at
 
-     http://prdownloads.sourceforge.net/swig/swig-4.0.0.tar.gz
+     http://prdownloads.sourceforge.net/swig/swig-4.0.2.tar.gz
 
 A Windows version is also available at
 
-     http://prdownloads.sourceforge.net/swig/swigwin-4.0.0.zip
+     http://prdownloads.sourceforge.net/swig/swigwin-4.0.2.zip
 
 Please report problems with this release to the swig-devel mailing list,
 details at http://www.swig.org/mail.html.

CCache/test.sh

@@ -451,14 +451,16 @@ swigtests
 
 if test -z "$NOSOFTLINKSTEST"; then
   testsuite="link"
-  ln -s $CCACHE $COMPILER
-  CCACHE_COMPILE="./$COMPILER"
+  compilername=`basename $COMPILER`
+  ln -s $CCACHE ./$compilername
+  CCACHE_COMPILE="./$compilername"
   basetests
-  rm "./$COMPILER"
-  ln -s $CCACHE $SWIG
-  CCACHE_COMPILE="./$SWIG"
+  rm "./$compilername"
+  compilername=`basename $SWIG`
+  ln -s $CCACHE ./$compilername
+  CCACHE_COMPILE="./$compilername"
   swigtests
-  rm "./$SWIG"
+  rm "./$compilername"
 else
   echo "skipping testsuite link"
 fi