From 12069ed3219a7331936646306aaa8e6ee02ce123 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 6 Sep 2016 18:33:38 +0200 Subject: Proofreading fixes to installation instructions --- BOOTSTRAP-MINGW.cli | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'BOOTSTRAP-MINGW.cli') diff --git a/BOOTSTRAP-MINGW.cli b/BOOTSTRAP-MINGW.cli index 6b540fd..790ccfc 100644 --- a/BOOTSTRAP-MINGW.cli +++ b/BOOTSTRAP-MINGW.cli @@ -5,7 +5,7 @@ " Continuing from \l{#BOOTSTRAP-WINDOWS Bootstrapping on Windows}, if you are using your own MinGW distribution, then the resulting \c{build2} binaries will -most likely required a number of DLLs in order to run. It is therefore +most likely require a number of DLLs in order to run. It is therefore recommended that you copy the following files from your MinGW \c{bin\\} subdirectory to \c{C:\\build2\\bin\\} (\c{*} in the last name will normally be \c{dw2-1}, \c{seh-1}, or \c{sjlj-1}): @@ -19,7 +19,7 @@ libgcc_s_*.dll To build with MinGW you can either perform the following steps manually or, if after reviewing the steps, you are happy with using the defaults, run the \c{build-mingw.bat} batch file. It performs (and echoes) the same set of steps -as outline below but only allows you to customization the compiler and +as outlined below but only allows you to customize the compiler and installation directory (run \c{build-mingw.bat /?} for usage). You can also specify an alternative package repository with the \c{BUILD2_REPO} environment variable. @@ -38,8 +38,9 @@ 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. +Note also that at about half way through (\c{bpkg fetch} at 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 @@ -88,10 +89,10 @@ libraries statically. \li|\n3. Stage\n -On this step the entire toolchain is built and staged: +At this step the entire toolchain is built and staged: \ -> run cd .. # Back to build2-toolchain-X.Y.Z\ +> cd .. # Back to build2-toolchain-X.Y.Z\ > build2\build2\b-boot configure ^ config.cxx=g++ ^ @@ -108,7 +109,7 @@ 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 +Verify that the toolchain binaries can be found and work (this relies on the \c{PATH} environment variable we have set earlier): \ @@ -122,10 +123,10 @@ C:\build2\bin\bpkg-stage.exe > bpkg-stage --version \ -On the next step we will use \c{bpkg} to build and install the \"final\" +At 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 +the \"final\" installation and skip the rest. For this you will need to change the \c{configure} command line above along these lines: \ -- cgit v1.1