Changeset 6688

Timestamp:

Jan 30, 2018 10:29:24 AM (5 years ago)

Author:

clarksm

Message:

Add support for octave series 4

Location:

branches/1.7

Files:

• cf/rpLangOctave.m4 (modified) (3 diffs)
• configure (modified) (12 diffs)
• configure.in (modified) (3 diffs)
• examples/app-fermi/octave/octave4 (added)
• examples/app-fermi/octave/octave4/Makefile.in (added)
• examples/app-fermi/octave/octave4/fermi.m (added)
• examples/app-fermi/octave/octave4/test (added)
• examples/app-fermi/octave/octave4/test/defaults.xml (added)
• examples/app-fermi/octave/octave4/tool.xml (added)
• lang/octave/Makefile.in (modified) (2 diffs)
• lang/octave/octave4 (added)
• lang/octave/octave4/Makefile.in (added)
• lang/octave/octave4/RpOctaveInterface.h (added)

branches/1.7/cf/rpLangOctave.m4

@@ -34 +34 @@
 MKOCTFILE2=
 MKOCTFILE3=
+MKOCTFILE4=
 
 if test "$with_octave" != "no" ; then
@@ -48 +49 @@
   OCTAVE_VERSION=`${OCTAVE} -v | grep version | cut -d' ' -f4`
   OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1`
+  if test "${OCTAVE_VERSION_MAJOR}" == "4" ; then
+    OCTAVE4=$OCTAVE
+    MKOCTFILE4=$MKOCTFILE
+  fi
   if test "${OCTAVE_VERSION_MAJOR}" == "3" ; then
     OCTAVE3=$OCTAVE
@@ -71 +76 @@
 # not both.  
 #
+
+# Check if octave4 was designated *in addition* to the installed version.
+# This can override the default version if they are the same versions.
+
+AC_ARG_WITH(
+    [mkoctfile4],
+    [AS_HELP_STRING([--with-mkoctfile4[=DIR]],
+        [path of octave compiler `mkoctfile' @<:@default=no@:>@])],
+    [],
+    [with_mkoctfile4=no])
+
+if test "$with_mkoctfile4" != "no" ; then
+  if test "$with_mkoctfile4" = "yes" ; then
+    AC_PATH_PROG(mkoctfile4, mkoctfile)
+  else 
+    MKOCTFILE4=$with_mkoctfile4
+  fi
+  OCTAVE_VERSION=`${MKOCTFILE4} --version 2>&1 | cut -d' ' -f3`
+  OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1`
+fi
 
 # Check if octave3 was designated *in addition* to the installed version.

branches/1.7/configure

@@ -14 +14 @@
 ## M4sh Initialization. ##
 ## -------------------- ##
+
+set -x
 
 # Be more Bourne compatible
@@ -676 +678 @@
 OCTAVE_VERSION_MAJOR
 OCTAVE_VERSION
+MKOCTFILE4
 MKOCTFILE3
 MKOCTFILE2
@@ -723 +726 @@
 mkoctfile2
 mkoctfile3
+mkoctfile4
 MKOCTFILE
 OCTAVE
@@ -831 +835 @@
 with_matlab
 with_octave
+with_mkoctfile4
 with_mkoctfile3
 with_mkoctfile2
@@ -1491 +1496 @@
   --with-octave=DIR       path of default octave compiler `mkoctfile'
                           [default=yes]
+  --with-mkoctfile4=DIR   path of octave compiler `mkoctfile' [default=no]
   --with-mkoctfile3=DIR   path of octave compiler `mkoctfile' [default=no]
   --with-mkoctfile2=DIR   path of octave compiler `mkoctfile' [default=no]
@@ -7799 +7805 @@
 MKOCTFILE2=
 MKOCTFILE3=
+MKOCTFILE4=
 
 if test "$with_octave" != "no" ; then
@@ -7891 +7898 @@
   OCTAVE_VERSION=`${OCTAVE} -v | grep version | cut -d' ' -f4`
   OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1`
+  if test "${OCTAVE_VERSION_MAJOR}" == "4" ; then
+    OCTAVE4=$OCTAVE
+    MKOCTFILE4=$MKOCTFILE
+  fi
   if test "${OCTAVE_VERSION_MAJOR}" == "3" ; then
     OCTAVE3=$OCTAVE
@@ -7914 +7925 @@
 # not both.
 #
+
+# Check if octave4 was designated *in addition* to the installed version.
+# This can override the default version if they are the same versions.
+
+
+# Check whether --with-mkoctfile4 was given.
+if test "${with_mkoctfile4+set}" = set; then :
+  withval=$with_mkoctfile4;
+else
+  with_mkoctfile4=no
+fi
+
+
+if test "$with_mkoctfile4" != "no" ; then
+  if test "$with_mkoctfile4" = "yes" ; then
+    # Extract the first word of "mkoctfile", so it can be a program name with args.
+set dummy mkoctfile; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_mkoctfile4+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $mkoctfile4 in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_mkoctfile4="$mkoctfile4" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_mkoctfile4="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+mkoctfile4=$ac_cv_path_mkoctfile4
+if test -n "$mkoctfile4"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mkoctfile4" >&5
+$as_echo "$mkoctfile4" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  else
+    MKOCTFILE4=$with_mkoctfile4
+  fi
+  OCTAVE_VERSION=`${MKOCTFILE4} --version 2>&1 | cut -d' ' -f3`
+  OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1`
+fi
 
 # Check if octave3 was designated *in addition* to the installed version.
@@ -10219 +10291 @@
 
 
+
 ac_configure_args="--disable-threads --enable-shared"
 
@@ -10225 +10298 @@
 
 
-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"
+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/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"
 
 cat >confcache <<\_ACEOF
@@ -10959 +11032 @@
     "lang/octave/octave2/Makefile") CONFIG_FILES="$CONFIG_FILES lang/octave/octave2/Makefile" ;;
     "lang/octave/octave3/Makefile") CONFIG_FILES="$CONFIG_FILES lang/octave/octave3/Makefile" ;;
+    "lang/octave/octave4/Makefile") CONFIG_FILES="$CONFIG_FILES lang/octave/octave4/Makefile" ;;
     "lang/R/Makefile") CONFIG_FILES="$CONFIG_FILES lang/R/Makefile" ;;
     "lang/ruby/Makefile") CONFIG_FILES="$CONFIG_FILES lang/ruby/Makefile" ;;
@@ -10980 +11054 @@
     "examples/app-fermi/octave/octave2/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/octave2/Makefile" ;;
     "examples/app-fermi/octave/octave3/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/octave3/Makefile" ;;
+    "examples/app-fermi/octave/octave4/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/octave4/Makefile" ;;
     "examples/app-fermi/octave/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/Makefile" ;;
     "examples/app-fermi/perl/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/perl/Makefile" ;;

branches/1.7/configure.in

@@ -412 +412 @@
 AC_SUBST(MKOCTFILE2)
 AC_SUBST(MKOCTFILE3)
+AC_SUBST(MKOCTFILE4)
 AC_SUBST(OCTAVE_VERSION)
 AC_SUBST(OCTAVE_VERSION_MAJOR)
@@ -517 +518 @@
     lang/octave/octave2/Makefile
     lang/octave/octave3/Makefile
+    lang/octave/octave4/Makefile
     lang/R/Makefile
     lang/ruby/Makefile
@@ -538 +540 @@
     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

branches/1.7/lang/octave/Makefile.in

@@ -14 +14 @@
 MKOCTFILE2      = @MKOCTFILE2@
 MKOCTFILE3      = @MKOCTFILE3@
+MKOCTFILE4      = @MKOCTFILE4@
 
 LANGS           = 
+ifneq ($(MKOCTFILE4),)
+  LANGS += octave4
+endif
 ifneq ($(MKOCTFILE3),)
   LANGS += octave3
@@ -23 +27 @@
 endif
 
-.PHONY: all install test clean distclean octave2 octave3
+.PHONY: all install test clean distclean octave2 octave3 octave4
 
 all: