diff options
Diffstat (limited to 'bootstrap.bat')
| -rw-r--r-- | bootstrap.bat | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bootstrap.bat b/bootstrap.bat index 5c46a29c9..a61d2233e 100644 --- a/bootstrap.bat +++ b/bootstrap.bat @@ -88,9 +88,10 @@ goto finish :: came from the developer and not from a previous bootstrap possibly from :: another workspace. -:: Not prefixing environment with "." since that doesn't hide it anyway. +if "%PW_PROJECT_ROOT%"=="" set "PW_PROJECT_ROOT=%PW_ROOT%" + if "%PW_ENVIRONMENT_ROOT%"=="" ( - set "_PW_ACTUAL_ENVIRONMENT_ROOT=%PW_ROOT%\environment" + set "_PW_ACTUAL_ENVIRONMENT_ROOT=%PW_PROJECT_ROOT%\environment" ) else ( set "_PW_ACTUAL_ENVIRONMENT_ROOT=%PW_ENVIRONMENT_ROOT%" ) @@ -99,8 +100,6 @@ set "shell_file=%_PW_ACTUAL_ENVIRONMENT_ROOT%\activate.bat" set "_pw_start_script=%PW_ROOT%\pw_env_setup\py\pw_env_setup\windows_env_start.py" -if "%PW_PROJECT_ROOT%"=="" set "PW_PROJECT_ROOT=%PW_ROOT%" - :: If PW_SKIP_BOOTSTRAP is set, only run the activation stage instead of the :: complete env_setup. if not "%PW_SKIP_BOOTSTRAP%" == "" goto skip_bootstrap |