Changeset 1988 for branches/blt4

Timestamp:

Dec 8, 2010 4:54:27 PM (13 years ago)

Author:

gah

Message:

allow octave2 and octave3 versions to coexist

Location:

branches/blt4/gui/apps

Files:

• rappture-csh.env.in (modified) (1 diff)
• rappture.env.in (modified) (1 diff)
• rappture.use.in (modified) (2 diffs)

branches/blt4/gui/apps/rappture-csh.env.in

@@ -47 +47 @@
 
 if ( $?OCTAVE_PATH ) then
-  setenv OCTAVE_PATH "${libdir}/octave:$OCTAVE_PATH"
+  setenv OCTAVE_PATH "${libdir}/octave${octave_version}:$OCTAVE_PATH"
 else
-  setenv OCTAVE_PATH "${libdir}/octave"
+  setenv OCTAVE_PATH "${libdir}/octave${octave_version}"
 endif
 
+# This depends upon the hacked version of octave that we install on the hubs.
 if ( $?OCTAVE_LOADPATH ) then
-  setenv OCTAVE_LOADPATH "${libdir}/octave${octave_version}:$OCTAVE_LOADPATH"
+  setenv OCTAVE_LOADPATH "${libdir}/octave3:$OCTAVE_LOADPATH"
 else
-  setenv OCTAVE_LOADPATH "${libdir}/octave${octave_version}"
+  setenv OCTAVE_LOADPATH "${libdir}/octave3"
 endif
 

branches/blt4/gui/apps/rappture.env.in

@@ -36 +36 @@
 
 MATLABPATH=${libdir}/matlab:$MATLABPATH
-OCTAVE_LOADPATH=:${libdir}/octave${octave_version}:$OCTAVE_LOADPATH
+# This depends upon the hacked version of octave that we install
+OCTAVE_LOADPATH=:${libdir}/octave3:$OCTAVE_LOADPATH
 OCTAVE_PATH=:${libdir}/octave${octave_version}:$OCTAVE_PATH
 

branches/blt4/gui/apps/rappture.use.in

@@ -14 +14 @@
 python_version=@PYTHON_VERSION@
 tcl_version=@TCL_VERSION@
+octave_version=@OCTAVE_VERSION_MAJOR@
 
 prepend PATH ${bindir}
@@ -23 +24 @@
 
 prepend MATLABPATH ${libdir}/matlab
-prepend OCTAVE_PATH :${libdir}/octave:
-prepend OCTAVE_LOADPATH :${libdir}/octave:
+prepend OCTAVE_PATH :${libdir}/octave${octave_version}:
+prepend OCTAVE_LOADPATH :${libdir}/octave3:
 
 prepend PERL5LIB ${libdir}/perl