[Boost-commit] svn:boost r75925 - trunk/tools/build/v2/engine

Subject: [Boost-commit] svn:boost r75925 - trunk/tools/build/v2/engine
From: steven_at_[hidden]
Date: 2011-12-12 17:33:57

Author: steven_watanabe
Date: 2011-12-12 17:33:56 EST (Mon, 12 Dec 2011)
New Revision: 75925
URL: http://svn.boost.org/trac/boost/changeset/75925

Log:
Make sure that the target cleaned is the same as the target to be built.  Make --update work on Windows.
Text files modified: 
   trunk/tools/build/v2/engine/build.bat |    11 +++++++----                             
   trunk/tools/build/v2/engine/build.sh  |     2 +-                                      
   2 files changed, 8 insertions(+), 5 deletions(-)

Modified: trunk/tools/build/v2/engine/build.bat
==============================================================================
--- trunk/tools/build/v2/engine/build.bat	(original)
+++ trunk/tools/build/v2/engine/build.bat	2011-12-12 17:33:56 EST (Mon, 12 Dec 2011)
@@ -457,10 +457,13 @@
 set test=%test:"###=%
 set test=%test:###"=%
 set test=%test:###=%
-if "%test%" == "--update" set BJAM_UPDATE=update
+if "%test%" == "--update" goto Found_Update
 endlocal
 shift
 if not "_%BJAM_UPDATE%_" == "_update_" goto Check_Update
+:Found_Update
+endlocal
+set BJAM_UPDATE=update
 :Check_Update_End
 if "_%BJAM_UPDATE%_" == "_update_" (
     if not exist ".\bootstrap\jam0.exe" (
@@ -506,9 +509,6 @@
 %BOOST_JAM_CC% %BOOST_JAM_OPT_JAM% %BJAM_SOURCES%
 :Skip_Bootstrap
 @if not exist ".\bootstrap\jam0.exe" goto Skip_Jam
-_at_if "_%BJAM_UPDATE%_" == "_update_" goto Skip_Clean
-.\bootstrap\jam0 -f build.jam --toolset=%BOOST_JAM_TOOLSET% "--toolset-root=%BOOST_JAM_TOOLSET_ROOT% " clean
-:Skip_Clean
 @set args=%*
 @echo OFF
 :Set_Args
@@ -526,6 +526,9 @@
 goto Set_Args
 :Set_Args_End
 @echo ON
+@if "_%BJAM_UPDATE%_" == "_update_" goto Skip_Clean
+.\bootstrap\jam0 -f build.jam --toolset=%BOOST_JAM_TOOLSET% "--toolset-root=%BOOST_JAM_TOOLSET_ROOT% " %args% clean
+:Skip_Clean
 .\bootstrap\jam0 -f build.jam --toolset=%BOOST_JAM_TOOLSET% "--toolset-root=%BOOST_JAM_TOOLSET_ROOT% " %args%
 :Skip_Jam
 

Modified: trunk/tools/build/v2/engine/build.sh
==============================================================================
--- trunk/tools/build/v2/engine/build.sh	(original)
+++ trunk/tools/build/v2/engine/build.sh	2011-12-12 17:33:56 EST (Mon, 12 Dec 2011)
@@ -297,7 +297,7 @@
 fi
 if test -x "./bootstrap/jam0" ; then
     if test "${BJAM_UPDATE}" != "update" ; then
-        echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" clean
+        echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@" clean
     fi
     echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@"
 fi