Use !config.install.scope=project global override in build scripts and documentation when installing build system modules

8 files changed, 20 insertions, 16 deletions

diff --git a/BOOTSTRAP-UNIX.cli b/BOOTSTRAP-UNIX.cli
index 412041d..ef85857 100644
--- a/BOOTSTRAP-UNIX.cli
+++ b/BOOTSTRAP-UNIX.cli
@@ -242,7 +242,7 @@ $ build2/build2/b-boot install: build2/ bpkg/ bdep/
 You will also need to build and install the standard build system modules:
 
 \
-$ b install: libbuild2-*/
+$ b install: '!config.install.scope=project' libbuild2-*/
 \
 
 \N|To verify the build system modules installation you can load them with the
@@ -349,7 +349,8 @@ Finally, we build and install the standard build system modules:
 
 \
 $ bpkg build --for install libbuild2-autoconf libbuild2-kconfig
-$ bpkg install --all-pattern=libbuild2-*
+$ bpkg install '!config.install.scope=project' \
+  --all-pattern=libbuild2-*
 \
 
 \N|To get a list of the standard pre-installed build system modules in a
diff --git a/BOOTSTRAP-WINDOWS-CLANG.cli b/BOOTSTRAP-WINDOWS-CLANG.cli
index e02913e..efaf4e7 100644
--- a/BOOTSTRAP-WINDOWS-CLANG.cli
+++ b/BOOTSTRAP-WINDOWS-CLANG.cli
@@ -171,7 +171,7 @@ prefix/suffix, etc):
 You will also need to build and install the standard build system modules:
 
 \
-> b install: libbuild2-*\
+> b install: !config.install.scope=project libbuild2-*\
 \
 
 \N|To verify the build system modules installation you can load them with the
@@ -265,7 +265,8 @@ Finally, we build and install the standard build system modules:
 
 \
 > bpkg build --for install libbuild2-autoconf libbuild2-kconfig
-> bpkg install --all-pattern=libbuild2-*
+> bpkg install !config.install.scope=project ^
+  --all-pattern=libbuild2-*
 \
 
 \N|To get a list of the standard pre-installed build system modules in a
diff --git a/BOOTSTRAP-WINDOWS-MINGW.cli b/BOOTSTRAP-WINDOWS-MINGW.cli
index d9d7582..f8385c3 100644
--- a/BOOTSTRAP-WINDOWS-MINGW.cli
+++ b/BOOTSTRAP-WINDOWS-MINGW.cli
@@ -173,7 +173,7 @@ prefix/suffix, etc):
 You will also need to build and install the standard build system modules:
 
 \
-> b install: libbuild2-*\
+> b install: !config.install.scope=project libbuild2-*\
 \
 
 \N|To verify the build system modules installation you can load them with the
@@ -268,7 +268,8 @@ Finally, we build and install the standard build system modules:
 
 \
 > bpkg build --for install libbuild2-autoconf libbuild2-kconfig
-> bpkg install --all-pattern=libbuild2-*
+> bpkg install !config.install.scope=project ^
+  --all-pattern=libbuild2-*
 \
 
 \N|To get a list of the standard pre-installed build system modules in a
diff --git a/BOOTSTRAP-WINDOWS-MSVC.cli b/BOOTSTRAP-WINDOWS-MSVC.cli
index ef4b9b7..8a62ee4 100644
--- a/BOOTSTRAP-WINDOWS-MSVC.cli
+++ b/BOOTSTRAP-WINDOWS-MSVC.cli
@@ -145,7 +145,7 @@ prefix/suffix, etc):
 You will also need to build and install the standard build system modules:
 
 \
-> b install: libbuild2-*\
+> b install: !config.install.scope=project libbuild2-*\
 \
 
 \N|To verify the build system modules installation you can load them with the
@@ -239,7 +239,8 @@ Finally, we build and install the standard build system modules:
 
 \
 > bpkg build --for install libbuild2-autoconf libbuild2-kconfig
-> bpkg install --all-pattern=libbuild2-*
+> bpkg install !config.install.scope=project ^
+  --all-pattern=libbuild2-*
 \
 
 \N|To get a list of the standard pre-installed build system modules in a
diff --git a/build-clang.bat.in b/build-clang.bat.in
index 51d7e13..dadb1f7 100644
--- a/build-clang.bat.in
+++ b/build-clang.bat.in
@@ -513,7 +513,7 @@ where %bdep%
 
 @if "_%projects%_" == "__" goto mods_ile
 
-%b% %verbose% %jobs% install: %projects:~1%
+%b% %verbose% %jobs% install: ^^!config.install.scope=project %projects:~1%
 @if errorlevel 1 goto error
 
 %b% %verbose% noop: %tests:~1%
@@ -636,7 +636,7 @@ where %bdep%
 %bpkg% %verbose% %jobs% %timeout% build --for install %packages:~1%
 @if errorlevel 1 goto error
 
-%bpkg% %verbose% %jobs% install --all-pattern=libbuild2-*
+%bpkg% %verbose% %jobs% install ^^!config.install.scope=project --all-pattern=libbuild2-*
 @if errorlevel 1 goto error
 
 :mods_ipe
diff --git a/build-mingw.bat.in b/build-mingw.bat.in
index 03f3ab8..098f8d5 100644
--- a/build-mingw.bat.in
+++ b/build-mingw.bat.in
@@ -524,7 +524,7 @@ where %bdep%
 
 @if "_%projects%_" == "__" goto mods_ile
 
-%b% %verbose% %jobs% install: %projects:~1%
+%b% %verbose% %jobs% install: ^^!config.install.scope=project %projects:~1%
 @if errorlevel 1 goto error
 
 %b% %verbose% noop: %tests:~1%
@@ -646,7 +646,7 @@ where %bdep%
 %bpkg% %verbose% %jobs% %timeout% build --for install %packages:~1%
 @if errorlevel 1 goto error
 
-%bpkg% %verbose% %jobs% install --all-pattern=libbuild2-*
+%bpkg% %verbose% %jobs% install ^^!config.install.scope=project --all-pattern=libbuild2-*
 @if errorlevel 1 goto error
 
 :mods_ipe
diff --git a/build-msvc.bat.in b/build-msvc.bat.in
index 6d72012..c009811 100644
--- a/build-msvc.bat.in
+++ b/build-msvc.bat.in
@@ -478,7 +478,7 @@ where %bdep%
 
 @if "_%projects%_" == "__" goto mods_ile
 
-%b% %verbose% %jobs% install: %projects:~1%
+%b% %verbose% %jobs% install: ^^!config.install.scope=project %projects:~1%
 @if errorlevel 1 goto error
 
 %b% %verbose% noop: %tests:~1%
@@ -600,7 +600,7 @@ where %bdep%
 %bpkg% %verbose% %jobs% %timeout% build --for install %packages:~1%
 @if errorlevel 1 goto error
 
-%bpkg% %verbose% %jobs% install --all-pattern=libbuild2-*
+%bpkg% %verbose% %jobs% install ^^!config.install.scope=project --all-pattern=libbuild2-*
 @if errorlevel 1 goto error
 
 :mods_ipe
diff --git a/build.sh.in b/build.sh.in
index e7c7acc..3334011 100644
--- a/build.sh.in
+++ b/build.sh.in
@@ -563,7 +563,7 @@ $private
   done
 
   if test -n "$projects"; then
-    run "$b" $verbose $jobs install: $projects
+    run "$b" $verbose $jobs install: '!config.install.scope=project' $projects
     run "$b" $verbose noop: $tests
   fi
 
@@ -647,7 +647,7 @@ done
 
 if test -n "$packages"; then
   run "$bpkg" $verbose $jobs $bpkg_build_ops build --for install $packages
-  run "$bpkg" $verbose $jobs install --all-pattern=libbuild2-*
+  run "$bpkg" $verbose $jobs install '!config.install.scope=project' --all-pattern=libbuild2-*
 fi
 
 run cd "$owd"