aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BOOTSTRAP-MINGW.cli156
-rw-r--r--BOOTSTRAP-MSVC.cli156
-rw-r--r--BOOTSTRAP-UNIX.cli36
3 files changed, 329 insertions, 19 deletions
diff --git a/BOOTSTRAP-MINGW.cli b/BOOTSTRAP-MINGW.cli
index 8f6591d..440ef68 100644
--- a/BOOTSTRAP-MINGW.cli
+++ b/BOOTSTRAP-MINGW.cli
@@ -37,4 +37,160 @@ use just \c{g++} for the compiler:
\
> .\build-mingw.bat g++
\
+
+Note also that about half way (\c{bpkg fetch} on step 4 below) the script will
+stop and prompt you to verify the authenticity of the repository certificate.
+
+The end result of the bootstrap process (performed either with the script or
+manually) is the installed toolchain as well as the \c{bpkg} configuration in
+\c{build2-toolchain-X.Y\\} that can be used to \l{#UPGRADE upgrade} to newer
+versions. It can also be used to uninstall the toolchain:
+
+\
+> cd build2-toolchain-X.Y
+> bpkg uninstall build2 bpkg
+\
+
+The rest of this section outlines the manual bootstrap process.
+
+\dl|
+
+\li|1. Bootstrap, Phase 1\n
+
+First, we build a minimal build system with the provided
+\c{bootstrap-mingw.bat} batch file. Normally, the only argument you will pass
+to this script is the C++ compiler to use but there is also a way to specify
+compile options; run \c{bootstrap-mingw.bat /?} and see the
+\c{build2\\INSTALL} file for details.
+
+\
+> cd build2
+> .\bootstrap-mingw.bat g++ -static
+
+> build2\b-boot --version
+\
+
+|
+
+\li|\n2. Bootstrap, Phase 2\n
+
+Then, we rebuild the build system with the result of Phase 1 linking
+libraries statically.
+
+\
+> build2\b-boot config.cxx=g++ config.bin.lib=static
+> move /y build2\b.exe build2\b-boot.exe
+
+> build2\b-boot --version
+\
+
+|
+
+\li|\n3. Stage\n
+
+On this step the entire toolchain is built and staged:
+
+\
+> run cd .. # Back to build2-toolchain-X.Y.Z\
+
+> build2\build2\b-boot configure ^
+ config.cxx=g++ ^
+ config.bin.lib=shared ^
+ config.bin.suffix=-stage ^
+ config.install.root=C:\build2 ^
+ config.install.data_root=root\stage
+
+> build2\build2\b-boot install
+\
+
+The strange-looking \c{config.install.data_root=root\\stage} means install
+data files (as opposed to executable files) into the \c{stage\\} subdirectory
+of wherever \c{config.install.root} points to (so in our case it will be
+\c{C:\\build2\\stage\\}). This subdirectory is temporary and will be removed
+in a few steps.
+
+Verify the toolchain binaries can be found and work (this relies on the
+\c{PATH} environment variable we have set earlier):
+
+\
+> where b-stage
+C:\build2\bin\b-stage.exe
+
+> where bpkg-stage
+C:\build2\bin\bpkg-stage.exe
+
+> b-stage --version
+> bpkg-stage --version
+\
+
+On the next step we will use \c{bpkg} to build and install the \"final\"
+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
+the \"final\" installation and skip the rest. For this your will need to
+change the \c{configure} command line above along these lines:
+
+\
+> build2\build2\b-boot configure ^
+ config.cxx=g++ ^
+ config.cc.coptions=-O3 ^
+ config.bin.lib=shared ^
+ config.install.root=C:\build2
+\
+
+|
+
+\li|\n4. Install\n
+
+Next, we use the staged toolchain to build and install the \"final\" toolchain
+from the package repository using the \c{bpkg} package manager. First, we
+create the \c{bpkg} configuration. The configuration values are pretty similar
+to the previous step and you may want/need to make similar adjustments.
+
+\
+> cd .. # Back to build2-build\
+> md build2-toolchain-X.Y
+> cd build2-toolchain-X.Y
+
+> bpkg-stage create ^
+ cc ^
+ config.cxx=g++ ^
+ config.cc.coptions=-O3 ^
+ config.bin.lib=shared ^
+ config.install.root=C:\build2
+\
+
+Next, we add the package repository, build, and install:
+
+\
+> bpkg-stage add https://pkg.cppget.org/1/alpha
+> bpkg-stage fetch
+> bpkg-stage build build2 bpkg
+> bpkg-stage install build2 bpkg
+\
+
+Finally, we verify the result:
+
+\
+> where b
+C:\build2\bin\b.exe
+
+> where bpkg
+C:\build2\bin\bpkg.exe
+
+> b --version
+> bpkg --version
+\
+
+|
+
+\li|\n5. Clean\n
+
+The last thing we need to do is uninstall the staged toolchain:
+
+\
+> cd ..\build2-toolchain-X.Y.Z # Back to bootstrap.
+> b uninstall
+\
+
+||
"
diff --git a/BOOTSTRAP-MSVC.cli b/BOOTSTRAP-MSVC.cli
index 5916d55..0ade62d 100644
--- a/BOOTSTRAP-MSVC.cli
+++ b/BOOTSTRAP-MSVC.cli
@@ -26,4 +26,160 @@ prompt) like this:
\
> .\build-msvc.bat
\
+
+Note also that about half way (\c{bpkg fetch} on step 4 below) the script will
+stop and prompt you to verify the authenticity of the repository certificate.
+
+The end result of the bootstrap process (performed either with the script or
+manually) is the installed toolchain as well as the \c{bpkg} configuration in
+\c{build2-toolchain-X.Y\\} that can be used to \l{#UPGRADE upgrade} to newer
+versions. It can also be used to uninstall the toolchain:
+
+\
+> cd build2-toolchain-X.Y
+> bpkg uninstall build2 bpkg
+\
+
+The rest of this section outlines the manual bootstrap process.
+
+\dl|
+
+\li|1. Bootstrap, Phase 1\n
+
+First, we build a minimal build system with the provided
+\c{bootstrap-msvc.bat} batch file. Normally, the only argument you will pass
+to this script is the C++ compiler to use but there is also a way to specify
+compile options; run \c{bootstrap-msvc.bat /?} and see the \c{build2\\INSTALL}
+file for details.
+
+\
+> cd build2
+> .\bootstrap-msvc.bat cl
+
+> build2\b-boot --version
+\
+
+|
+
+\li|\n2. Bootstrap, Phase 2\n
+
+Then, we rebuild the build system with the result of Phase 1 linking libraries
+statically.
+
+\
+> build2\b-boot config.cxx=cl config.bin.lib=static
+> move /y build2\b.exe build2\b-boot.exe
+
+> build2\b-boot --version
+\
+
+|
+
+\li|\n3. Stage\n
+
+On this step the entire toolchain is built and staged:
+
+\
+> run cd .. # Back to build2-toolchain-X.Y.Z\
+
+> build2\build2\b-boot configure ^
+ config.cxx=cl ^
+ config.bin.lib=shared ^
+ config.bin.suffix=-stage ^
+ config.install.root=C:\build2 ^
+ config.install.data_root=root\stage
+
+> build2\build2\b-boot install
+\
+
+The strange-looking \c{config.install.data_root=root\\stage} means install
+data files (as opposed to executable files) into the \c{stage\\} subdirectory
+of wherever \c{config.install.root} points to (so in our case it will be
+\c{C:\\build2\\stage\\}). This subdirectory is temporary and will be removed
+in a few steps.
+
+Verify the toolchain binaries can be found and work (this relies on the
+\c{PATH} environment variable we have set earlier):
+
+\
+> where b-stage
+C:\build2\bin\b-stage.exe
+
+> where bpkg-stage
+C:\build2\bin\bpkg-stage.exe
+
+> b-stage --version
+> bpkg-stage --version
+\
+
+On the next step we will use \c{bpkg} to build and install the \"final\"
+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
+the \"final\" installation and skip the rest. For this your will need to
+change the \c{configure} command line above along these lines:
+
+\
+> build2\build2\b-boot configure ^
+ config.cxx=cl ^
+ \"config.cc.coptions=/O2 /Oi\" ^
+ config.bin.lib=shared ^
+ config.install.root=C:\build2
+\
+
+|
+
+\li|\n4. Install\n
+
+Next, we use the staged toolchain to build and install the \"final\" toolchain
+from the package repository using the \c{bpkg} package manager. First, we
+create the \c{bpkg} configuration. The configuration values are pretty similar
+to the previous step and you may want/need to make similar adjustments.
+
+\
+> cd .. # Back to build2-build\
+> md build2-toolchain-X.Y
+> cd build2-toolchain-X.Y
+
+> bpkg-stage create ^
+ cc ^
+ config.cxx=cl ^
+ \"config.cc.coptions=/O2 /Oi\" ^
+ config.bin.lib=shared ^
+ config.install.root=C:\build2
+\
+
+Next, we add the package repository, build, and install:
+
+\
+> bpkg-stage add https://pkg.cppget.org/1/alpha
+> bpkg-stage fetch
+> bpkg-stage build build2 bpkg
+> bpkg-stage install build2 bpkg
+\
+
+Finally, we verify the result:
+
+\
+> where b
+C:\build2\bin\b.exe
+
+> where bpkg
+C:\build2\bin\bpkg.exe
+
+> b --version
+> bpkg --version
+\
+
+|
+
+\li|\n5. Clean\n
+
+The last thing we need to do is uninstall the staged toolchain:
+
+\
+> cd ..\build2-toolchain-X.Y.Z # Back to bootstrap.
+> b uninstall
+\
+
+||
"
diff --git a/BOOTSTRAP-UNIX.cli b/BOOTSTRAP-UNIX.cli
index 68b5fee..a31c513 100644
--- a/BOOTSTRAP-UNIX.cli
+++ b/BOOTSTRAP-UNIX.cli
@@ -80,7 +80,7 @@ While this will use Clang and install into \c{/opt/build2}:
$ ./build.sh --install-dir /opt/build2 --sudo sudo clang++
\
-Note also that about half way (\c{bpkg fetch} on step 6 below) the script will
+Note also that about half way (\c{bpkg fetch} on step 4 below) the script will
stop and prompt you to verify the authenticity of the repository certificate.
To run the script unattended you can specify the certificate fingerprint with
the \c{--trust} option.
@@ -95,12 +95,11 @@ $ cd build2-toolchain-X.Y
$ bpkg uninstall build2 bpkg
\
-The rest of this section outlines the manual bootstrap with the step numbering
-continued from the above list.
+The rest of this section outlines the manual bootstrap process.
\dl|
-\li|3. Bootstrap, Phase 1\n
+\li|1. Bootstrap, Phase 1\n
First, we build a minimal build system with the provided \c{bootstrap.sh}
script. Normally, the only argument you will pass to this script is the
@@ -117,7 +116,7 @@ $ build2/b-boot --version
|
-\li|\n4. Bootstrap, Phase 2\n
+\li|\n2. Bootstrap, Phase 2\n
Then, we rebuild the build system with the result of Phase 1 linking
libraries statically.
@@ -131,19 +130,12 @@ $ build2/b-boot --version
|
-\li|\n5. Stage\n
+\li|\n3. Stage\n
On this step the entire toolchain is built and staged. Here you may want
to adjust a few things, such as the installation directory or the \c{sudo}
program (remove the \c{config.install.sudo} line if you don't need one).
-The strange-looking \c{config.install.data_root=root/stage} means install
-data files (as opposed to executable files) into the \c{stage/} subdirectory
-of wherever \c{config.install.root} points (so in our case it will be
-\c{/usr/local/stage/}). Note that this subdirectory is temporary and will be
-removed in a few steps. But if you don't like the default location, feel
-free to change it (for example, to \c{/tmp/stage}).
-
You may also need to remove the \c{config.bin.rpath} line if your target
doesn't support \i{rpath}. Specifically, if building on Windows (with MSYS or
Cygwin), remove both \c{.rpath} and \c{.sudo}. But if unsure, leave \c{.rpath}
@@ -165,6 +157,13 @@ $ build2/build2/b-boot configure \
$ build2/build2/b-boot install
\
+The strange-looking \c{config.install.data_root=root/stage} means install
+data files (as opposed to executable files) into the \c{stage/} subdirectory
+of wherever \c{config.install.root} points to (so in our case it will be
+\c{/usr/local/stage/}). Note that this subdirectory is temporary and will be
+removed in a few steps. But if you don't like the default location, feel
+free to change it (for example, to \c{/tmp/stage}).
+
Depending on the installation directory, the installed \c{build2} binaries
may not be automatically found. On most platforms \c{/usr/local/bin/} is in
the \c{PATH} environment variable by default and you should be able to run:
@@ -212,7 +211,7 @@ $ build2/build2/b-boot configure \
|
-\li|\n6. Install\n
+\li|\n4. Install\n
Next, we use the staged toolchain to build and install the \"final\" toolchain
from the package repository using the \c{bpkg} package manager. First, we
@@ -252,21 +251,20 @@ $ which b
$ which bpkg
/usr/local/bin/bpkg
-$ b-stage --version
-$ bpkg-stage --version
+$ b --version
+$ bpkg --version
\
|
-\li|\n7. Clean\n
+\li|\n5. Clean\n
The last thing we need to do is uninstall the staged toolchain:
\
-$ cd ../build2-toolchain-X.Y.Z/ # Back to bootstrap.
+$ cd ../build2-toolchain-X.Y.Z # Back to bootstrap.
$ b uninstall
\
||
-
"