X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fgenerator%2Fbootstrap_build.sh;h=48245eae58ea5f2272a502544364e9fe5cb8610a;hb=a5cb8184848bac3d3c484a72a90ec1ff08919288;hp=09650e4f470cc37b35df857c8d4ead4dc81e7b93;hpb=1bfe7da627f2c4eb8d51659e822ec3ccfafb2317;p=feisty_meow.git diff --git a/scripts/generator/bootstrap_build.sh b/scripts/generator/bootstrap_build.sh index 09650e4f..48245eae 100644 --- a/scripts/generator/bootstrap_build.sh +++ b/scripts/generator/bootstrap_build.sh @@ -65,13 +65,6 @@ echo "Build bootstrap process has started." # preconditions for the build process... -# clean out the logs directory so we are all fresh. -echo "Removing logs directory '$LOGS_DIR'..." -\rm -rf "$LOGS_DIR" "$BUILD_TOP/generatedJUnitFiles" -mkdir -p "$LOGS_DIR" # make this again so no one gets cranky. -echo "after removing and making dir again, it's here '$LOGS_DIR'..." -ls -al $LOGS_DIR - # set up our output directories etc. prepare_binaries_dir @@ -154,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) @@ -249,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 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