X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fgenerator%2Fbootstrap_build.sh;h=aa96a51859f106163009767ebea9a0e22cd5f299;hb=2dabeaeea0a64d744bad23b17665a76592be4129;hp=c50d15ced8e1abe04bca767c955a47bfcd966c57;hpb=2952ccf47b80174880141a7ecfa122089f349b8d;p=feisty_meow.git

diff --git a/scripts/generator/bootstrap_build.sh b/scripts/generator/bootstrap_build.sh
index c50d15ce..aa96a518 100644
--- a/scripts/generator/bootstrap_build.sh
+++ b/scripts/generator/bootstrap_build.sh
@@ -27,11 +27,15 @@ 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="$(dirname "$0")"
+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
-source "$BUILD_SCRIPTS_DIR/build_variables.sh"
+source "$BUILD_SCRIPTS_DIR/build_variables.sh" "$BUILD_SCRIPTS_DIR/build_variables.sh"
 
 ##############
 
@@ -61,6 +65,11 @@ echo "Build bootstrap process has started."
 
 # preconditions for the build process...
 
+# clean out the logs directory so we are all fresh.
+\rm -rf "$LOGS_DIR" "$BUILD_TOP/generatedJUnitFiles"
+mkdir "$LOGS_DIR"  # make this again so no one gets cranky.
+
+# set up our output directories etc.
 prepare_binaries_dir
 
 # set a flag for this process so we can omit certain compilations as necessary.
@@ -146,7 +155,7 @@ fi
 bash "$BUILD_SCRIPTS_DIR/whack_build.sh" clean
 
 # recreate our useful waste directories and other things...
-source "$BUILD_SCRIPTS_DIR/build_variables.sh"
+source "$BUILD_SCRIPTS_DIR/build_variables.sh" "$BUILD_SCRIPTS_DIR/build_variables.sh"
 
 toolset_names=(makedep value_tagger version_stamper vsts_version_fixer write_build_config short_path sleep_ms zap_process playsound create_guid)