aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-10-11 13:44:39 (GMT)
committerBoris Kolpackov <boris@codesynthesis.com>2019-10-11 13:44:39 (GMT)
commit1ee55930c06cc1e39da63c0096fce7e9facee103 (patch)
tree4a201823a6d3527de393da91b7ff5b4123bce50e
parent3bfe882189f708f4fc83fbed5ae20fa5851e38bf (diff)
Rename BOOTSTRAP-{MINGW,MSVC} to BOOTSTRAP-WINDOWS-{...}
Also mention WSL in addition to MSYS and Cygwin as a UNIX-like emulation on Windows.
-rw-r--r--BOOTSTRAP-UNIX.cli4
-rw-r--r--BOOTSTRAP-WINDOWS-MINGW.cli (renamed from BOOTSTRAP-MINGW.cli)2
-rw-r--r--BOOTSTRAP-WINDOWS-MSVC.cli (renamed from BOOTSTRAP-MSVC.cli)2
-rw-r--r--BOOTSTRAP-WINDOWS.cli14
-rw-r--r--INSTALL.cli8
-rw-r--r--build-mingw.bat2
-rw-r--r--build-msvc.bat2
-rw-r--r--buildfile16
-rwxr-xr-xdoc/cli.sh6
-rw-r--r--doc/install.cli8
10 files changed, 32 insertions, 32 deletions
diff --git a/BOOTSTRAP-UNIX.cli b/BOOTSTRAP-UNIX.cli
index 24c15a5..0546a9d 100644
--- a/BOOTSTRAP-UNIX.cli
+++ b/BOOTSTRAP-UNIX.cli
@@ -6,7 +6,7 @@
The following instructions are for bootstrapping \c{build2} on UNIX-like
operating systems (GNU/Linux, FreeBSD, etc). For Mac OS X first see
\l{#bootstrap-macosx Bootstrapping on Mac OS X}. These instructions should
-also be used for UNIX emulation layers on Windows (for example, MSYS or
+also be used for UNIX emulation layers on Windows (for example, WSL, MSYS, or
Cygwin) where you already have a UNIX shell with standard utilities.
\dl|
@@ -36,7 +36,7 @@ Place everything into \c{~/build2-build/} (build directory) and verify the
archive checksum matches:
\
-# Linux, MSYS, Cygwin:
+# Linux, WSL, MSYS, Cygwin:
#
$ sha256sum -c build2-toolchain-X.Y.Z.tar.xz.sha256
diff --git a/BOOTSTRAP-MINGW.cli b/BOOTSTRAP-WINDOWS-MINGW.cli
index bc6fab1..163d3a7 100644
--- a/BOOTSTRAP-MINGW.cli
+++ b/BOOTSTRAP-WINDOWS-MINGW.cli
@@ -1,4 +1,4 @@
-// file : BOOTSTRAP-MINGW.cli
+// file : BOOTSTRAP-WINDOWS-MINGW.cli
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
diff --git a/BOOTSTRAP-MSVC.cli b/BOOTSTRAP-WINDOWS-MSVC.cli
index fc4066e..59c08d1 100644
--- a/BOOTSTRAP-MSVC.cli
+++ b/BOOTSTRAP-WINDOWS-MSVC.cli
@@ -1,4 +1,4 @@
-// file : BOOTSTRAP-MSVC.cli
+// file : BOOTSTRAP-WINDOWS-MSVC.cli
// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
diff --git a/BOOTSTRAP-WINDOWS.cli b/BOOTSTRAP-WINDOWS.cli
index 9676f8a..c99ffc7 100644
--- a/BOOTSTRAP-WINDOWS.cli
+++ b/BOOTSTRAP-WINDOWS.cli
@@ -5,9 +5,9 @@
"
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, 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.
+emulation layer (for example, WSL, 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.
\N|Note that if you continue with these instructions but you already have your
own installation of MSYS and/or MinGW, then make sure that their paths are not
@@ -138,9 +138,9 @@ directory:
||
-If building with MSVC, continue with \l{#bootstrap-msvc Bootstrapping with
-MSVC}.
+If building with MSVC, continue with \l{#bootstrap-windows-msvc Bootstrapping
+on Windows with MSVC}.
-If building with MinGW, continue with \l{#bootstrap-mingw Bootstrapping with
-MinGW}.
+If building with MinGW, continue with \l{#bootstrap-windows-mingw
+Bootstrapping on Windows with MinGW}.
"
diff --git a/INSTALL.cli b/INSTALL.cli
index ba4be67..b361164 100644
--- a/INSTALL.cli
+++ b/INSTALL.cli
@@ -72,12 +72,12 @@ prefer not to build from packages (for example, because the machine is
offline).|
For Windows, if you are using either MSVC or MinGW, continue with
-\l{#bootstrap-windows Bootstrapping on Windows}. If using MSYS or Cygwin,
-then instead refer to \l{#bootstrap-unix Bootstrapping on UNIX}.
+\l{#bootstrap-windows Bootstrapping on Windows}. If using WSL, MSYS, or
+Cygwin, then instead refer to \l{#bootstrap-unix Bootstrapping on UNIX}.
For Mac OS X, continue with \l{#bootstrap-macosx Bootstrapping on Mac OS X}.
For other UNIX-like operating systems (GNU/Linux, FreeBSD, etc; this also
-includes MSYS/Cygwin), continue with \l{#bootstrap-unix Bootstrapping on
-UNIX}.
+includes WSL, MSYS, and Cygwin), continue with \l{#bootstrap-unix
+Bootstrapping on UNIX}.
"
diff --git a/build-mingw.bat b/build-mingw.bat
index b505c3d..53ba6a3 100644
--- a/build-mingw.bat
+++ b/build-mingw.bat
@@ -31,7 +31,7 @@ echo additional make options, for example:
echo.
echo %0 --make mingw32-make --make -j8 g++
echo.
-echo See the BOOTSTRAP-MINGW file for details.
+echo See the BOOTSTRAP-WINDOWS-MINGW file for details.
echo.
goto end
diff --git a/build-msvc.bat b/build-msvc.bat
index 7d1e31a..85e8244 100644
--- a/build-msvc.bat
+++ b/build-msvc.bat
@@ -24,7 +24,7 @@ echo.
echo The --trust option recognizes two special values: 'yes' ^(trust everything^)
echo and 'no' (trust nothing).
echo.
-echo See the BOOTSTRAP-MSVC file for details.
+echo See the BOOTSTRAP-WINDOWS-MSVC file for details.
echo.
goto end
diff --git a/buildfile b/buildfile
index 8391cff..fd343d0 100644
--- a/buildfile
+++ b/buildfile
@@ -8,14 +8,14 @@
d = libpkgconf/ libbutl/ build2/ \
libsqlite3/ libodb/ libodb-sqlite/ libbpkg/ bpkg/ bdep/ doc/
-i = \
-INSTALL \
-UPGRADE \
-BOOTSTRAP-MACOSX \
-BOOTSTRAP-MINGW \
-BOOTSTRAP-MSVC \
-BOOTSTRAP-UNIX \
-BOOTSTRAP-WINDOWS
+i = \
+INSTALL \
+UPGRADE \
+BOOTSTRAP-UNIX \
+BOOTSTRAP-MACOSX \
+BOOTSTRAP-WINDOWS \
+BOOTSTRAP-WINDOWS-MINGW \
+BOOTSTRAP-WINDOWS-MSVC
./: $d doc{$i README CONTRIBUTING.md} cli{$i} file{build.sh build-*} manifest
diff --git a/doc/cli.sh b/doc/cli.sh
index b2e2605..a520898 100755
--- a/doc/cli.sh
+++ b/doc/cli.sh
@@ -78,8 +78,8 @@ function gen_txt () # <name>
gen_txt INSTALL
gen_txt UPGRADE
-gen_txt BOOTSTRAP-MACOSX
-gen_txt BOOTSTRAP-MINGW
-gen_txt BOOTSTRAP-MSVC
gen_txt BOOTSTRAP-UNIX
+gen_txt BOOTSTRAP-MACOSX
gen_txt BOOTSTRAP-WINDOWS
+gen_txt BOOTSTRAP-WINDOWS-MINGW
+gen_txt BOOTSTRAP-WINDOWS-MSVC
diff --git a/doc/install.cli b/doc/install.cli
index 83e4cc7..09e3679 100644
--- a/doc/install.cli
+++ b/doc/install.cli
@@ -37,14 +37,14 @@ source "../INSTALL.cli";
source "../BOOTSTRAP-WINDOWS.cli";
"
-\h2#bootstrap-msvc|Bootstrapping with MSVC|
+\h2#bootstrap-windows-msvc|Bootstrapping on Windows with MSVC|
"
-source "../BOOTSTRAP-MSVC.cli";
+source "../BOOTSTRAP-WINDOWS-MSVC.cli";
"
-\h2#bootstrap-mingw|Bootstrapping with MinGW|
+\h2#bootstrap-windows-mingw|Bootstrapping on Windows with MinGW|
"
-source "../BOOTSTRAP-MINGW.cli";
+source "../BOOTSTRAP-WINDOWS-MINGW.cli";
"
\h#bootstrap-macosx|Bootstrapping on Mac OS X|