Changeset 6688


Ignore:
Timestamp:
Jan 30, 2018 10:29:24 AM (4 years ago)
Author:
clarksm
Message:

Add support for octave series 4

Location:
branches/1.7
Files:
9 added
4 edited

Legend:

Unmodified
Added
Removed
  • branches/1.7/cf/rpLangOctave.m4

    r2298 r6688  
    3434MKOCTFILE2=
    3535MKOCTFILE3=
     36MKOCTFILE4=
    3637
    3738if test "$with_octave" != "no" ; then
     
    4849  OCTAVE_VERSION=`${OCTAVE} -v | grep version | cut -d' ' -f4`
    4950  OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1`
     51  if test "${OCTAVE_VERSION_MAJOR}" == "4" ; then
     52    OCTAVE4=$OCTAVE
     53    MKOCTFILE4=$MKOCTFILE
     54  fi
    5055  if test "${OCTAVE_VERSION_MAJOR}" == "3" ; then
    5156    OCTAVE3=$OCTAVE
     
    7176# not both. 
    7277#
     78
     79# Check if octave4 was designated *in addition* to the installed version.
     80# This can override the default version if they are the same versions.
     81
     82AC_ARG_WITH(
     83    [mkoctfile4],
     84    [AS_HELP_STRING([--with-mkoctfile4[=DIR]],
     85        [path of octave compiler `mkoctfile' @<:@default=no@:>@])],
     86    [],
     87    [with_mkoctfile4=no])
     88
     89if test "$with_mkoctfile4" != "no" ; then
     90  if test "$with_mkoctfile4" = "yes" ; then
     91    AC_PATH_PROG(mkoctfile4, mkoctfile)
     92  else
     93    MKOCTFILE4=$with_mkoctfile4
     94  fi
     95  OCTAVE_VERSION=`${MKOCTFILE4} --version 2>&1 | cut -d' ' -f3`
     96  OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1`
     97fi
    7398
    7499# Check if octave3 was designated *in addition* to the installed version.
  • branches/1.7/configure

    r6227 r6688  
    1414## M4sh Initialization. ##
    1515## -------------------- ##
     16
     17set -x
    1618
    1719# Be more Bourne compatible
     
    676678OCTAVE_VERSION_MAJOR
    677679OCTAVE_VERSION
     680MKOCTFILE4
    678681MKOCTFILE3
    679682MKOCTFILE2
     
    723726mkoctfile2
    724727mkoctfile3
     728mkoctfile4
    725729MKOCTFILE
    726730OCTAVE
     
    831835with_matlab
    832836with_octave
     837with_mkoctfile4
    833838with_mkoctfile3
    834839with_mkoctfile2
     
    14911496  --with-octave=DIR       path of default octave compiler `mkoctfile'
    14921497                          [default=yes]
     1498  --with-mkoctfile4=DIR   path of octave compiler `mkoctfile' [default=no]
    14931499  --with-mkoctfile3=DIR   path of octave compiler `mkoctfile' [default=no]
    14941500  --with-mkoctfile2=DIR   path of octave compiler `mkoctfile' [default=no]
     
    77997805MKOCTFILE2=
    78007806MKOCTFILE3=
     7807MKOCTFILE4=
    78017808
    78027809if test "$with_octave" != "no" ; then
     
    78917898  OCTAVE_VERSION=`${OCTAVE} -v | grep version | cut -d' ' -f4`
    78927899  OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1`
     7900  if test "${OCTAVE_VERSION_MAJOR}" == "4" ; then
     7901    OCTAVE4=$OCTAVE
     7902    MKOCTFILE4=$MKOCTFILE
     7903  fi
    78937904  if test "${OCTAVE_VERSION_MAJOR}" == "3" ; then
    78947905    OCTAVE3=$OCTAVE
     
    79147925# not both.
    79157926#
     7927
     7928# Check if octave4 was designated *in addition* to the installed version.
     7929# This can override the default version if they are the same versions.
     7930
     7931
     7932# Check whether --with-mkoctfile4 was given.
     7933if test "${with_mkoctfile4+set}" = set; then :
     7934  withval=$with_mkoctfile4;
     7935else
     7936  with_mkoctfile4=no
     7937fi
     7938
     7939
     7940if test "$with_mkoctfile4" != "no" ; then
     7941  if test "$with_mkoctfile4" = "yes" ; then
     7942    # Extract the first word of "mkoctfile", so it can be a program name with args.
     7943set dummy mkoctfile; ac_word=$2
     7944{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     7945$as_echo_n "checking for $ac_word... " >&6; }
     7946if ${ac_cv_path_mkoctfile4+:} false; then :
     7947  $as_echo_n "(cached) " >&6
     7948else
     7949  case $mkoctfile4 in
     7950  [\\/]* | ?:[\\/]*)
     7951  ac_cv_path_mkoctfile4="$mkoctfile4" # Let the user override the test with a path.
     7952  ;;
     7953  *)
     7954  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     7955for as_dir in $PATH
     7956do
     7957  IFS=$as_save_IFS
     7958  test -z "$as_dir" && as_dir=.
     7959    for ac_exec_ext in '' $ac_executable_extensions; do
     7960  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     7961    ac_cv_path_mkoctfile4="$as_dir/$ac_word$ac_exec_ext"
     7962    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     7963    break 2
     7964  fi
     7965done
     7966  done
     7967IFS=$as_save_IFS
     7968
     7969  ;;
     7970esac
     7971fi
     7972mkoctfile4=$ac_cv_path_mkoctfile4
     7973if test -n "$mkoctfile4"; then
     7974  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mkoctfile4" >&5
     7975$as_echo "$mkoctfile4" >&6; }
     7976else
     7977  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     7978$as_echo "no" >&6; }
     7979fi
     7980
     7981
     7982  else
     7983    MKOCTFILE4=$with_mkoctfile4
     7984  fi
     7985  OCTAVE_VERSION=`${MKOCTFILE4} --version 2>&1 | cut -d' ' -f3`
     7986  OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1`
     7987fi
    79167988
    79177989# Check if octave3 was designated *in addition* to the installed version.
     
    1021910291
    1022010292
     10293
    1022110294ac_configure_args="--disable-threads --enable-shared"
    1022210295
     
    1022510298
    1022610299
    10227 ac_config_files="$ac_config_files Makefile packages/Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/copy_rappture_examples gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile gui/src/Makefile builder/Makefile builder/pkgIndex.tcl builder/scripts/Makefile tester/Makefile tester/pkgIndex.tcl tester/scripts/Makefile lang/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/octave2/Makefile lang/octave/octave3/Makefile lang/R/Makefile lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/scripts/Makefile lang/tcl/src/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/octave2/Makefile examples/app-fermi/octave/octave3/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/perl/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/app-fermi/R/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/curve/Makefile examples/zoo/drawing/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/group/Makefile examples/zoo/histogram/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/log/Makefile examples/zoo/mesh/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/parallelepiped/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile video/Makefile video/pkgIndex.tcl oldtest/Makefile oldtest/src/Makefile puq/Makefile puq/puq.sh"
     10300ac_config_files="$ac_config_files Makefile packages/Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/copy_rappture_examples gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile gui/src/Makefile builder/Makefile builder/pkgIndex.tcl builder/scripts/Makefile tester/Makefile tester/pkgIndex.tcl tester/scripts/Makefile lang/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/octave2/Makefile lang/octave/octave3/Makefile lang/octave/octave4/Makefile lang/R/Makefile lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/scripts/Makefile lang/tcl/src/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/octave2/Makefile examples/app-fermi/octave/octave3/Makefile examples/app-fermi/octave/octave4/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/perl/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/app-fermi/R/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/curve/Makefile examples/zoo/drawing/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/group/Makefile examples/zoo/histogram/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/log/Makefile examples/zoo/mesh/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/parallelepiped/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile video/Makefile video/pkgIndex.tcl oldtest/Makefile oldtest/src/Makefile puq/Makefile puq/puq.sh"
    1022810301
    1022910302cat >confcache <<\_ACEOF
     
    1095911032    "lang/octave/octave2/Makefile") CONFIG_FILES="$CONFIG_FILES lang/octave/octave2/Makefile" ;;
    1096011033    "lang/octave/octave3/Makefile") CONFIG_FILES="$CONFIG_FILES lang/octave/octave3/Makefile" ;;
     11034    "lang/octave/octave4/Makefile") CONFIG_FILES="$CONFIG_FILES lang/octave/octave4/Makefile" ;;
    1096111035    "lang/R/Makefile") CONFIG_FILES="$CONFIG_FILES lang/R/Makefile" ;;
    1096211036    "lang/ruby/Makefile") CONFIG_FILES="$CONFIG_FILES lang/ruby/Makefile" ;;
     
    1098011054    "examples/app-fermi/octave/octave2/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/octave2/Makefile" ;;
    1098111055    "examples/app-fermi/octave/octave3/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/octave3/Makefile" ;;
     11056    "examples/app-fermi/octave/octave4/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/octave4/Makefile" ;;
    1098211057    "examples/app-fermi/octave/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/Makefile" ;;
    1098311058    "examples/app-fermi/perl/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/perl/Makefile" ;;
  • branches/1.7/configure.in

    r6227 r6688  
    412412AC_SUBST(MKOCTFILE2)
    413413AC_SUBST(MKOCTFILE3)
     414AC_SUBST(MKOCTFILE4)
    414415AC_SUBST(OCTAVE_VERSION)
    415416AC_SUBST(OCTAVE_VERSION_MAJOR)
     
    517518    lang/octave/octave2/Makefile
    518519    lang/octave/octave3/Makefile
     520    lang/octave/octave4/Makefile
    519521    lang/R/Makefile
    520522    lang/ruby/Makefile
     
    538540    examples/app-fermi/octave/octave2/Makefile
    539541    examples/app-fermi/octave/octave3/Makefile
     542    examples/app-fermi/octave/octave4/Makefile
    540543    examples/app-fermi/octave/Makefile
    541544    examples/app-fermi/perl/Makefile
  • branches/1.7/lang/octave/Makefile.in

    r3471 r6688  
    1414MKOCTFILE2      = @MKOCTFILE2@
    1515MKOCTFILE3      = @MKOCTFILE3@
     16MKOCTFILE4      = @MKOCTFILE4@
    1617
    1718LANGS           =
     19ifneq ($(MKOCTFILE4),)
     20  LANGS += octave4
     21endif
    1822ifneq ($(MKOCTFILE3),)
    1923  LANGS += octave3
     
    2327endif
    2428
    25 .PHONY: all install test clean distclean octave2 octave3
     29.PHONY: all install test clean distclean octave2 octave3 octave4
    2630
    2731all:
Note: See TracChangeset for help on using the changeset viewer.