diff -N setup-jupiter.sh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ setup-jupiter.sh	27 Mar 2006 21:38:55 -0000	1.1
@@ -0,0 +1,58 @@

+#!/bin/sh
+
+#
+# Jupiter and JLC apps setup script.
+#
+# --JM
+#
+
+# JLC root
+#export J4ROOT=`pwd`
+export J4ROOT=$PRJ_DIST/jupiter/pro
+
+# Geant4
+source ${PRJ_SCRIPTS}/geant4.6.2.p02-env.sh &> /dev/null
+export G4BASE=$G4INSTALL/source
+
+# ROOT ... v4.0.3, because it has working Pythia.
+#export ROOTSYS=${PRJ_EXTERN}/root/v4-0-3
+export ROOTSYS=${PRJ_EXTERN}/root/v4-0-8/
+source setup-root.sh &> /dev/null
+
+# CERNLIB
+#export CERN_ROOT=${PRJ_EXTERN}/cernlib/2003
+source setup-cernlib.sh
+
+# JLC packages seem to need these
+export JUPITERROOT=${J4ROOT}/Jupiter
+export URANUSROOT=${J4ROOT}/Uranus
+export JSFROOT=${J4ROOT}/jsf
+export LCLIBROOT=${J4ROOT}/lclib
+export KFLIBROOT=${J4ROOT}/physsim
+export SATELLITESROOT=${J4ROOT}/Satellites
+
+JUPITER_LIB_DIR=${JUPITERROOT}/lib/${G4SYSTEM}
+
+# make args
+export IMAKEINCLUDE="-I$JSFROOT -I$LCLIBROOT"
+
+# load libs
+export LD_LIBRARY_PATH=${JUPITER_LIB_DIR}:${KFLIBROOT}/lib:${G4LIB}/${G4SYSTEM}:${LD_LIBRARY_PATH}
+
+# path
+export PATH=$PATH:$JSFROOT/bin
+
+echo JUPITERROOT=$JUPITERROOT
+echo JUPITER_LIB_DIR=$JUPITER_LIB_DIR
+echo G4INSTALL=$G4INSTALL
+echo J4ROOT=$J4ROOT
+echo ROOTSYS=$ROOTSYS
+echo CERN_ROOT=$CERN_ROOT
+#echo "JUPITERROOT=$JUPITERROOT
+echo URANUSROOT=$URANUSROOT
+echo JSFROOT=$JSFROOT
+echo LCLIBROOT=$LCLIBROOT
+echo KFLIBROOT=$KFLIBROOT
+echo IMAKEINCLUDE=$IMAKEINCLUDE
+echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+echo PATH=$PATH

diff -u -r1.2 -r1.3
--- run-jupiter.sh	1 Mar 2006 01:09:28 -0000	1.2
+++ run-jupiter.sh	27 Mar 2006 21:38:55 -0000	1.3
@@ -1,16 +1,3 @@

 #!/bin/sh

-
-source ${PRJ_SCRIPTS}/geant4.6.2.p01-env.sh
-
-export J4ROOT=${PRJ_DIST}/jupiter/pro
-export JUPITERROOT=${J4ROOT}/Jupiter
-
-export LD_LIBRARY_PATH=${JUPITERROOT}/lib/${G4SYSTEM}
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${G4INSTALL}/lib/${G4SYSTEM}
-
-runme="${JUPITERROOT}/bin/${G4SYSTEM}/Jupiter $@"
-
-echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
-echo "executing: $runme"
-
-exec $runme

+source setup-jupiter.sh
+${JUPITERROOT}/bin/${G4SYSTEM}/Jupiter $@

diff -u -r1.1 -r1.2
--- run-mokka.sh	11 Jul 2005 18:43:35 -0000	1.1
+++ run-mokka.sh	27 Mar 2006 21:38:55 -0000	1.2
@@ -1,5 +1,6 @@

 #!/bin/sh
 
 source $PRJ_SCRIPTS/setup-mokka.sh

-
-exec ${MOKKA_BASE}/source/bin/Linux-g++/Mokka $@

+mokka_run=$MOKKA_BASE/current/source/bin/$G4SYSTEM/Mokka
+echo "Running $mokka_run ..."
+$mokka_run $@

diff -u -r1.2 -r1.3
--- run-slic-dist.sh	21 Mar 2006 04:45:48 -0000	1.2
+++ run-slic-dist.sh	27 Mar 2006 21:38:55 -0000	1.3
@@ -1,4 +1,7 @@

 #!/bin/sh
 

+# setup Geant4 data files
+source setup-geant4-data.sh
+

 # use the current dist script
 $PRJ_DIST/SimDist/pro/scripts/slic.sh $@

diff -u -r1.2 -r1.3
--- setup-coin.sh	20 Mar 2006 07:51:24 -0000	1.2
+++ setup-coin.sh	27 Mar 2006 21:38:55 -0000	1.3
@@ -18,12 +18,12 @@

 
 export COIN_FULL_INDIRECT_RENDERING=1
 

-echo COIN=$COIN

+#echo COIN=$COIN

 #echo OIVHOME=$OIVHOME
 #echo SOXT=$SOXT
 #echo OIVFLAGS=$OIVFLAGS
 #echo OIVLIBS=$OIVLIBS

-echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH

+#echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH

 
 #export G4VIS_BUILD_OIX_DRIVER=1
 #export G4VIS_USE_OIX=1

diff -u -r1.3 -r1.4
--- setup-gdml.sh	1 Mar 2006 01:09:28 -0000	1.3
+++ setup-gdml.sh	27 Mar 2006 21:38:55 -0000	1.4
@@ -21,5 +21,5 @@

 
 # print info
 #echo "PLATFORM=$PLATFORM"

-echo "GDML_BASE=$GDML_BASE"
-echo "XERCESCROOT=$XERCESCROOT"

+#echo "GDML_BASE=$GDML_BASE"
+#echo "XERCESCROOT=$XERCESCROOT"

diff -u -r1.3 -r1.4
--- setup-lcdg4.sh	1 Mar 2006 01:09:28 -0000	1.3
+++ setup-lcdg4.sh	27 Mar 2006 21:38:55 -0000	1.4
@@ -35,12 +35,12 @@

 
 export LD_LIBRARY_PATH
 

-echo LCDG4_BASE=$LCDG4_BASE
-echo G4WORKDIR=$G4WORKDIR
-echo PEGS4PATH=$PEGS4PATH
-echo G4INSTALL=$G4INSTALL
-echo LCIO=$LCIO
-echo LCIO_DIR=$LCIO_DIR
-echo XERCESCROOT=$XERCESCROOT
-echo XML_DIR=$XML_DIR
-echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH

+#echo LCDG4_BASE=$LCDG4_BASE
+#echo G4WORKDIR=$G4WORKDIR
+#echo PEGS4PATH=$PEGS4PATH
+#echo G4INSTALL=$G4INSTALL
+#echo LCIO=$LCIO
+#echo LCIO_DIR=$LCIO_DIR
+#echo XERCESCROOT=$XERCESCROOT
+#echo XML_DIR=$XML_DIR
+#echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH

diff -u -r1.3 -r1.4
--- setup-lcio.sh	1 Mar 2006 01:09:28 -0000	1.3
+++ setup-lcio.sh	27 Mar 2006 21:38:55 -0000	1.4
@@ -18,4 +18,4 @@

 # add JARs to CLASSPATH
 export CLASSPATH=$CLASSPATH:$LCIO/lib/lcio.jar:$LCIO/tools/sio.jar
 

-echo "LCIO=$LCIO"

+#echo "LCIO=$LCIO"

diff -u -r1.2 -r1.3
--- setup-mokka.sh	1 Mar 2006 01:09:28 -0000	1.2
+++ setup-mokka.sh	27 Mar 2006 21:38:55 -0000	1.3
@@ -1,10 +1,15 @@

 #!/bin/sh
 

+# Geant4
+. setup-geant4.8.0.p01.sh
+

 # base dir
 if [ -z "$MOKKA_BASE" ]; then
   export MOKKA_BASE=${PRJ_DIST}/mokka/pro/
 fi
 

+source setup-lcio.sh
+

 export G4WORKDIR=${MOKKA_BASE}/source
 
 # print

diff -u -r1.6 -r1.7
--- setup-python2.4.sh	20 Mar 2006 07:51:25 -0000	1.6
+++ setup-python2.4.sh	27 Mar 2006 21:38:55 -0000	1.7
@@ -8,8 +8,8 @@

 # set Python home
 export PYTHONHOME=$PRJ_EXTERN/python2.4
 

-# nothing yet
-PYTHONSTARTUP=

+# leave for user to set
+#PYTHONSTARTUP=

 
 # path
 export PATH=$PYTHONHOME/bin:$PATH

@@ -26,7 +26,7 @@

 export LD_LIBRARY_PATH=$PRJ_EXTERN/vtk/pro/lib:$LD_LIBRARY_PATH
 
 # ROOT

-source setup-root.sh

+. setup-root.sh &> /dev/null

 export ROOTSYS
 export PYTHONPATH=$ROOTSYS/lib:$PYTHONPATH
 

@@ -35,13 +35,13 @@

 export LD_LIBRARY_PATH=$PRJ_EXTERN/hippodraw/pro/lib:$LD_LIBRARY_PATH
 
 # wxPython

-source setup-wx.sh

+. setup-wx.sh &> /dev/null

 
 # GSL

-source setup-gsl.sh

+. setup-gsl.sh

 
 # Dislin

-source setup-dislin.sh

+. setup-dislin.sh

 export PYTHONPATH=$PRJ_EXTERN/dislin/pro/python:$PYTHONPATH
 
 # ScientificPython (not scipy)

@@ -51,44 +51,44 @@

 export PYTHONPATH=$PRJ_EXTERN/plplot/pro/lib/python2.4/site-packages:$PYTHONPATH
 
 # Mesa for PyOpenGL

-source setup-mesa.sh 

+. setup-mesa.sh 

 
 # Boost

-source setup-boost.sh

+. setup-boost.sh

 
 # FANN

-source setup-fann.sh

+. setup-fann.sh

 
 # qt3 because PyQwt and others look for this

-source setup-qt3.sh

+. setup-qt3.sh

 
 # qt4
 #source setup-qt4.sh
 
 # OpenDx

-source setup-dx.sh

+. setup-dx.sh

 
 # R

-source setup-R.sh

+. setup-R.sh

 
 # Coin3d

-source setup-coin.sh

+. setup-coin.sh &> /dev/null

 
 # Graphiz for pygraphviz and pydot

-source setup-graphviz.sh

+. setup-graphviz.sh

 
 # pydot and pygraphviz need ld path

-source setup-graphviz.sh

+. setup-graphviz.sh

 
 # GMP 

-source setup-gmp.sh

+. setup-gmp.sh

 
 # python lib
 export LD_LIBRARY_PATH=$PYTHONHOME/lib:$LD_LIBRARY_PATH
 
 # print settings
 echo PYTHONHOME=$PYTHONHOME

-echo PYTHONPATH=$PYTHONPATH
-echo PATH=$PATH
-echo PYTHONSTARTUP=$PYTHONSTARTUP
-echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH

+#echo PYTHONPATH=$PYTHONPATH
+#echo PATH=$PATH
+#echo PYTHONSTARTUP=$PYTHONSTARTUP
+#echo LD_LIBRARY_PATH=${LD_LIBRARY_PATH}

diff -u -r1.2 -r1.3
--- setup-vtk.sh	7 Mar 2006 18:28:03 -0000	1.2
+++ setup-vtk.sh	27 Mar 2006 21:38:55 -0000	1.3
@@ -11,4 +11,4 @@

 
 echo VTK_BASE=$VTK_BASE
 echo VTK_DATA_ROOT=$VTK_DATA_ROOT

-echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH

+#echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH

diff -u -r1.2 -r1.3
--- setup-wx.sh	9 Mar 2006 02:42:01 -0000	1.2
+++ setup-wx.sh	27 Mar 2006 21:38:55 -0000	1.3
@@ -15,6 +15,6 @@

 #export PYTHONPATH=${PYTHONPATH}:${wxpy}
 
 echo WX_BASE=$WX_BASE

-echo PATH=$PATH

+#echo PATH=$PATH

 #echo PYTHONPATH=$PYTHONPATH

-echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH

+#echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH

diff -N setup-scipy.sh
--- setup-scipy.sh	11 Jul 2005 18:43:38 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@

-#!/bin/sh
-
-source ${PRJ_SCRIPTS}/setup-python.sh
-
-export SCIPY_DEPS_BASE=${PRJ_EXTERN}/scipy/v0-3-2
-
-export ATLAS=${SCIPY_DEPS_BASE}/ATLAS/lib/Linux_PIIISSE1_2