Commit in SimDist/scripts on MAIN
slic-ldpath.sh.in+16-161.5 -> 1.6

SimDist/scripts
slic-ldpath.sh.in 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- slic-ldpath.sh.in	13 Dec 2011 18:39:51 -0000	1.5
+++ slic-ldpath.sh.in	18 Jul 2012 23:03:42 -0000	1.6
@@ -1,8 +1,9 @@
 #!/bin/sh
+
 #
 # This is a relocatable script for setting up the library load path for SimDist libraries
-# on multiple platforms (Linux, OSX, Cygwin).  It must be processed by SimDist's configure
-# to produce ./scripts/slic-ldpath.sh which can then be sourced on the user's machine.
+# on multiple platforms (Linux, OSX, Cygwin).  
+
 # The SIMDIST_HOME variable should be set before this script is included.  An error 
 # message is printed if the variable is not set.
 #
@@ -19,26 +20,13 @@
 
     echo "SIMDIST_HOME=${SIMDIST_HOME}"
 
-    # Set library paths for packages.
-    # FIXME: This should probably happen from within configure rather than here.
-    #CLHEP_LIB_DIR=${SIMDIST_HOME}/packages/clhep/@CLHEP_VERSION@/lib
-    #G4_LIB_DIR=${SIMDIST_HOME}/packages/geant4/@GEANT4_VERSION@/lib/@G4SYSTEM@
-    #GDML_LIB_DIR=${SIMDIST_HOME}/packages/gdml/@GDML_VERSION@/CPPGDML/build/@G4SYSTEM@/lib
-    #XERCES_LIB_DIR=${SIMDIST_HOME}/packages/xerces/@XERCES_VERSION@/lib
-    #LCIO_LIB_DIR=${SIMDIST_HOME}/packages/lcio/@LCIO_VERSION@/lib
-    #LCDD_LIB_DIR=${SIMDIST_HOME}/packages/lcdd/@LCDD_VERSION@/lib
-    #HEPPDT_LIB_DIR=${SIMDIST_HOME}/packages/heppdt/@[log in to unmask]
-    #HEPPID_LIB_DIR=${SIMDIST_HOME}/packages/heppdt/@[log in to unmask]
-    #SLIC_LIB_DIR=${SIMDIST_HOME}/packages/slic/@SLIC_VERSION@/lib
-
     # FIXME: Is this the correct Qt dir?
-    if [ "@QTHOME" != "" ]; then
+    if [ "@QTHOME@" != "" ]; then
         QT_LIB_DIR=@QTHOME@/lib
     fi
     
     # Set the platform's load path variable.
     unset @OS_SHARED_LIBS_VAR@
-    #export @OS_SHARED_LIBS_VAR@=${CLHEP_LIB_DIR}:${G4_LIB_DIR}:${GDML_LIB_DIR}:${XERCES_LIB_DIR}:${LCIO_LIB_DIR}:${LCDD_LIB_DIR}:${HEPPDT_LIB_DIR}:${HEPPID_LIB_DIR}:${SLIC_LIB_DIR}:${QT_LIB_DIR}
     export @OS_SHARED_LIBS_VAR@=${SIMDIST_HOME}/lib
 
     echo "@OS_SHARED_LIBS_VAR@=${@OS_SHARED_LIBS_VAR@}"
@@ -46,3 +34,15 @@
     echo "ERROR: $SIMDIST_HOME doesn't appear to point to a valid SimDist installation!"
 fi
 fi
+
+#export @OS_SHARED_LIBS_VAR@=${CLHEP_LIB_DIR}:${G4_LIB_DIR}:${GDML_LIB_DIR}:${XERCES_LIB_DIR}:${LCIO_LIB_DIR}:${LCDD_LIB_DIR}:${HEPPDT_LIB_DIR}:${HEPPID_LIB_DIR}:${SLIC_LIB_DIR}:${QT_LIB_DIR}
+# Set library paths for packages.
+#CLHEP_LIB_DIR=${SIMDIST_HOME}/packages/clhep/@CLHEP_VERSION@/lib
+#G4_LIB_DIR=${SIMDIST_HOME}/packages/geant4/@GEANT4_VERSION@/lib/@G4SYSTEM@
+#GDML_LIB_DIR=${SIMDIST_HOME}/packages/gdml/@GDML_VERSION@/CPPGDML/build/@G4SYSTEM@/lib
+#XERCES_LIB_DIR=${SIMDIST_HOME}/packages/xerces/@XERCES_VERSION@/lib
+#LCIO_LIB_DIR=${SIMDIST_HOME}/packages/lcio/@LCIO_VERSION@/lib
+#LCDD_LIB_DIR=${SIMDIST_HOME}/packages/lcdd/@LCDD_VERSION@/lib
+#HEPPDT_LIB_DIR=${SIMDIST_HOME}/packages/heppdt/@[log in to unmask]
+#HEPPID_LIB_DIR=${SIMDIST_HOME}/packages/heppdt/@[log in to unmask]
+#SLIC_LIB_DIR=${SIMDIST_HOME}/packages/slic/@SLIC_VERSION@/lib
\ No newline at end of file
CVSspam 0.2.12


Use REPLY-ALL to reply to list

To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1