BugID: 1121

Added support for setting PYTHONPATH

LCS/Tools/src/lofarinit.csh

@@ -28,11 +28,18 @@
 # The actual value is filled in by make install (see Makefile.am).
 set a_root = . #filled in by install
 
+# Get python version.
+set a_pyv=`python --version 2>&1`
+set a_pyvv=`echo $a_pyv | sed -e "s/Python /([0.9]\.[0-9]\).*/\1/"`
+if test "$a_pyv" = "$a_pyvv" then
+  set a_pyvv=2.5
+endif
+
 # Only modify path variables if $a_root is an existing directory.
 if (! (-d $a_root) ) then
     echo "LOFAR root directory $a_root does not exist"
 else
-    # First strip the current LOFARROOT from PATH and LD_LIBRARY_PATH
+    # First strip the current LOFARROOT from PATH, LD_LIBRARY_PATH, PYTHONPATH.
     # Take care that a possible . is preceeded by a backslash.
     if ($?LOFARROOT) then
         set a_path = `echo $LOFARROOT | sed -e 's/\./\\\./g'`
@@ -40,6 +47,8 @@ else
         setenv PATH `echo $PATH | sed -e "s%:${a_bin}:%:%g" -e "s%^${a_bin}:%%"  -e "s%:${a_bin}"'$%%' -e "s%^${a_bin}"'$%%'`
         set a_lib = "$a_path/lib"
         setenv LD_LIBRARY_PATH `echo $LD_LIBRARY_PATH | sed -e "s%:${a_lib}:%:%g" -e "s%^${a_lib}:%%"  -e "s%:${a_lib}"'$%%' -e "s%^${a_lib}"'$%%'`
+        set a_pyt = "$a_path/lib/python$a_pyvv/site-packages"
+        setenv PYTHONPATH `echo $PYTHONPATH | sed -e "s%:${a_pyt}:%:%g" -e "s%^${a_pyt}:%%"  -e "s%:${a_pyt}"'$%%' -e "s%^${a_pyt}"'$%%'`
     endif
 
     # Now define the new LOFARROOT
@@ -52,6 +61,8 @@ else
     setenv PATH `echo $PATH | sed -e "s%:${a_bin}:%:%g" -e "s%^${a_bin}:%%"  -e "s%:${a_bin}"'$%%' -e "s%^${a_bin}"'$%%'`
     set a_lib = "$a_path/lib"
     setenv LD_LIBRARY_PATH `echo $LD_LIBRARY_PATH | sed -e "s%:${a_lib}:%:%g" -e "s%^${a_lib}:%%"  -e "s%:${a_lib}"'$%%' -e "s%^${a_lib}"'$%%'`
+    set a_pyt = "$a_path/lib/python$a_pyvv/site-packages"
+    setenv PYTHONPATH `echo $PYTHONPATH | sed -e "s%:${a_pyt}:%:%g" -e "s%^${a_pyt}:%%"  -e "s%:${a_pyt}"'$%%' -e "s%^${a_pyt}"'$%%'`
     
     # Add the path to the standard paths.
     if (! $?PATH) then
@@ -64,6 +75,12 @@ else
     else
         setenv LD_LIBRARY_PATH $LOFARROOT/lib:$LD_LIBRARY_PATH
     endif
+    set a_pyt = "$LOFARROOT/lib/python$a_pyvv/site-packages"
+    if (! $?PYTHONPATH) then
+        setenv PYTHONPATH $a_pyt
+    else
+        setenv PYTHONPATH $a_pyt:$PYTHONPATH
+    endif
 
     # Create a .glishrc.post in the HOME directory to append
     # the LOFAR libexec to the glish path.

LCS/Tools/src/lofarinit.sh

@@ -28,7 +28,14 @@
 # The actual value is filled in by make install (see Makefile.am).
 lfr_root=. #filled in by install
 
-# First strip the current LOFARROOT from PATH and LD_LIBRARY_PATH
+# Get python version.
+a_pyv=`python --version 2>&1`
+a_pyvv=`echo $a_pyv | sed -e "s/Python \([0-9]\.[0-9]\).*/\1/"`
+if test "$a_pyv" = "$a_pyvv"; then
+  a_pyvv=2.4
+fi
+
+# First strip the current LOFARROOT from PATH, LD_LIBRARY_PATH, and PYTHONPATH.
 # Take care that a possible . is preceeded by a backslash (for the later sed).
 if [ "$LOFARROOT" != "" ]; then
     lfr_path=`echo $LOFARROOT | sed -e 's/\./\\\./g'`
@@ -38,6 +45,9 @@ if [ "$LOFARROOT" != "" ]; then
     lfr_lib="$lfr_path/lib"
     LD_LIBRARY_PATH=`echo $LD_LIBRARY_PATH | sed -e "s%:$lfr_lib:%:%g" -e "s%^$lfr_lib:%%"  -e "s%:$lfr_lib$%%" -e "s%^$lfr_lib$%%"`
     export LD_LIBRARY_PATH
+    lfr_pyt="$lfr_path/lib/python$a_pyvv/site-packages"
+    PYTHONPATH=`echo $PYTHONPATH | sed -e "s%:$lfr_pyt:%:%g" -e "s%^$lfr_pyt:%%"  -e "s%:$lfr_pyt$%%" -e "s%^$lfr_pyt$%%"`
+    export PYTHONPATH
 fi
 
 # Now define the new LOFARROOT (if possible)
@@ -57,6 +67,9 @@ else
     lfr_lib="$lfr_path/lib"
     LD_LIBRARY_PATH=`echo $LD_LIBRARY_PATH | sed -e "s%:$lfr_lib:%:%g" -e "s%^$lfr_lib:%%"  -e "s%:$lfr_lib$%%" -e "s%^$lfr_lib$%%"`
     export LD_LIBRARY_PATH
+    lfr_pyt="$lfr_path/lib/python$a_pyvv/site-packages"
+    PYTHONPATH=`echo $PYTHONPATH | sed -e "s%:$lfr_pyt:%:%g" -e "s%^$lfr_pyt:%%"  -e "s%:$lfr_pyt$%%" -e "s%^$lfr_pyt$%%"`
+    export PYTHONPATH
 fi
 
 # Add to the paths if the bin directory exsists.
@@ -76,6 +89,13 @@ else
         LD_LIBRARY_PATH=$LOFARROOT/lib:$LD_LIBRARY_PATH
     fi
     export LD_LIBRARY_PATH
+    a_pyt=$LOFARROOT/lib/python$a_pyvv/site-packages
+    if [ "$PYTHONPATH" = "" ]; then
+        PYTHONPATH=$a_pyt
+    else
+        PYTHONPATH=$a_pyt:$PYTHONPATH
+    fi
+    export PYTHONPATH
 fi
 
 # Now define the new LOFARDATAROOT (if possible).
@@ -104,4 +124,4 @@ fi
 echo "system.path.include := [system.path.include, '$LOFARROOT/libexec/glish']" > $HOME/.glishrc.post
 
 # Clean up
-unset lfr_root lfr_nroot lfr_bin lfr_lib lfr_path
+unset lfr_root lfr_nroot lfr_bin lfr_lib lfr_pyt a_pyv a_pyvv lfr_path