Merge pull request #62 from rlcee/rm_2path_220422

Rm 2path 220422

bin/museSetup.sh

@@ -103,7 +103,6 @@ fi
 #
 
 MUSE_QUALS=""
-export MUSE_NPATH=1
 
 ARG1=""
 ARG2=""
@@ -117,10 +116,6 @@ do
     elif [[  "$ARG" == "-h" || "$ARG" == "--help" || "$ARG" == "help" ]]; then
         museSetupUsage
         return 0
-    elif [ "$ARG" == "-1" ]; then
-        export MUSE_NPATH=1
-    elif [ "$ARG" == "-2" ]; then
-        export MUSE_NPATH=2
     else
         if [ "$ARG1" == "" ]; then
             ARG1="$ARG"
@@ -211,16 +206,6 @@ HASBACKING=""
 [ -e backing ] && HASBACKING="yes"
 
 
-#
-# backing links do not work with 2 path
-#
-if [[ "$HASBACKING" && "$MUSE_NPATH" == "2" ]] ; then
-    echo "ERROR - two-path will not work with backing links"
-    echo "        setup with one-path or switch from backing to links"
-    errorMessage
-    return 1
-fi
-
 #
 # set the flavor string
 #
@@ -570,28 +555,13 @@ do
         echo "     BUILD=$BUILD"
     fi
 
-    # add each package source to SimpleConfig and fcl path
-    # if include statements are shifted (include repo name), these are not needed
-    if [ "$MUSE_NPATH" == "2" ]; then
-        export MU2E_SEARCH_PATH=$( mdropit $MU2E_SEARCH_PATH $MUSE_WORK_DIR/$PP )
-        # add each package fcl
-        export FHICL_FILE_PATH=$( mdropit $FHICL_FILE_PATH $MUSE_WORK_DIR/$PP )
-        # where root finds includes
-        export ROOT_INCLUDE_PATH=$( mdropit $ROOT_INCLUDE_PATH $MUSE_WORK_DIR/$PP )
-    fi
-
     # add package-generated fcl (trigger) and data (gdml) paths
     # assuming only Offline generates these
     if [ "$REPO" == "Offline" ]; then
         TEMP=$MUSE_WORK_DIR/build/$MUSE_STUB
         if [[ "$PP" =~ $linkReg ]]; then
             TEMP=$TEMP/link
         fi
-
-        if [ "$MUSE_NPATH" == "2" ]; then
-             export FHICL_FILE_PATH=$( mdropit $FHICL_FILE_PATH $TEMP/Offline )
-            export MU2E_SEARCH_PATH=$( mdropit $MU2E_SEARCH_PATH $TEMP/Offline )
-        fi
         export FHICL_FILE_PATH=$( mdropit  $FHICL_FILE_PATH $TEMP )
         export MU2E_SEARCH_PATH=$( mdropit $MU2E_SEARCH_PATH $TEMP )
     fi

bin/museStatus.sh

@@ -94,8 +94,6 @@ done
 echo "  MUSE_VERBOSE = " $MUSE_VERBOSE
 [ $MUSE_VERBOSE -gt 0 ] && echo "user-supplied qualifiers:"
 echo "  MUSE_QUALS = " $MUSE_QUALS
-[ $MUSE_VERBOSE -gt 0 ] && echo "setup one path or two:"
-echo "  MUSE_NPATH = " $MUSE_NPATH
 [ $MUSE_VERBOSE -gt 0 ] && echo "envset determines the UPS products to use:"
 echo "  MUSE_ENVSET = " $MUSE_ENVSET
 [ $MUSE_VERBOSE -gt 0 ] && echo "art version number:"

python/sconstruct_helper.py

@@ -79,10 +79,6 @@ def cppPath(mu2eOpts):
     else:
         # the linked repo style
         path.append(mu2eOpts["workDir"]+"/link")
-        # add the build directory of each package, for generated code
-        if os.environ['MUSE_NPATH'] == "2" :
-            for repo in mu2eOpts['repos'].split():
-                path.append(mu2eOpts['workDir']+'/'+repo)
 
     path = path + [
         os.environ['ART_INC'],