still seeking the magic recipe to get jenkins happy. it continues to somehow

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

diff --git a/scripts/generator/bootstrap_build.sh b/scripts/generator/bootstrap_build.sh
index c50d15ced8e1abe04bca767c955a47bfcd966c57..bbdb4b28b44c31f5e6521cbe0453c74eba35c366 100644 (file)
--- 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,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.
@@ -142,11 +147,17 @@ 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"
+# 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)
 
@@ -237,6 +248,7 @@ 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