Merge branch 'main' of feistymeow.org:feisty_meow

[feisty_meow.git] / scripts / generator / whack_build.sh

diff --git a/scripts/generator/whack_build.sh b/scripts/generator/whack_build.sh
index fea766eda2b230e1d1dd4ab8528f5612a88c2249..b050ca380275cffaccbdb8b09acba400b8d59ad9 100644 (file)
--- a/scripts/generator/whack_build.sh
+++ b/scripts/generator/whack_build.sh
@@ -27,34 +27,39 @@ function whack_single_build_area()
 
   # avoid accidentally removing important stuff if our variables have not been previously
   # established.
-  if [ -z "$GENERATED_DIR" -o -z "$TEMPORARIES_DIR" ]; then
-    echo The build whacking script cannot run because either the GENERATED_DIR
-    echo variable or the TEMPORARIES_DIR variable have not been set.  This makes
+  if [ -z "$FEISTY_MEOW_GENERATED_STORE" -o -z "$TEMPORARIES_PILE" ]; then
+    echo The build whacking script cannot run because either the FEISTY_MEOW_GENERATED_STORE
+    echo variable or the TEMPORARIES_PILE variable have not been set.  This makes
     echo it unsafe to remove anything in the build products.
     exit 1
   fi
 
   # kerzap.  the cleanups in production directory remove older locations of generated files.
   rm -rf \
-    "$GENERATED_DIR/clam_bin" \
-    "$GENERATED_DIR/binaries" \
-    "$GENERATED_DIR/install" \
-    "$GENERATED_DIR/logs" \
-    "$GENERATED_DIR/waste" \
     "$FEISTY_MEOW_APEX/generatedJUnitFiles" \
-    "$TEMPORARIES_DIR" \
-    "$PRODUCTION_DIR/__build_"*.h \
-    "$PRODUCTION_DIR/manifest.txt" \
-    "$PRODUCTION_DIR/clam_bin" \
-    "$PRODUCTION_DIR/binaries" \
-    "$PRODUCTION_DIR/install" \
-    "$PRODUCTION_DIR/logs" \
-    "$PRODUCTION_DIR/waste" 
+    "$FEISTY_MEOW_GENERATED_STORE/clam_tmp" \
+    "$FEISTY_MEOW_GENERATED_STORE/logs" \
+    "$PRODUCTION_STORE/__build_"*.h \
+    "$PRODUCTION_STORE/manifest.txt" \
+    "$RUNTIME_PATH/binaries" \
+    "$RUNTIME_PATH/install" \
+    "$RUNTIME_PATH/waste" \
+    "$TEMPORARIES_PILE" \
+    "$PRODUCTION_STORE/clam_bin" \
+    "$PRODUCTION_STORE/binaries" \
+    "$PRODUCTION_STORE/install" \
+    "$PRODUCTION_STORE/logs" \
+    "$PRODUCTION_STORE/waste" 
+# last few mentioning production dir are to clean older code.
 
 #  echo $(date): "  cleaning generated files in source hierarchy..."
 
   if [ "$clean_src" == "clean" -o "$clean_src" == "CLEAN"  ]; then
     echo $(date): "    ** aggressive cleaning activated..."
+
+    # get rid of the build binaries.
+    rm -rf "$CLAM_BINARIES"
+
     perl "$FEISTY_MEOW_SCRIPTS/files/zapdirs.pl" "$FEISTY_MEOW_APEX" >>"$CRUDFILE"
   fi