Merge pull request #9 from rlcee/210328

move build links to setup

bin/museBuild.sh

@@ -37,23 +37,6 @@ cd $MUSE_WORK_DIR
 
 echo -n "$(date +'%D %H:%M:%S to ')" > $MUSE_BUILD_DIR/.musebuild
 
-#
-# "build" the linked packages by making sure the links 
-# from our build area to the backing build area are there
-#
-if [ -d link ]; then
-    # we should be in $MUSE_WORK_DIR
-    mkdir -p $MUSE_BUILD_BASE/link
-    for REPO in $( ls  link )
-    do
-	BASE=$( readlink -f  link/$REPO/.. )
-	if [ ! -d  $MUSE_BUILD_BASE/link/$REPO  ]; then
-	    if [ -d  $BASE/$MUSE_BUILD_BASE/$REPO ]; then
-		ln -s $BASE/$MUSE_BUILD_BASE/$REPO $MUSE_BUILD_BASE/link/$REPO  
-	    fi
-	fi
-    done
-fi
 
 #
 # now run the local build

bin/museInstall.sh

@@ -84,7 +84,7 @@ EOL
 
 cd ../..
 
-tar -czf muse-${VERSION}.tgz muse/${VERSION} muse/${VERSION}.version
+tar -cjf muse-${VERSION}.bz2 muse/${VERSION} muse/${VERSION}.version
 
 cd $OWD
 exit 0

bin/museLink.sh

@@ -50,7 +50,7 @@ TARGET="$1"
 # if no target, list cvmfs Offline
 #
 
-if [[ -z "$TARGET" || "$TARGET" == "-l"]]; then
+if [[ -z "$TARGET" || "$TARGET" == "-l" ]]; then
 
     echo "Recent published releases:"
     # add PUB area when ready
@@ -104,9 +104,12 @@ fi
 LINK=link/$(basename $FTARGET)
 REPO=$( basename $LINK )
 
-if [ -e "$LINK" ]; then
+if [ -L "$LINK" ]; then
     echo "WARNING - replacing a linked package of the same name: $REPO "
     rm -f $LINK
+    # also remove any links to the build area
+    # will be recreated pointing to the new area in the next setup
+    rm -f build/*/link/$REPO
 fi
 
 ln -s $FTARGET $LINK

bin/museSetup.sh

@@ -452,6 +452,26 @@ 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
+# from our build area to the linked build area
+#
+if [ -d link ]; then
+    mkdir -p $MUSE_BUILD_BASE/link
+    for REPO in $( ls  link )
+    do
+	BASE=$( readlink -f  link/$REPO/.. )
+	if [ ! -d  $MUSE_BUILD_BASE/link/$REPO  ]; then
+	    if [ -d  $BASE/$MUSE_BUILD_BASE/$REPO ]; then
+		ln -s $BASE/$MUSE_BUILD_BASE/$REPO $MUSE_BUILD_BASE/link/$REPO  
+	    else
+		echo "WARNING - linked repo $REPO does not have the $MUSE_STUB build"
+	    fi
+	fi
+    done
+fi
+
+
 if [ $RC -ne 0  ]; then
     echo "ERROR - setup did not run correctly"
     return 1

python/sconstruct_helper.py

@@ -193,6 +193,7 @@ def sconscriptList(mu2eOpts):
 def extraCleanup(mu2eOpts):
     for top, dirs, files in os.walk(mu2eOpts['buildBase']):
         for name in files:
-            ff =  os.path.join(top, name)
-            print("removing file ", ff)
-            os.unlink (ff)
+            if name != ".musebuild":
+                ff =  os.path.join(top, name)
+                print("removing file ", ff)
+                os.unlink (ff)