X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fgenerator%2Fbootstrap_build.sh;h=0c755e98a0644454b29e1c080046b9ec6019783c;hb=6c098e82fd059487b6097d31cdf8e199de7d792e;hp=1e0654fdfe11a58ec354b9061320f895b0789bf6;hpb=df644beaa6a9c14c051b63e3dc42bc19b0c29246;p=feisty_meow.git diff --git a/scripts/generator/bootstrap_build.sh b/scripts/generator/bootstrap_build.sh index 1e0654fd..0c755e98 100644 --- a/scripts/generator/bootstrap_build.sh +++ b/scripts/generator/bootstrap_build.sh @@ -32,9 +32,9 @@ 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" +source "$BUILD_SCRIPTS_DIR/../core/launch_feisty_meow.sh" # drop any previous version of the repository variable. -unset REPOSITORY_DIR +unset FEISTY_MEOW_DIR source "$BUILD_SCRIPTS_DIR/build_variables.sh" "$BUILD_SCRIPTS_DIR/build_variables.sh" ############## @@ -156,9 +156,6 @@ bash "$BUILD_SCRIPTS_DIR/whack_build.sh" clean # 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) if [ -z "$SAVE_BINARIES" ]; then @@ -251,7 +248,7 @@ if [ -z "$JUST_BOOTSTRAP_APPS" ]; then mkdir -p "$LOGS_DIR" echo Now starting a normal build of the repository source code. - pushd "$REPOSITORY_DIR" &>/dev/null + pushd "$FEISTY_MEOW_DIR" &>/dev/null unset BUILD_DEFAULTS declare -a BUILD_DEFAULTS=( "BOOT_STRAPPING=" "OPTIMIZE=t" "DEBUG=t" "REBUILD=t" ) make_code