[Boost-commit] svn:boost r57486 - branches/release

Subject: [Boost-commit] svn:boost r57486 - branches/release
From: ghost_at_[hidden]
Date: 2009-11-08 09:04:21

Author: vladimir_prus
Date: 2009-11-08 09:04:20 EST (Sun, 08 Nov 2009)
New Revision: 57486
URL: http://svn.boost.org/trac/boost/changeset/57486

Log:
Merge: Make bootstrap.bat work on 64-bit Windows
Text files modified: 
   branches/release/bootstrap.bat |    13 +++++++++++--                           
   1 files changed, 11 insertions(+), 2 deletions(-)

Modified: branches/release/bootstrap.bat
==============================================================================
--- branches/release/bootstrap.bat	(original)
+++ branches/release/bootstrap.bat	2009-11-08 09:04:20 EST (Sun, 08 Nov 2009)
@@ -7,15 +7,24 @@
 
 ECHO Building Boost.Jam build engine
 if exist ".\tools\jam\src\bin.ntx86\bjam.exe" del tools\jam\src\bin.ntx86\bjam.exe
+if exist ".\tools\jam\src\bin.ntx86_64\bjam.exe" del tools\jam\src\bin.ntx86_64\bjam.exe
 cd tools\jam\src
 
 call .\build.bat > ..\..\..\bjam.log
 @ECHO OFF
 cd ..\..\..
 
-if not exist ".\tools\jam\src\bin.ntx86\bjam.exe" goto :bjam_failure
+if exist ".\tools\jam\src\bin.ntx86\bjam.exe" (
+   copy .\tools\jam\src\bin.ntx86\bjam.exe . > nul
+   goto :bjam_built)
 
-copy .\tools\jam\src\bin.ntx86\bjam.exe . > nul
+if exist ".\tools\jam\src\bin.ntx86_64\bjam.exe" (
+   copy .\tools\jam\src\bin.ntx86_64\bjam.exe . > nul
+   goto :bjam_built)
+
+goto :bjam_failure
+
+:bjam_built
 
 REM Ideally, we should obtain the toolset that build.bat has
 REM guessed. However, it uses setlocal at the start and does