X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fgenerator%2Fbootstrap_build.sh;h=0c755e98a0644454b29e1c080046b9ec6019783c;hb=6c098e82fd059487b6097d31cdf8e199de7d792e;hp=b107cff672cdf39205dc717cefaa74b3bfab3e9d;hpb=12271e032cc820565839dc4029666edac84de8ba;p=feisty_meow.git diff --git a/scripts/generator/bootstrap_build.sh b/scripts/generator/bootstrap_build.sh index b107cff6..0c755e98 100644 --- a/scripts/generator/bootstrap_build.sh +++ b/scripts/generator/bootstrap_build.sh @@ -31,8 +31,10 @@ 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/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" ############## @@ -63,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. @@ -144,11 +147,14 @@ 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" "$BUILD_SCRIPTS_DIR/build_variables.sh" +# make this again so no one gets cranky. +mkdir -p "$LOGS_DIR" toolset_names=(makedep value_tagger version_stamper vsts_version_fixer write_build_config short_path sleep_ms zap_process playsound create_guid) @@ -239,13 +245,14 @@ 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 + pushd "$FEISTY_MEOW_DIR" &>/dev/null unset BUILD_DEFAULTS declare -a BUILD_DEFAULTS=( "BOOT_STRAPPING=" "OPTIMIZE=t" "DEBUG=t" "REBUILD=t" ) - export NOT_SLIMLINE=true make_code + popd &>/dev/null fi