turned off noise from last round of debugging.

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

diff --git a/scripts/generator/bootstrap_build.sh b/scripts/generator/bootstrap_build.sh
index 5a07d9bc183c3aef4331d87e2e4f8fc193c02a35..4f439bd081332004db3cc7248d2be8edefcffb9b 100644 (file)
--- a/scripts/generator/bootstrap_build.sh
+++ b/scripts/generator/bootstrap_build.sh
@@ -19,22 +19,29 @@
 #
 # (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
+
 # signals that we're doing a fresh build to the variables script.
 export INCLUDED_FROM_BOOTSTRAP=true
+
 # pull in our build variables using the path to this script.
 export BUILD_SCRIPTS_DIR="$( \cd "$(\dirname "$0")" && \pwd )"
 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
+if [ -z "$FEISTY_MEOW_SCRIPTS_LOADED" ]; then
+  bash "$BUILD_SCRIPTS_DIR/../core/bootstrap_shells.sh"
+  source "$BUILD_SCRIPTS_DIR/../core/launch_feisty_meow.sh"
+fi
+
+# load in build variables based on our deduced paths.
 source "$BUILD_SCRIPTS_DIR/build_variables.sh" "$BUILD_SCRIPTS_DIR/build_variables.sh"
 
 ##############
@@ -65,6 +72,7 @@ echo "Build bootstrap process has started."
 
 # preconditions for the build process...
 
+# set up our output directories etc.
 prepare_binaries_dir
 
 # set a flag for this process so we can omit certain compilations as necessary.
@@ -146,11 +154,14 @@ fi
 
 # start the actual build process now...
 
+# recreate our useful waste directories and other things...
+source "$BUILD_SCRIPTS_DIR/build_variables.sh" "$BUILD_SCRIPTS_DIR/build_variables.sh"
+
 # clean out any current contents.
 bash "$BUILD_SCRIPTS_DIR/whack_build.sh" clean
 
-# recreate our useful waste directories and other things...
-source "$BUILD_SCRIPTS_DIR/build_variables.sh" "$BUILD_SCRIPTS_DIR/build_variables.sh"
+# make this again so no one gets cranky.
+mkdir -p "$LOGS_DIR"
 
 toolset_names=(makedep value_tagger version_stamper vsts_version_fixer write_build_config short_path sleep_ms zap_process playsound create_guid)
 
@@ -241,13 +252,14 @@ if [ -z "$JUST_BOOTSTRAP_APPS" ]; then
   # recreate our useful junk directories...
   mkdir -p "$WASTE_DIR"
   mkdir -p "$TEMPORARIES_DIR"
+  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" )
-  export NOT_SLIMLINE=true
   make_code
+
   popd &>/dev/null
 fi