X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fgenerator%2Fwhack_build.sh;h=82812e93b8988f1b666a0d0bff1581f83fd19c1b;hb=3bfed2b716ed455d47d99835e6ee0e16afff584e;hp=870b285cc430795f650d387780be4a7221665434;hpb=cc0ec25b43888a9c807041c31f1fa06a21aae294;p=feisty_meow.git

diff --git a/scripts/generator/whack_build.sh b/scripts/generator/whack_build.sh
index 870b285c..82812e93 100644
--- a/scripts/generator/whack_build.sh
+++ b/scripts/generator/whack_build.sh
@@ -14,48 +14,53 @@ function whack_single_build_area()
   fi
 
   local choprepo="$(basename "$(dirname "$CLEANING_LOCALE")" )/$(basename "$CLEANING_LOCALE")"
-  echo $(date): "Cleaning up [$choprepo]..."
+  echo $(date): "cleaning up [$choprepo]..."
   if [ -z "$CLEANING_LOCALE" ]; then
     echo "The CLEANING_LOCALE variable is not set!"
     exit 3
   fi
 
-  export NEW_TMP="$(mktemp -d "$CLEANING_LOCALE/TEMPS.XXXXXX")"
+#old  export NEW_TMP="$(mktemp -d "$CLEANING_LOCALE/TEMPS.XXXXXX")"
+  export NEW_TMP="$(mktemp -d "$TMP/temps-build-whacking.XXXXXX")"
   export CRUDFILE="$(mktemp "$NEW_TMP/whack_build.XXXXXX")"
   echo "" &>"$CRUDFILE"
 
   CLEANING_TOP="$CLEANING_LOCALE/production"
 
-#  echo $(date): "  Cleaning up the build products..."
+#  echo $(date): "  cleaning up the build products..."
 
   # avoid accidentally removing way too much important stuff if our variables have not
   # been previously established.
-  local WASTE_DIR="$CLEANING_LOCALE/waste"
-  local TEMPORARIES_DIR="$CLEANING_LOCALE/temporaries"
+  local GENERATED_DIR="$CLEANING_TOP/generated-feisty_meow"
+#*** hmmm: above is wrong place now!
+  local TEMPORARIES_DIR="$CLEANING_TOP/temporaries"
 
-  # kerzap.
+  # kerzap.  the few cleanups in production directory remove older locations of generated files.
   rm -rf \
-    "$CLEANING_TOP/generatedJUnitFiles" \
+    "$FEISTY_MEOW_DIR/generatedJUnitFiles" \
     "$CLEANING_TOP/binaries" \
     "$CLEANING_TOP/install" \
     "$CLEANING_TOP/logs" \
     "$CLEANING_TOP/objects" \
     "$TEMPORARIES_DIR" \
-    "$WASTE_DIR" \
+    "$GENERATED_DIR" \
     "$CLEANING_TOP/__build_"*.h \
-    "$CLEANING_TOP/manifest.txt" 
+    "$CLEANING_TOP/manifest.txt" \
+    "$PRODUCTION_DIR/clam_bin" \
+    "$PRODUCTION_DIR/binaries" \
+    "$PRODUCTION_DIR/install" \
+    "$PRODUCTION_DIR/logs" \
+    "$PRODUCTION_DIR/waste" 
 
-#  echo $(date): "  Cleaning generated files in source hierarchy..."
+#  echo $(date): "  cleaning generated files in source hierarchy..."
 
   if [ "$clean_src" == "clean" -o "$clean_src" == "CLEAN"  ]; then
-    echo $(date): "    ** Aggressive cleaning activated..."
-    perl "$REPOSITORY_DIR/scripts/files/zapdirs.pl" "$CLEANING_TOP" >>"$CRUDFILE"
+    echo $(date): "    ** aggressive cleaning activated..."
+    perl "$FEISTY_MEOW_SCRIPTS/files/zapdirs.pl" "$FEISTY_MEOW_DIR" >>"$CRUDFILE"
   fi
 
-  echo $(date): "Cleaned [$choprepo]."
-
+  echo $(date): "cleaned [$choprepo]."
   rm -rf "$NEW_TMP"
-
   return 0
 }
 
@@ -63,7 +68,5 @@ function whack_single_build_area()
 
 # clean all known hierarchies of build products...
 
-whack_single_build_area "$REPOSITORY_DIR"
-
-
+whack_single_build_area "$FEISTY_MEOW_DIR"