Add libbuild2-kconfig to installation/upgrade documentation and build scripts

1 files changed, 63 insertions, 12 deletions

diff --git a/BOOTSTRAP-WINDOWS-CLANG.cli b/BOOTSTRAP-WINDOWS-CLANG.cli
index 507b9ce..7f44b9d 100644
--- a/BOOTSTRAP-WINDOWS-CLANG.cli
+++ b/BOOTSTRAP-WINDOWS-CLANG.cli
@@ -48,7 +48,7 @@ versions. It can also be used to uninstall the toolchain:
 
 \
 > cd build2-toolchain-X.Y
-> bpkg uninstall build2 bpkg bdep
+> bpkg uninstall --all
 \
 
 \N|Note that in both cases (manual or scripted bootstrap), if something goes
@@ -121,7 +121,7 @@ libraries and then staged:
   config.install.root=C:\build2       ^
   config.install.data_root=root\stage
 
-> build2\build2\b-boot install: build2/ bpkg/
+> build2\build2\b-boot install: build2\ bpkg\
 \
 
 The strange-looking \c{config.install.data_root=root\\stage} means install
@@ -147,9 +147,14 @@ C:\build2\bin\bpkg-stage.exe
 At the next step we will use \c{bpkg} to build and install the entire
 toolchain. If for some reason you prefer not to build from packages (for
 example, because the machine is offline), then you can convert this step into
-a local installation and skip the rest. For this you will need to change
-the \c{configure} and \c{install} command lines above along these lines (see
-also a note on the following step about only building shared libraries):
+a local installation and skip the rest of the steps.
+
+\N|To perform a local installation with the \c{build-clang.bat} batch file,
+pass the \c{--local} option.|
+
+To perform a local installation you will need to change the \c{configure} and
+\c{install} command lines above along these lines (see also a note on the
+following step about only building shared libraries):
 
 \
 > build2\build2\b-boot configure ^
@@ -158,16 +163,28 @@ also a note on the following step about only building shared libraries):
   config.bin.lib=shared          ^
   config.install.root=C:\build2
 
-> build2\build2\b-boot install: build2/ bpkg/ bdep/
+> build2\build2\b-boot install: build2\ bpkg\ bdep\
 \
 
-\N|To perform a local installation with the \c{build-clang.bat} batch file,
-pass the \c{--local} option.|
+You will also need to build and install the standard build system modules:
+
+\
+> b install: libbuild2-*\
+\
+
+\N|To verify the build system modules installation you can load them with the
+following command:
+
+\
+> b noop: tests\libbuild2-*\
+\
+
+|
 
 To uninstall such a local installation, run:
 
 \
-> b uninstall: build2/ bpkg/ bdep/
+> b uninstall: build2\ bpkg\ bdep\ libbuild2-*\
 \
 
 |
@@ -201,10 +218,20 @@ Next, we add the package repository, build, and install:
 > bpkg-stage add https://pkg.cppget.org/1/alpha
 > bpkg-stage fetch
 > bpkg-stage build --for install build2 bpkg bdep
-> bpkg-stage install build2 bpkg bdep
+> bpkg-stage install --all
 \
 
-Finally, we verify the result:
+\N|By default \c{bpkg} will build the latest available version of each
+package. You can, however, specify the desired versions explicitly, for
+example:
+
+\
+> bpkg-stage build --for install build2/X.Y.Z bpkg/X.Y.Z bdep/X.Y.Z
+\
+
+|
+
+To verify the result, run:
 
 \
 > where b
@@ -221,15 +248,39 @@ C:\build2\bin\bdep.exe
 > bdep --version
 \
 
+Finally, we build and install the standard build system modules:
+
+\
+> bpkg build --for install libbuild2-kconfig
+> bpkg install libbuild2-kconfig
+\
+
+\N|To get a list of the standard pre-installed build system modules in a
+specific version of the toolchain, run:
+
+\
+> cd ..\build2-toolchain-X.Y.Z
+> dir /B libbuild2-*
+\
+
 |
 
+\N|To verify the build system modules installation you can load them with the
+following command:
+
+\
+> b noop: ..\build2-toolchain-X.Y.Z\tests\libbuild2-*\
+\
+
+||
+
 \li|\n\b{5. Clean}\n
 
 The last thing we need to do is uninstall the staged tools:
 
 \
 > cd ..\build2-toolchain-X.Y.Z  # Back to bootstrap.
-> b uninstall: build2/ bpkg/
+> b uninstall: build2\ bpkg\
 \
 
 ||