X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fgenerator%2Fbootstrap_build.sh;h=0e2886e11ef7aec60764ee95f0943c6d0c7a6212;hb=3fee1442fda93454013c34d70666594fe9763061;hp=33a9b24a50475ae7580eeb93b77f078c450cd983;hpb=8079bda7024dc254bd0356f91e44b79ba0edf7b5;p=feisty_meow.git diff --git a/scripts/generator/bootstrap_build.sh b/scripts/generator/bootstrap_build.sh index 33a9b24a..0e2886e1 100644 --- a/scripts/generator/bootstrap_build.sh +++ b/scripts/generator/bootstrap_build.sh @@ -25,16 +25,28 @@ # 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 +#echo build scripts dir initial value: $BUILD_SCRIPTS_DIR BUILD_SCRIPTS_DIR="$(echo $BUILD_SCRIPTS_DIR | tr '\\\\' '/' )" -echo build script after: $BUILD_SCRIPTS_DIR +#echo build scripts dir after chewing: $BUILD_SCRIPTS_DIR + # load in feisty meow basic scripts, if not already loaded. -bash "$BUILD_SCRIPTS_DIR/../core/bootstrap_shells.sh" -source "$BUILD_SCRIPTS_DIR/../core/launch_feisty_meow.sh" +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 + +source "$FEISTY_MEOW_SCRIPTS/core/functions.sh" + +# translate to dos format if there's a cygdrive in there; otherwise microsoft's tools +# will hose up completely due to unknown paths. +export FEISTY_MEOW_DIR="$(unix_to_dos_path $FEISTY_MEOW_DIR)" + # load in build variables based on our deduced paths. source "$BUILD_SCRIPTS_DIR/build_variables.sh" "$BUILD_SCRIPTS_DIR/build_variables.sh" @@ -212,7 +224,8 @@ if [ ! -f "$BINARY_DIR/value_tagger$EXE_ENDING" \ promote value_tagger # tool scrambles through headers to standardize outcomes. promote version_stamper # used for version stamping. promote vsts_version_fixer # used for version stamping. - promote write_build_config # creates a header of build-specific config info. + promote write_build_config # creates a header of build-specific config info. + promote cygwin_fixer # translates cygwin paths into dos-style equivalents. popd &>/dev/null fi