Merge pull request #77 from rlcee/rmlink_221203

Rmlink 221203

bin/mgit

@@ -168,13 +168,8 @@ mg_status() {
         fi
         local bline=$( git -C $TEMPD/Offline show --format=format:"%h %d" )
         local depfile=$TEMPD/$MUSE_BUILD_BASE/Offline/gen/txt/deps.txt
-    elif [ -d $MUSE_WORK_DIR/link/Offline ]; then
-        # the backing build hash
-        local bline=$( git -C $MUSE_WORK_DIR/link/Offline show --format=format:"%h %d" )
-        local depfile=$MUSE_BUILD_DIR/link/Offline/gen/txt/deps.txt
-
     else
-        echo "mgit ERROR - could not find backing or linked Offline in \$MUSE_WORK_DIR"
+        echo "mgit ERROR - could not find backing Offline in \$MUSE_WORK_DIR"
         exit 1
     fi
 

bin/muse

@@ -20,7 +20,6 @@ museUsage() {
        list      - print information about published Muse builds
        setup     - setup UPS products and path
        build     - run scons code build
-       link      -  ..this functionality has been removed..
        backing   - create a link to a backing build in another area
        tarball   - tar up build for grid or a release
 
@@ -98,12 +97,6 @@ elif [ "$COMMAND" == "backing" ]; then
     $MUSE_DIR/bin/museBacking.sh "$@"
     $DONE $?
 
-elif [ "$COMMAND" == "link" ]; then
-
-    # this command must be run in the working dir
-    $MUSE_DIR/bin/museLink.sh "$@"
-    $DONE $?
-
 elif [ "$COMMAND" == "list" ]; then
 
     $MUSE_DIR/bin/museList.sh "$@"

bin/museBacking.sh

@@ -15,7 +15,7 @@ usageMuseBacking() {
      but it will not itself be built.
 
       Since this command is usually run before "muse setup",
-      in must be run in the intended muse working directory
+      it must be run in the intended muse working directory
 
       If the command is run without any arguments, or with -l, a list
       of suggested Offline backing builds will be shown
@@ -87,18 +87,10 @@ if [[ -z "$TARGET" || "$TARGET" == "-l" ]]; then
     exit 0
 fi
 
-
-#
-# check if links are already there
-#
-
 if [ -d link ]; then
-    echo "WARNING - a link directory already exists.  The link function"
-    echo "        overlaps with the backing function.  Once the backing link"
-    echo "        is made, the link dir will be ignored in setup and build."
-    echo "        Or you can run \"muse link -r\"  to remove the links."
-    exit 1
+    echo "WARNING - a deprecated link directory exists, but will be ignored"
 fi
+
 if [ -e backing ]; then
     echo "WARNING - will remove existing backing link:"
     /bin/ls -l backing | awk '{print "    " $NF}'
@@ -140,7 +132,7 @@ elif [[ -d $MUSINGS/$TARGET && $NWORD -eq 1 ]]; then
     TV="$VERSION"
     [ -z "$TV" ] && TV="current"
     FTARGET=$( readlink -f $MUSINGS/$TARGET/$TV )
-    # readline will return empty string if dir doe snot exist
+    # readlink will return empty string if dir does not exist
     if [ -z "$FTARGET" ]; then
         echo "ERROR - found target in Musings, but did not match version"
         exit 1
@@ -170,5 +162,3 @@ if [ -n "$MUSE_WORK_DIR" ]; then
 fi
 
 exit 0
-
-

bin/museBuild.sh

@@ -10,8 +10,7 @@ usageMuseBuild() {
 
      Build the code repos in the Muse working directory.
      This is two steps:
-     1) if needed, create links to the build products
-        of repos added by "muse link"
+     1) create output dirs for local repos
      2) run scons in the Muse working dir
      The build directory in the Muse working directory can be deleted to
      effectively remove all build products.  Nothing is written anywhere else.
@@ -49,7 +48,6 @@ echo -n "$(date +'%D %H:%M:%S to ')" > $MUSE_BUILD_DIR/.musebuild
 # this is used to indicate the repos were built even if it
 # produces no files in the build area during the scons build
 
-# this should work for old link style and new backing style
 for REPO in $MUSE_LOCAL_REPOS
 do
     mkdir -p $MUSE_BUILD_DIR/$REPO

bin/museInstall.sh

@@ -88,5 +88,3 @@ tar -cjf muse-${VERSION}.bz2 muse/${VERSION} muse/${VERSION}.version
 
 cd $OWD
 exit 0
-
-

bin/museList.sh

@@ -79,7 +79,7 @@ do
                 FLL=$( readlink -f $LINKD/$LL )
                 PKG=$( echo $FLL | awk -F/ '{print $(NF-2)}' )
                 VER=$( echo $FLL | awk -F/ '{print $(NF-1)}' )
-                echo "    linked to $PKG $VER"
+                echo "    linked (deprecated) to $PKG $VER"
             done
         fi