From 277777906bb477d731a140be91d56f2bb6d28133 Mon Sep 17 00:00:00 2001
From: Ray Culbertson <rlc@fnal.gov>
Date: Thu, 25 Jan 2024 09:15:21 -0600
Subject: [PATCH 1/3] remove scons verison check to simplfy hybrid build

---
 python/SConstruct           | 4 ++--
 python/sconstruct_helper.py | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/python/SConstruct b/python/SConstruct
index fec8b3d..92169c6 100644
--- a/python/SConstruct
+++ b/python/SConstruct
@@ -91,8 +91,8 @@ env = Environment( CPPPATH = sch.cppPath(mu2eOpts),   # $ART_INC ...
                    SHLINKCOMSTR= linkcomstr
 )
 
-# compilation_db, starting in version 4
-if mu2eCBD and mu2eOpts['sconsv'][0]>='4':
+# make compile_commands file used by code analysis tools
+if mu2eCBD :
     cstr = "Wrote "+mu2eOpts['workDir']+'/'+mu2eOpts['buildBase'] \
                +"/compile_commands.json"
     env.Tool('compilation_db', COMPILATIONDB_COMSTR=cstr)
diff --git a/python/sconstruct_helper.py b/python/sconstruct_helper.py
index 1f84286..1cfd233 100644
--- a/python/sconstruct_helper.py
+++ b/python/sconstruct_helper.py
@@ -16,9 +16,6 @@
 def mu2eEnvironment():
     mu2eOpts = {}
 
-    # version, like 4_2_0
-    mu2eOpts['sconsv'] = os.environ['SETUP_SCONS'].split()[1].replace('v','')
-
     # the directory that includes local repos and 'build'
     workDir = os.environ['MUSE_WORK_DIR']
 

From 3e37d3654f9193c57138843d5b9bec57da3fd2bc Mon Sep 17 00:00:00 2001
From: Ray Culbertson <rlc@fnal.gov>
Date: Thu, 25 Jan 2024 09:20:48 -0600
Subject: [PATCH 2/3] add new trigger fcl generator to fhicl path

---
 bin/museSetup.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/museSetup.sh b/bin/museSetup.sh
index a0bf174..5168975 100755
--- a/bin/museSetup.sh
+++ b/bin/museSetup.sh
@@ -581,13 +581,16 @@ do
         export ${REPOUPPER}_INC=$BDIR
 
         # add package-generated fcl (trigger) and data (gdml) paths
-        # assuming only Offline generates these
-        if [ "$REPO" == "Offline" ]; then
-            TEMP=$BDIR/build/$MUSE_STUB
+        # assuming only certain repos generate these
+        TEMP=$BDIR/build/$MUSE_STUB
+        if [[ "$REPO" == "Offline" || "$REPO" == "mu2e_trigger_config" ]]; then
             export FHICL_FILE_PATH=$( mdropit  $FHICL_FILE_PATH $TEMP )
+        fi
+        if [ "$REPO" == "Offline" ]; then
             export MU2E_SEARCH_PATH=$( mdropit $MU2E_SEARCH_PATH $TEMP )
         fi
 
+
         # libraries built in each package
         export LD_LIBRARY_PATH=$( mdropit $LD_LIBRARY_PATH $BUILD/lib )
         export CET_PLUGIN_PATH=$( mdropit $CET_PLUGIN_PATH $BUILD/lib )

From 2b68b3f05aa77c38cd03ad96e17319534a1d7f71 Mon Sep 17 00:00:00 2001
From: Ray Culbertson <rlc@fnal.gov>
Date: Thu, 25 Jan 2024 09:31:43 -0600
Subject: [PATCH 3/3] fix name

---
 bin/museSetup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/museSetup.sh b/bin/museSetup.sh
index 5168975..4eb0072 100755
--- a/bin/museSetup.sh
+++ b/bin/museSetup.sh
@@ -583,7 +583,7 @@ do
         # add package-generated fcl (trigger) and data (gdml) paths
         # assuming only certain repos generate these
         TEMP=$BDIR/build/$MUSE_STUB
-        if [[ "$REPO" == "Offline" || "$REPO" == "mu2e_trigger_config" ]]; then
+        if [[ "$REPO" == "Offline" || "$REPO" == "mu2e_trig_config" ]]; then
             export FHICL_FILE_PATH=$( mdropit  $FHICL_FILE_PATH $TEMP )
         fi
         if [ "$REPO" == "Offline" ]; then