X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fgenerator%2Fbuild_variables.sh;h=bd2afb036d02f508524dc03f8e810ab5968bf344;hb=refs%2Fheads%2Fmain;hp=efaf36b37ed8506a346abbc33412cbc8c481f6af;hpb=6f4f86051d7e4ad4755152503098bbb3888e4aad;p=feisty_meow.git

diff --git a/scripts/generator/build_variables.sh b/scripts/generator/build_variables.sh
index efaf36b3..bd2afb03 100644
--- a/scripts/generator/build_variables.sh
+++ b/scripts/generator/build_variables.sh
@@ -55,7 +55,10 @@ source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
 # outer check on whether this already was run or not.
 if [ -z "$BUILD_VARS_LOADED" ]; then
 
-echo build variables were not loaded so recalculating.
+if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then
+  echo recalculating feisty meow build variables.
+  echo
+fi
 
 # perform some calculations to get the right paths from our parameters.
 if [ ! -z "$PARM_1" ]; then
@@ -109,7 +112,8 @@ else
 fi
 
 # CLAM_BASE_CPU is a flag that distinguishes the type of processor, if necessary.
-export CLAM_BASE_CPU="$(machine 2>/dev/null || arch 2>/dev/null || uname -m 2>/dev/null || echo i686)"
+export CLAM_BASE_CPU="$(uname -m 2>/dev/null || arch 2>/dev/null || echo i686)"
+#ugh, machine gives us an odd answer on macos.  machine 2>/dev/null || 
 
 # "FEISTY_MEOW_CPP_HEADERS" are folders where our C and C++ header files can be found.
 # we'll compute the set of folders as best we can below.
@@ -119,8 +123,7 @@ if [ -d "$FEISTY_MEOW_APEX/nucleus" ]; then
 else
   export LOCUS_LIBRARY_HEADERS=
 fi 
-   ####blech!  maybe not needed now?  was involved above.  | tr "\\\\" / | sed -e "s/\([a-zA-Z]\):\/\([^ ]*\)/\/cygdrive\/\1\/\2/g" ')
-export FEISTY_MEOW_CPP_HEADERS=$(find $LOCUS_LIBRARY_HEADERS -mindepth 1 -maxdepth 1 -type d | grep -v "\.settings" )
+export FEISTY_MEOW_CPP_HEADERS=$(find $LOCUS_LIBRARY_HEADERS -mindepth 1 -maxdepth 1 -type d | grep -v "\.settings")
 
 # the root name of the version file.  This is currently irrelevant on
 # non-windoze platforms.
@@ -162,17 +165,6 @@ export BUILD_TOP="$FEISTY_MEOW_APEX"
 # code needed to produce the executables for feisty meow.
 export PRODUCTION_STORE="$BUILD_TOP/production"
 
-## set up the top-level for all build creations and logs and such.
-#export FEISTY_MEOW_GENERATED_STORE="$TMP/generated-feisty_meow"
-#if [ ! -d "$FEISTY_MEOW_GENERATED_STORE" ]; then
-#  mkdir -p "$FEISTY_MEOW_GENERATED_STORE"
-#fi
-## set up our effluent outsourcing valves.
-#export TEMPORARIES_PILE="$FEISTY_MEOW_GENERATED_STORE/temporaries"
-#if [ ! -d "$TEMPORARIES_PILE" ]; then
-#  mkdir -p "$TEMPORARIES_PILE"
-#fi
-
 # this variable points at a folder where we store the generated products of
 # the build, such as the binaries and installer packages.
 export RUNTIME_PATH="$FEISTY_MEOW_GENERATED_STORE/runtime"
@@ -255,8 +247,10 @@ if [ -z "$got_bad" ]; then
   fi
   
   # pick the executable's file ending based on the platform.
-  if [ "$OPERATING_SYSTEM" == "UNIX" ]; then export EXE_ENDING=;
-  elif [ "$OPERATING_SYSTEM" == "WIN32" ]; then export EXE_ENDING=.exe;
+  if [ "$OPERATING_SYSTEM" == "UNIX" ]; then
+    export EXE_ENDING=""
+  elif [ "$OPERATING_SYSTEM" == "WIN32" ]; then
+    export EXE_ENDING=".exe"
   else
     echo "The OPERATING_SYSTEM variable is unset or unknown.  Bailing out."
   fi