Skip to content

Commit

Permalink
Move the bootstrap output dir inside the environment (#7212)
Browse files Browse the repository at this point in the history
Putting it at out/ causes problems:

1) Our scripts and docs use subdirectories of out/ as the build
   root to allow creating multiple output directories with different
   configurations. These directories are now nested inside the
   bootstrap dir which is likely to cause confusion.

2) Using a single location in and out of docker breaks. The vscode
   docker moves the environment to work around these conflicts.
   Using a common build directory will cause similar breakage.

3) Cleaning the environment without cleaning out/ results in errors.
   This indicates they should be co-located.
  • Loading branch information
mspang authored and pull[bot] committed Jul 1, 2021
1 parent 8ab7fea commit 3027815
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion scripts/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ EOF
[ ! -s "$_SETUP_SH" ]; then
pw_bootstrap --shell-file "$_SETUP_SH" \
--install-dir "$_PW_ACTUAL_ENVIRONMENT_ROOT" \
--config-file "$_CHIP_ROOT/$_CONFIG_FILE"
--config-file "$_CHIP_ROOT/$_CONFIG_FILE" \
--virtualenv-gn-out-dir "$_PW_ACTUAL_ENVIRONMENT_ROOT/gn_out"
pw_finalize bootstrap "$_SETUP_SH"
else
pw_activate
Expand Down

0 comments on commit 3027815

Please sign in to comment.