Merge pull request #18 from rlcee/210414

210414
Mu2e · Apr 14, 2021 · 751e541 · 751e541
2 parents 787330a + e55f6a7
commit 751e541
Show file tree

Hide file tree

Showing 3 changed files with 110 additions and 19 deletions.
diff --git a/bin/museSetup.sh b/bin/museSetup.sh
@@ -399,42 +399,46 @@ do
     fi
 
     # add each package source to SimpleConfig path
-    export MU2E_SEARCH_PATH=`dropit -p $MU2E_SEARCH_PATH -sfe $MUSE_WORK_DIR/$PP`
-    # add each package source
-    export FHICL_FILE_PATH=`dropit -p $FHICL_FILE_PATH -sfe $MUSE_WORK_DIR/$PP`
+    export MU2E_SEARCH_PATH=$( dropit -p $MU2E_SEARCH_PATH -sfe $MUSE_WORK_DIR/$PP )
+    # add each package fcl
+    if [ -z "$FHICL_FILE_PATH" ] ; then
+	export FHICL_FILE_PATH="$MUSE_WORK_DIR/$PP"
+    else
+	export FHICL_FILE_PATH=$( dropit -p $FHICL_FILE_PATH -sfe $MUSE_WORK_DIR/$PP )
+    fi
 
     # add package generated fcl 
     if [[ "$REPO" == "Offline" ]]; then
 	# assuming only Offline generates fcl
- 	export FHICL_FILE_PATH=`dropit -p $FHICL_FILE_PATH -sfe $BUILD`
+ 	export FHICL_FILE_PATH=$( dropit -p $FHICL_FILE_PATH -sfe $BUILD )
     fi
     # libraries built in each package
-    export LD_LIBRARY_PATH=`dropit -p $LD_LIBRARY_PATH -sfe $BUILD/lib`
-    export CET_PLUGIN_PATH=`dropit -p $CET_PLUGIN_PATH -sfe $BUILD/lib`
+    export LD_LIBRARY_PATH=$( dropit -p $LD_LIBRARY_PATH -sfe $BUILD/lib )
+    export CET_PLUGIN_PATH=$( dropit -p $CET_PLUGIN_PATH -sfe $BUILD/lib )
     # bins build in each package
-    export PATH=`dropit -p $PATH -sfe $BUILD/bin`
+    export PATH=$( dropit -p $PATH -sfe $BUILD/bin )
     # where root finds includes
-    export ROOT_INCLUDE_PATH=`dropit -p $ROOT_INCLUDE_PATH -sfe $MUSE_WORK_DIR/$PP`
+    export ROOT_INCLUDE_PATH=$( dropit -p $ROOT_INCLUDE_PATH -sfe $MUSE_WORK_DIR/$PP )
 
     PATHS=$(cat $PP/.muse |  \
 	awk '{if($1=="PYTHONPATH") print $2}')
     for PA in $PATHS
     do
-	export PYTHONPATH=`dropit -p $PYTHONPATH -sf $MUSE_WORK_DIR/$PP/$PA`
+	export PYTHONPATH=$( dropit -p $PYTHONPATH -sf $MUSE_WORK_DIR/$PP/$PA )
     done
 
     PATHS=$(cat $PP/.muse | \
 	awk '{if($1=="PATH") print $2}')
     for PA in $PATHS
     do
-	export PATH=`dropit -p $PATH -sf $MUSE_WORK_DIR/$PP/$PA`
+	export PATH=$( dropit -p $PATH -sf $MUSE_WORK_DIR/$PP/$PA )
     done
 
     PATHS=$(cat $PP/.muse | \
 	awk '{if($1=="FHICL_FILE_PATH") print $2}')
     for PA in $PATHS
     do
-	export FHICL_FILE_PATH=`dropit -p $FHICL_FILE_PATH -sf $MUSE_WORK_DIR/$PP/$PA`
+	export FHICL_FILE_PATH=$( dropit -p $FHICL_FILE_PATH -sf $MUSE_WORK_DIR/$PP/$PA )
     done
 
 
@@ -450,13 +454,13 @@ done
 # when the include files are shifted, these will be the only ones necessary
 #
 if [ -d link ]; then
-    export MU2E_SEARCH_PATH=`dropit -p $MU2E_SEARCH_PATH -sfe $MUSE_WORK_DIR/link` 
-    export FHICL_FILE_PATH=`dropit -p $FHICL_FILE_PATH -sfe $MUSE_WORK_DIR/link`
-    export ROOT_INCLUDE_PATH=`dropit -p $ROOT_INCLUDE_PATH -sfe $MUSE_WORK_DIR/link`
+    export MU2E_SEARCH_PATH=$( dropit -p $MU2E_SEARCH_PATH -sfe $MUSE_WORK_DIR/link ) 
+    export FHICL_FILE_PATH=$( dropit -p $FHICL_FILE_PATH -sfe $MUSE_WORK_DIR/link )
+    export ROOT_INCLUDE_PATH=$( dropit -p $ROOT_INCLUDE_PATH -sfe $MUSE_WORK_DIR/link )
 fi
-export MU2E_SEARCH_PATH=`dropit -p $MU2E_SEARCH_PATH -sfe $MUSE_WORK_DIR`
-export FHICL_FILE_PATH=`dropit -p $FHICL_FILE_PATH -sfe $MUSE_WORK_DIR`
-    export ROOT_INCLUDE_PATH=`dropit -p $ROOT_INCLUDE_PATH -sfe $MUSE_WORK_DIR`
+export MU2E_SEARCH_PATH=$( dropit -p $MU2E_SEARCH_PATH -sfe $MUSE_WORK_DIR )
+export FHICL_FILE_PATH=$( dropit -p $FHICL_FILE_PATH -sfe $MUSE_WORK_DIR )
+    export ROOT_INCLUDE_PATH=$( dropit -p $ROOT_INCLUDE_PATH -sfe $MUSE_WORK_DIR )
 
 #
 # "setup" the linked packages by making sure links exist

diff --git a/config/p004 b/config/p004
@@ -0,0 +1,85 @@
+
+# the lines starting with two hashes are documentation which can be printed
+## 4/9/2021 updating mu2e_artdaq_core to v1_05_06b
+
+#
+# use preferred build type, if none requested
+#
+if [ -z "$MUSE_BUILD" ]; then
+    export MUSE_BUILD=prof
+    if [ $MUSE_VERBOSE -gt 0 ]; then 
+        echo "INFO - MUSE_BUILD defaulting to $MUSE_BUILD in $MUSE_ENVSET"
+    fi
+fi
+
+#
+# use preferred compiler, if none requested
+#
+if [ -z "$MUSE_COMPILER_E" ]; then
+    export MUSE_COMPILER_E=e20
+    if [ $MUSE_VERBOSE -gt 0 ]; then 
+        echo "INFO - MUSE_COMPILER_E defaulting to $MUSE_COMPILER_E in $MUSE_ENVSET"
+    fi
+fi
+
+#
+# use preferred python flag, if none requested
+#
+if [ -z "$MUSE_PYTHON" ]; then
+    export MUSE_PYTHON=p392
+    if [ $MUSE_VERBOSE -gt 0 ]; then 
+        echo "INFO - MUSE_PYTHON defaulting to $MUSE_PYTHON in $MUSE_ENVSET"
+    fi
+fi
+
+
+# build tools
+setup cetpkgsupport v1_14_01
+setup -B  cetbuildtools   v8_03_03
+setup -B  valgrind   v3_16_1 
+setup -B  cmake   v3_19_6 
+
+# art 
+# these three lines must be coordinated
+setup -B art_root_io v1_07_00 -q${MUSE_BUILD}:+${MUSE_COMPILER_E}
+export MUSE_ART=s107
+setup -B  gallery   v1_18_00  -q+${MUSE_BUILD}:+${MUSE_COMPILER_E}
+
+
+#
+# geant4
+#
+GFLAGS=+${MUSE_BUILD}:+${MUSE_COMPILER_E}
+if [ -z "$MUSE_G4ST" ]; then
+   GFLAGS=${GFLAGS}:+mt
+fi
+if [ -n "$MUSE_G4VG" ]; then
+   GFLAGS=${GFLAGS}:+vg
+fi
+if [ "$MUSE_G4VIS" == "qt" ]; then
+   GFLAGS=${GFLAGS}:+qt
+fi
+
+setup -B geant4 v4_10_7_p01c -q${GFLAGS}
+
+#
+# everything else
+#
+
+setup -B xerces_c v3_2_3   -q +${MUSE_BUILD}:+${MUSE_COMPILER_E}
+setup -B mu2e_artdaq_core v1_05_07 -q +${MUSE_BUILD}:+${MUSE_COMPILER_E}:+${MUSE_ART}
+setup -B heppdt   v03_04_02 -q +${MUSE_BUILD}:+${MUSE_COMPILER_E}
+setup -B BTrk   v1_02_31  -q +${MUSE_BUILD}:+${MUSE_COMPILER_E}:+${MUSE_PYTHON}
+setup -B KinKal  v00_01_05a  -q +${MUSE_BUILD}:+${MUSE_COMPILER_E}:+${MUSE_PYTHON}
+setup -B cry   v1_7n  -q +${MUSE_BUILD}:+${MUSE_COMPILER_E}
+setup -B gsl v2_6a
+setup curl v7_64_1
+setup cryptopp v08_02_00 -q +${MUSE_BUILD}:+${MUSE_COMPILER_E}
+setup -B scons v3_1_2a  -q +${MUSE_PYTHON}
+setup -B gdb v10_1
+
+
+# Local Variables:
+# mode: sh
+# End:
+# vi:syntax=sh
diff --git a/python/sconstruct_helper.py b/python/sconstruct_helper.py
@@ -87,8 +87,10 @@ def cppPath(mu2eOpts):
         os.environ['CETLIB_INC'],
         os.environ['CETLIB_EXCEPT_INC'],
         os.environ['BOOST_INC'],
-        os.environ['CLHEP_INC'],
-        os.environ['CPPUNIT_DIR']+'/include',
+        os.environ['CLHEP_INC'] ]
+    if 'CPPUNIT_DIR' in os.environ:
+            path = path + [ os.environ['CPPUNIT_DIR']+'/include' ]
+    path = path + [
         os.environ['HEPPDT_INC'],
         os.environ['ROOT_INC'],
         os.environ['XERCES_C_INC'],