X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fgenerator%2Fbootstrap_build.sh;h=0e2886e11ef7aec60764ee95f0943c6d0c7a6212;hb=7f9b0fd36ab70eed1b3dbbb485f3f0158514688a;hp=4f439bd081332004db3cc7248d2be8edefcffb9b;hpb=805aef436e1d6d5baccf79ac23e9dd2799f37a92;p=feisty_meow.git diff --git a/scripts/generator/bootstrap_build.sh b/scripts/generator/bootstrap_build.sh index 4f439bd0..0e2886e1 100644 --- a/scripts/generator/bootstrap_build.sh +++ b/scripts/generator/bootstrap_build.sh @@ -31,9 +31,9 @@ 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. if [ -z "$FEISTY_MEOW_SCRIPTS_LOADED" ]; then @@ -41,6 +41,12 @@ if [ -z "$FEISTY_MEOW_SCRIPTS_LOADED" ]; then 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" @@ -218,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