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
This commit is contained in:
Karl Wette 2017-01-22 11:53:12 +13:00
commit 52455b81d2
3 changed files with 15 additions and 7 deletions

View file

@ -77,13 +77,14 @@ matrix:
dist: trusty dist: trusty
- compiler: gcc - compiler: gcc
os: linux os: linux
env: SWIGLANG=octave SWIGJOBS=-j2 # 3.2 env: SWIGLANG=octave SWIGJOBS=-j2 # 3.8
- compiler: gcc sudo: required
os: linux dist: trusty
env: SWIGLANG=octave SWIGJOBS=-j2 VER=3.8
- compiler: gcc - compiler: gcc
os: linux os: linux
env: SWIGLANG=octave SWIGJOBS=-j2 VER=4.0 env: SWIGLANG=octave SWIGJOBS=-j2 VER=4.0
sudo: required
dist: trusty
- compiler: gcc - compiler: gcc
os: linux os: linux
env: SWIGLANG=perl5 env: SWIGLANG=perl5

View file

@ -64,8 +64,15 @@ Also, there are a dozen or so examples in the Examples/octave directory, and hun
<p> <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. SWIG is regularly tested against the following versions of Octave: 3.8, 4.0.
Use of older Octave versions is not recommended, as these versions are no longer tested with SWIG. </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. The SWIG runtime exports the function <tt>swig_octave_prereq()</tt> for checking the version of Octave.
</p> </p>

View file

@ -64,7 +64,7 @@ case "$SWIGLANG" in
;; ;;
"octave") "octave")
if [[ -z "$VER" ]]; then if [[ -z "$VER" ]]; then
sudo apt-get -qq install octave3.2 octave3.2-headers sudo apt-get -qq install liboctave-dev
else else
sudo add-apt-repository -y ppa:kwwette/octaves sudo add-apt-repository -y ppa:kwwette/octaves
sudo apt-get -qq update sudo apt-get -qq update