From 793de43268a8f82e2ee831e1ff4f34de03c055a8 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 6 Sep 2016 12:27:32 +0200 Subject: Documentation improvements --- BOOTSTRAP-WINDOWS.cli | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'BOOTSTRAP-WINDOWS.cli') diff --git a/BOOTSTRAP-WINDOWS.cli b/BOOTSTRAP-WINDOWS.cli index 245f5c4..3a91dbb 100644 --- a/BOOTSTRAP-WINDOWS.cli +++ b/BOOTSTRAP-WINDOWS.cli @@ -5,16 +5,15 @@ " The following instructions are for bootstrapping \c{build2} with either MSVC or MinGW using the Windows command prompt. If you are using any kind of UNIX -emulation layer (for example, MSYS2 or Cygwin) and already have a UNIX shell +emulation layer (for example, MSYS or Cygwin) and already have a UNIX shell with standard utilities, then you most likely should follow \l{#BOOTSTRAP-UNIX Bootstrapping on UNIX} instead. The \c{build2} toolchain on Windows requires a set of extra utilities -(\c{install}, \c{diff}, \c{wget}, \c{tar}, etc). These are provided in the +(\c{install}, \c{diff}, \c{wget}, \c{tar}, etc). These are provided by the \c{build2-baseutils} package (see the \c{README} file inside for details). -Normally the \c{build2} toolchain itself is installed into the same directory -as the utilities in order to produce a combined \c{build2+utilities} -installation. +Normally, the \c{build2} toolchain itself is installed into the same directory +as the utilities in order to produce the combined installation. To build on Windows you will need either MSVC 14 Update 2 or later or MinGW GCC 4.8 or later. Note also that MinGW GCC must be configured with the @@ -24,7 +23,10 @@ implements C++11 threads; run \c{g++ --version} to verify). If you don't already have a suitable C++ compiler, then you can use the \c{build2-mingw} package which provides a minimal MinGW-W64 GCC distribution (see the \c{README} file inside for details). If used, then it should be -unpacked into the same directory as \c{build2-baseutils} as described below. +unpacked into the same directory as \c{build2-baseutils}. + +To bootstrap on Windows with either MSVC or MinGW start with the following +common steps: \dl| @@ -55,8 +57,7 @@ installation directory but you can use other paths. Download the following files as well as their \c{.sha256} checksums from \l{https://download.build2.org}, replacing \i{} with \c{x86_64} for -64-bin Windows and with \c{i686} for 32-bit. Place everything into -\c{C:\\build2-build\\} (build directory). +64-bin Windows and with \c{i686} for 32-bit. \ build2-baseutils-X.Y.Z-.zip @@ -64,7 +65,7 @@ build2-mingw-X.Y.Z-.tar.xz (if required) build2-toolchain-X.Y.Z.tar.xz \ -| +Place everything into \c{C:\\build2-build\\} (build directory).| \li|\n4. Verify Archive Checksums\n @@ -79,15 +80,16 @@ Verify archive checksums match (compare visually): \li|\n5. Unpack \c{build2-baseutils}\n -Unpack the \c{build2-baseutils-X.Y.Z-.zip} archive into to \c{C:\\} using -Windows Explorer (for example, copy the archive directory and paste it). +Unpack the \c{build2-baseutils-X.Y.Z-.zip} archive into \c{C:\\} using +Windows Explorer (for example, copy the archive directory and then paste it). Rename it to \c{C:\\build2\\}. This will be the toolchain installation directory. | \li|\n6. Set \c{PATH}\n -Also verify the utilities are found and work: +Set the \c{PATH} environment variable and verify the utilities are found and +work: \ > set PATH=C:\build2\bin;%PATH% -- cgit v1.1