From ed58957b9ff61004d4e00719504480147e629a8f Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sat, 28 Nov 2015 10:11:09 +0200
Subject: Update INSTALL, bootstrap with revised steps

---
 INSTALL   | 70 +++++++++++++++++++++++++++++++++++++--------------------------
 bootstrap | 16 ++++++++++++---
 2 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/INSTALL b/INSTALL
index b37563e..b48d1b9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -8,48 +8,60 @@ it. To accomplish this, use the 'bootstrap' shell script found in the
 root directory of the build2 project. The following is a recommended
 sequence of steps:
 
-0. Get libbutl unless one is already present in the build2 directory
-   (whether one is bundled depends on how you obtained build2 source
-   code). Place it next to build2, so that you have:
+0. Get libbutl and place it next to build2, so that you have:
 
    libbutl/ (or libbutl-x.y.z/)
    build2/  (or build2-x.y.z/)
 
-1. Execute 'bootstrap' specifying the C++ compiler to be used if necessary
-   (default is 'g++'). For example:
+1. Change to the build2 directory and execute 'bootstrap' specifying
+   the C++ compiler to be used, if necessary (default is 'g++'; run
+   ./bootstrap --help for other options). For example:
 
+   $ cd build2
    $ ./bootstrap --cxx clang++-3.5
 
-   Once the script completes successfully, the build2 binary is saved
-   as 'build/b-boot'.
+   Once the script completes successfully (which may take some time), the
+   build2 binary is saved as 'build/b-boot':
 
-2. Next, build the build2 binary using the bootstrapped binary from step
-   1 above, again specifying the C++ compiler if necessary, for example:
+   $ build/b-boot --version
 
-   $ build/b-boot config.cxx=clang++-3.5
+2. Next, build libbutl and the build2 binary using the bootstrapped binary
+   from step 1 above:
 
-   If you had to obtain libbutl at step 0, then you will also have to
-   specify its location, for example:
+   $ build/b-boot 'configure(../libbutl/)'
+   $ build/b-boot config.import.libbutl=../libbutl configure update
 
-   $ build/b-boot config.import.libbutl=../libbutl ...
+   Again, if necessary, you can also specify the C++ compiler:
 
-   The result of this command is saved as 'build/b'.
+   $ build/b-boot config.cxx=clang++-3.5 ...
 
-3. Finally, rebuild the build2 binary using the binary built at step 2
-   above, and verify that they are identical. For example:
+   The resulting build2 binary is saved as 'build/b':
 
-   $ mv build/b build/b-prev
-   $ build/b-prev config.cxx=clang++-3.5 clean
-   $ build/b-prev config.cxx=clang++-3.5 configure update
-   $ diff -b build/b build/b-prev
+   $ build/b --version
 
-   If you had to obtain libbutl, then this becomes ('...' stands for
-   any extra configuration you may have, like the C++ compiler above):
+3. The last step is optional and involves building libbutl and build2 using
+   the binary built on step 2 above and verifying that the two builds are
+   identical.
 
-   $ mv build/b build/b-prev
-   $ build/b-prev config.import.libbutl=../libbutl ... clean
-   $ cd ../libbutl
-   $ ../build2/build/b-prev ... configure
-   $ cd ../build2
-   $ build/b-prev config.import.libbutl=../libbutl ... configure update
-   $ diff build/b build/b-prev
+   @@ This is currently broken since the resulting binary contains fill
+      object file paths. So we would need to build in exactly the same
+      place as the original, but that would make the binary from step 2
+      unusable. It seems the only way to make it work is via staging.
+
+   To perform this step, first unpack new copies of libbutl and build2 into
+   a different directory, for example, a verify/ sub-directory. Then complete
+   step 2 for these new copies but using build/b binary from step 2 rather
+   than build/b-boot from step 1. Also, use the libbutl from step 2 in the
+   config.import.libbutl value (otherwise rpath differences will result in
+   different build2 binaries). For example:
+
+   $ cd verify/build2
+   $ ../../build2/build/b '{configure update}(../libbutl/)'
+   $ ../../build2/build/b config.import.libbutl=../../libbutl configure update
+
+   Once this is done, compare the libbutl libraries and build2 binaries, for
+   example:
+
+   $ cd ../..
+   $ diff libbutl/butl/libbutl.so verify/libbutl/butl/libbutl.so
+   $ diff build2/build/b verify/build2/build/b
diff --git a/bootstrap b/bootstrap
index 787d120..dfb6f7f 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,12 +1,13 @@
 #!/bin/sh
 
 cxx=g++
+cxxflags=
 libbutl=
 
 while test $# -ne 0; do
   case $1 in
     --help)
-      echo "Usage: $0 [--help] [--cxx <c++-compiler>]" 1>&2
+      echo "Usage: $0 [--help] [--cxx <compiler>] [--cxxflags <flags>]" 1>&2
       echo "See the INSTALL file for details." 1>&2
       exit 0
       ;;
@@ -19,6 +20,15 @@ while test $# -ne 0; do
       cxx=$1
       shift
       ;;
+    --cxxflags)
+      shift
+      if test $# -eq 0; then
+	echo "error: c++ compiler flags expected after --cxxflags" 1>&2
+	exit 1
+      fi
+      cxx=$1
+      shift
+      ;;
     --libbutl)
       shift
       if test $# -eq 0; then
@@ -79,5 +89,5 @@ src="$src build/test/*.cxx"
 src="$src build/install/*.cxx"
 src="$src $libbutl/butl/*.cxx"
 
-echo $cxx -std=c++1y -I$libbutl -I. -o build/b-boot $src 1>&2
-exec $cxx -std=c++1y -I$libbutl -I. -o build/b-boot $src
+echo $cxx -std=c++1y $cxxflags -I$libbutl -I. -o build/b-boot $src 1>&2
+exec $cxx -std=c++1y $cxxflags -I$libbutl -I. -o build/b-boot $src
-- 
cgit v1.1