X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fgenerator%2Fbootstrap_build.sh;h=33a9b24a50475ae7580eeb93b77f078c450cd983;hb=8079bda7024dc254bd0356f91e44b79ba0edf7b5;hp=1e0654fdfe11a58ec354b9061320f895b0789bf6;hpb=df644beaa6a9c14c051b63e3dc42bc19b0c29246;p=feisty_meow.git

diff --git a/scripts/generator/bootstrap_build.sh b/scripts/generator/bootstrap_build.sh
index 1e0654fd..33a9b24a 100644
--- a/scripts/generator/bootstrap_build.sh
+++ b/scripts/generator/bootstrap_build.sh
@@ -19,8 +19,9 @@
 #
 # (1) the script should be run with a full path, so that it can decide where
 #     it lives with minimal fuss.
-# (2) on windows, the msys bin directory should already be in the path so that
-#     tools like dirname are already available.
+# (2) on windows, the unix tools bin directory should already be in the path
+#     so that tools like dirname are already available.  use msys or cygwin
+#     at your discretion and your own risk.
 
 # make sure we know how to find our bash bins.
 export PATH=/bin:$PATH
@@ -32,9 +33,9 @@ echo build script initial from bootstrap: $BUILD_SCRIPTS_DIR
 BUILD_SCRIPTS_DIR="$(echo $BUILD_SCRIPTS_DIR | tr '\\\\' '/' )"
 echo build script after: $BUILD_SCRIPTS_DIR
 # load in feisty meow basic scripts, if not already loaded.
-source "$BUILD_SCRIPTS_DIR/../core/profile.sh"
-# drop any previous version of the repository variable.
-unset REPOSITORY_DIR
+bash "$BUILD_SCRIPTS_DIR/../core/bootstrap_shells.sh"
+source "$BUILD_SCRIPTS_DIR/../core/launch_feisty_meow.sh"
+# load in build variables based on our deduced paths.
 source "$BUILD_SCRIPTS_DIR/build_variables.sh" "$BUILD_SCRIPTS_DIR/build_variables.sh"
 
 ##############
@@ -156,9 +157,6 @@ bash "$BUILD_SCRIPTS_DIR/whack_build.sh" clean
 # make this again so no one gets cranky.
 mkdir -p "$LOGS_DIR"
 
-echo "after removing and making dir again, it's here '$LOGS_DIR'..."
-ls -al $LOGS_DIR
-
 toolset_names=(makedep value_tagger version_stamper vsts_version_fixer write_build_config short_path sleep_ms zap_process playsound create_guid)
 
 if [ -z "$SAVE_BINARIES" ]; then
@@ -251,7 +249,7 @@ if [ -z "$JUST_BOOTSTRAP_APPS" ]; then
   mkdir -p "$LOGS_DIR"
 
   echo Now starting a normal build of the repository source code.
-  pushd "$REPOSITORY_DIR" &>/dev/null
+  pushd "$FEISTY_MEOW_DIR" &>/dev/null
   unset BUILD_DEFAULTS
   declare -a BUILD_DEFAULTS=( "BOOT_STRAPPING=" "OPTIMIZE=t" "DEBUG=t" "REBUILD=t" )
   make_code