projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
trying a few more tricks to get jenkins happy.
[feisty_meow.git]
/
scripts
/
generator
/
bootstrap_build.sh
diff --git
a/scripts/generator/bootstrap_build.sh
b/scripts/generator/bootstrap_build.sh
index c50d15ced8e1abe04bca767c955a47bfcd966c57..aa96a51859f106163009767ebea9a0e22cd5f299 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.
# 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 '\\\\' '/' )"
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
# 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...
# 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.
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...
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)
toolset_names=(makedep value_tagger version_stamper vsts_version_fixer write_build_config short_path sleep_ms zap_process playsound create_guid)