X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fgenerator%2Fbootstrap_build.sh;h=33a9b24a50475ae7580eeb93b77f078c450cd983;hb=8079bda7024dc254bd0356f91e44b79ba0edf7b5;hp=48245eae58ea5f2272a502544364e9fe5cb8610a;hpb=a5cb8184848bac3d3c484a72a90ec1ff08919288;p=feisty_meow.git diff --git a/scripts/generator/bootstrap_build.sh b/scripts/generator/bootstrap_build.sh index 48245eae..33a9b24a 100644 --- a/scripts/generator/bootstrap_build.sh +++ b/scripts/generator/bootstrap_build.sh @@ -19,8 +19,9 @@ # # (1) the script should be run with a full path, so that it can decide where # it lives with minimal fuss. -# (2) on windows, the msys bin directory should already be in the path so that -# tools like dirname are already available. +# (2) on windows, the unix tools bin directory should already be in the path +# so that tools like dirname are already available. use msys or cygwin +# at your discretion and your own risk. # make sure we know how to find our bash bins. export PATH=/bin:$PATH @@ -32,9 +33,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" -# drop any previous version of the repository variable. -unset REPOSITORY_DIR +bash "$BUILD_SCRIPTS_DIR/../core/bootstrap_shells.sh" +source "$BUILD_SCRIPTS_DIR/../core/launch_feisty_meow.sh" +# load in build variables based on our deduced paths. source "$BUILD_SCRIPTS_DIR/build_variables.sh" "$BUILD_SCRIPTS_DIR/build_variables.sh" ############## @@ -248,7 +249,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