Merge pull request #96 from rlcee/sp_240226

tweaks for spack

bin/museList.sh

@@ -61,9 +61,9 @@ do
     CURRENTV=$( basename $( readlink -f $MUSINGS/$MM/current ) )
 
     if [ $MUSE_VERBOSE -gt 0  ]; then
-        VLIST=$( ls -1 $MUSINGS/$MM | grep -v current )
+        VLIST=$( ls -1t $MUSINGS/$MM | grep -v current )
     else
-        VLIST=$( ls -1tr $MUSINGS/$MM | grep -v current | tail -3 )
+        VLIST=$( ls -1t $MUSINGS/$MM | grep -v current | head -3 )
     fi
 
     for VV in $VLIST

bin/museStatus.sh

@@ -114,6 +114,8 @@ if [ "$MUSE_CPPFLAGS" ]; then
     [ $MUSE_VERBOSE -gt 0 ] && echo "compile flags requested in .muse files:"
     echo "  MUSE_CPPFLAGS = " $MUSE_CPPFLAGS
 fi
+[ $MUSE_VERBOSE -gt 0 ] && echo "if set, use spack insted of UPS:"
+echo "  MU2E_SPACK = " $MU2E_SPACK
 
 echo
 

python/sconstruct_helper.py

@@ -73,9 +73,12 @@ def cppPath(mu2eOpts):
     if os.environ.get('MUSE_BACKING') :
         for bdir in os.environ['MUSE_BACKING'].split():
             path.append(bdir)
-    else:
-        # the linked repo style
-        path.append(mu2eOpts["workDir"]+"/link")
+
+    if os.environ.get('MUSE_VIEW_INC') :
+        for vdir in os.environ['MUSE_VIEW_INC'].split(':'):
+            path.append(vdir)
+        # quit now since this should be everything..
+        return path
 
     path = path + [
         os.environ['ART_INC'],