Merge pull request #371 from grafikrobot/bootstrap-cleanup

Adjust bootsrap for current B2 builds.

Author: pdimov

bootstrap.bat

@@ -2,7 +2,7 @@
 
 SETLOCAL
 
-REM Copyright 2019 Rene Rivera
+REM Copyright 2019-2020 Rene Rivera
 REM Copyright (C) 2009 Vladimir Prus
 REM
 REM Distributed under the Boost Software License, Version 1.0.
@@ -12,7 +12,7 @@ ECHO Building Boost.Build engine
 if exist ".\tools\build\src\engine\b2.exe" del tools\build\src\engine\b2.exe
 pushd tools\build\src\engine
 
-call .\build.bat %* > ..\..\..\..\bootstrap.log
+call .\build.bat
 @ECHO OFF
 
 popd
@@ -33,6 +33,7 @@ REM properly. Default to msvc if not specified.
 SET TOOLSET=msvc
 
 IF "%1"=="gcc" SET TOOLSET=gcc
+IF "%1"=="clang" SET TOOLSET=clang
 
 IF "%1"=="vc71" SET TOOLSET=msvc : 7.1
 IF "%1"=="vc8" SET TOOLSET=msvc : 8.0
@@ -88,7 +89,6 @@ goto :end
 
 ECHO.
 ECHO Failed to build Boost.Build engine.
-ECHO Please consult bootstrap.log for further diagnostics.
 ECHO.
 
 REM Set an error code to allow `bootstrap && b2`

bootstrap.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2019 Rene Rivera
+# Copyright 2019-2020 Rene Rivera
 # Copyright (C) 2005, 2006 Douglas Gregor.
 # Copyright (C) 2006 The Trustees of Indiana University
 #
@@ -152,7 +152,7 @@ Configuration:
   -h, --help                display this help and exit
   --with-bjam=BJAM          use existing Boost.Jam executable (bjam)
                             [automatically built]
-  --with-toolset=TOOLSET    use specific Boost.Build toolset
+  --with-toolset=TOOLSET    use specific B2 toolset
                             [automatically detected]
   --show-libraries          show the set of libraries that require build
                             and installation steps (i.e., those libraries
@@ -212,7 +212,7 @@ if test "x$TOOLSET" = x; then
     ;;
 
     * )
-    # Not supported by Boost.Build
+    # Not supported by B2
     ;;
   esac
 fi
@@ -221,13 +221,12 @@ rm -f config.log
 
 # Build bjam
 if test "x$BJAM" = x; then
-  $ECHO -n "Building Boost.Build engine with toolset $TOOLSET... "
+  $ECHO "Building B2 engine.."
   pwd=`pwd`
-  (cd "$my_dir/tools/build/src/engine" && ./build.sh "$TOOLSET") > bootstrap.log 2>&1
+  (cd "$my_dir/tools/build/src/engine" && ./build.sh)
   if [ $? -ne 0 ]; then
       echo
-      echo "Failed to build Boost.Build build engine" 
-      echo "Consult 'bootstrap.log' for more details"
+      echo "Failed to build B2 build engine"
       exit 1
   fi
   cd "$pwd"
@@ -327,14 +326,14 @@ if test -r "project-config.jam"; then
     counter=`expr $counter + 1`
   done
 
-  echo "Backing up existing Boost.Build configuration in project-config.jam.$counter"
+  echo "Backing up existing B2 configuration in project-config.jam.$counter"
   mv "project-config.jam" "project-config.jam.$counter"
 fi
 
 # Generate user-config.jam
-echo "Generating Boost.Build configuration in project-config.jam for $TOOLSET..."
+echo "Generating B2 configuration in project-config.jam for $TOOLSET..."
 cat > project-config.jam <<EOF
-# Boost.Build Configuration
+# B2 Configuration
 # Automatically generated by bootstrap.sh
 
 import option ;
@@ -410,7 +409,7 @@ Further information:
    - Getting started guide: 
      http://www.boost.org/more/getting_started/unix-variants.html
      
-   - Boost.Build documentation:
+   - B2 documentation:
      http://www.boost.org/build/
 
 EOF