Просмотр исходного кода

Merge pull request #228 from mloskot/ml/bootstrap-verbose-on-project-jam

[master] Make bootstrap verbose about generating project-config.jam
Peter Dimov 7 лет назад
Родитель
Сommit
ddcbcae481
2 измененных файлов с 16 добавлено и 3 удалено
  1. 11 2
      bootstrap.bat
  2. 5 1
      bootstrap.sh

+ 11 - 2
bootstrap.bat

@@ -51,7 +51,12 @@ IF "%1"=="vc12" SET TOOLSET=msvc : 12.0
 IF "%1"=="vc14" SET TOOLSET=msvc : 14.0
 IF "%1"=="vc14" SET TOOLSET=msvc : 14.0
 IF "%1"=="vc141" SET TOOLSET=msvc : 14.1
 IF "%1"=="vc141" SET TOOLSET=msvc : 14.1
 
 
-ECHO import option ; > project-config.jam
+ECHO.
+ECHO Generating Boost.Build configuration in project-config.jam for %TOOLSET%...
+ECHO # Boost.Build Configuration > project-config.jam
+ECHO # Automatically generated by bootstrap.bat >> project-config.jam
+ECHO. >> project-config.jam
+ECHO import option ; >> project-config.jam
 ECHO. >> project-config.jam
 ECHO. >> project-config.jam
 ECHO using %TOOLSET% ; >> project-config.jam
 ECHO using %TOOLSET% ; >> project-config.jam
 ECHO. >> project-config.jam
 ECHO. >> project-config.jam
@@ -62,7 +67,11 @@ ECHO.
 ECHO Bootstrapping is done. To build, run:
 ECHO Bootstrapping is done. To build, run:
 ECHO.
 ECHO.
 ECHO     .\b2
 ECHO     .\b2
-ECHO.    
+ECHO.
+ECHO.    To generate header files, run:
+ECHO.
+ECHO.    .\b2 headers
+ECHO.
 ECHO To adjust configuration, edit 'project-config.jam'.
 ECHO To adjust configuration, edit 'project-config.jam'.
 ECHO Further information:
 ECHO Further information:
 ECHO.
 ECHO.

+ 5 - 1
bootstrap.sh

@@ -328,7 +328,7 @@ if test -r "project-config.jam"; then
 fi
 fi
 
 
 # Generate user-config.jam
 # Generate user-config.jam
-echo "Generating Boost.Build configuration in project-config.jam..."
+echo "Generating Boost.Build configuration in project-config.jam for $TOOLSET..."
 cat > project-config.jam <<EOF
 cat > project-config.jam <<EOF
 # Boost.Build Configuration
 # Boost.Build Configuration
 # Automatically generated by bootstrap.sh
 # Automatically generated by bootstrap.sh
@@ -393,6 +393,10 @@ Bootstrapping is done. To build, run:
 
 
     ./b2
     ./b2
     
     
+To generate header files, run:
+
+    ./b2 headers
+
 To adjust configuration, edit 'project-config.jam'.
 To adjust configuration, edit 'project-config.jam'.
 Further information:
 Further information:
 
 

粤ICP备19079148号