diff options
| author | Karl Wette <karl.wette@ligo.org> | 2017-01-22 11:53:12 +1300 |
|---|---|---|
| committer | Karl Wette <karl.wette@ligo.org> | 2017-01-22 11:53:12 +1300 |
| commit | 52455b81d2018dad46eae587be1c7ddfd35750c4 (patch) | |
| tree | c6b94b4afefffaee7e8b782856bf5b37de5f2040 | |
| parent | c238036448d469660b6dc3f52f080250b808519d (diff) | |
| download | swig-52455b81d2018dad46eae587be1c7ddfd35750c4.tar.gz | |
Octave: move Travis build over to trusty
- trusty has Octave version 3.8
- ppa:kwwette/octaves has Octave version 4.0
- Update Doc/Manual/Octave.html
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | Doc/Manual/Octave.html | 11 | ||||
| -rwxr-xr-x | Tools/travis-linux-install.sh | 2 |
3 files changed, 15 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index d9dc92312..7e4aac3ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -77,13 +77,14 @@ matrix: dist: trusty - compiler: gcc os: linux - env: SWIGLANG=octave SWIGJOBS=-j2 # 3.2 - - compiler: gcc - os: linux - env: SWIGLANG=octave SWIGJOBS=-j2 VER=3.8 + env: SWIGLANG=octave SWIGJOBS=-j2 # 3.8 + sudo: required + dist: trusty - compiler: gcc os: linux env: SWIGLANG=octave SWIGJOBS=-j2 VER=4.0 + sudo: required + dist: trusty - compiler: gcc os: linux env: SWIGLANG=perl5 diff --git a/Doc/Manual/Octave.html b/Doc/Manual/Octave.html index 4245d8a8e..2bc590e3b 100644 --- a/Doc/Manual/Octave.html +++ b/Doc/Manual/Octave.html @@ -64,8 +64,15 @@ Also, there are a dozen or so examples in the Examples/octave directory, and hun <p> -As of SWIG 3.0.7, the Octave module is regularly tested with Octave versions 3.2.4, 3.8.1, and 4.0.0. -Use of older Octave versions is not recommended, as these versions are no longer tested with SWIG. +SWIG is regularly tested against the following versions of Octave: 3.8, 4.0. +</p> + +<p> +Every effort is made to maintain backward compatibility with older versions of Octave. +This cannot be guaranteed however, as in recent times new Octave releases have required nontrivial updates to SWIG, which may break backward compatibility for older Octave versions against which SWIG is not regularly tested. +</p> + +<p> The SWIG runtime exports the function <tt>swig_octave_prereq()</tt> for checking the version of Octave. </p> diff --git a/Tools/travis-linux-install.sh b/Tools/travis-linux-install.sh index 95a88f0ac..2510a791f 100755 --- a/Tools/travis-linux-install.sh +++ b/Tools/travis-linux-install.sh @@ -64,7 +64,7 @@ case "$SWIGLANG" in ;; "octave") if [[ -z "$VER" ]]; then - sudo apt-get -qq install octave3.2 octave3.2-headers + sudo apt-get -qq install liboctave-dev else sudo add-apt-repository -y ppa:kwwette/octaves sudo apt-get -qq update |