From d3bf87f3d4e827382fc4b041ca48c5d50b627bd9 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Mon, 4 Nov 2002 18:18:11 +0000
Subject: [PATCH] Fix typos and account for command limits. CodeWarrior and
 Borland tested on Win2K.

[SVN r16101]
---
 historic/jam/src/build.bat | 22 +++++++++++-----------
 historic/jam/src/build.jam | 10 +++++-----
 jam_src/build.bat          | 22 +++++++++++-----------
 jam_src/build.jam          | 10 +++++-----
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/historic/jam/src/build.bat b/historic/jam/src/build.bat
index a187b5858..0c5fe401b 100644
--- a/historic/jam/src/build.bat
+++ b/historic/jam/src/build.bat
@@ -16,12 +16,12 @@ if "%1" == "metrowerks" goto Set_Metrowerks
 if "%1" == "msvc" goto Set_MSVC_Defaut
 if "%1" == "vc7" goto Set_MSVC7_Defaut
 if "%1" == "borland" goto Set_Borland
-ECHO "###"
-ECHO "### Unknown toolset:" %1
-ECHO "###"
-ECHO "### You can specify the toolset as the argument, i.e.:"
-ECHO "###     .\build.bat msvc"
-ECHO "###"
+ECHO ###
+ECHO ### Unknown toolset: %1
+ECHO ###
+ECHO ### You can specify the toolset as the argument, i.e.:
+ECHO ###     .\build.bat msvc
+ECHO ###
 goto Finish
 
 REM Try and guess the toolset to bootstrap the build with...
@@ -43,15 +43,15 @@ goto Finish
 :Set_Metrowerks
 set BOOST_JAM_TOOLSET=metrowerks
 set BOOST_JAM_CC=mwcc -runtime staticsingle -O -DNT
-set BOOST_JAM_OPT_JAM=-o bootstrap.%JAM_TOOLSET%\jam0.exe
-set BOOST_JAM_OPT_MKJAMBASE=-o bootstrap.%JAM_TOOLSET%\mkjambase0.exe
+set BOOST_JAM_OPT_JAM=-o bootstrap.%BOOST_JAM_TOOLSET%\jam0.exe
+set BOOST_JAM_OPT_MKJAMBASE=-o bootstrap.%BOOST_JAM_TOOLSET%\mkjambase0.exe
 goto Build
 
 :Set_MSVC
 if EXIST "%MSVCDir%\VC7\bin" (set BOOST_JAM_TOOLSET=vc7) else (set BOOST_JAM_TOOLSET=msvc)
 set BOOST_JAM_CC=cl /nologo /GZ /Zi /MLd -DNT -DYYDEBUG %MSVCDIR%\lib\kernel32.lib
-set BOOST_JAM_OPT_JAM=/Febootstrap.%JAM_TOOLSET%\jam0
-set BOOST_JAM_OPT_MKJAMBASE=/Febootstrap.%JAM_TOOLSET%\mkjambase0
+set BOOST_JAM_OPT_JAM=/Febootstrap.%BOOST_JAM_TOOLSET%\jam0
+set BOOST_JAM_OPT_MKJAMBASE=/Febootstrap.%BOOST_JAM_TOOLSET%\mkjambase0
 goto Build
 
 :Set_MSVC_Default
@@ -97,7 +97,7 @@ md bootstrap.%BOOST_JAM_TOOLSET%
 @if NOT EXIST ".\bootstrap.%BOOST_JAM_TOOLSET%\mkjambase0.exe" goto Finish
 ".\bootstrap.%BOOST_JAM_TOOLSET%\mkjambase0.exe" jambase.c Jambase
 :Build_BJAM
-%BOOST_JAM_CC% %BOOST_JAM_OPT% %BJAM_SOURCES%
+%BOOST_JAM_CC% %BOOST_JAM_OPT_JAM% %BJAM_SOURCES%
 @if NOT EXIST ".\bootstrap.%BOOST_JAM_TOOLSET%\jam0.exe" goto Finish
 .\bootstrap.%BOOST_JAM_TOOLSET%\jam0 -f build.jam -sBOOST_JAM_TOOLSET=%BOOST_JAM_TOOLSET%
 
diff --git a/historic/jam/src/build.jam b/historic/jam/src/build.jam
index 156d333cb..322a2d7a3 100644
--- a/historic/jam/src/build.jam
+++ b/historic/jam/src/build.jam
@@ -279,15 +279,15 @@ if $(NT)
 {
 if [ GLOB "C:\\Program Files\\7-ZIP" : "7zn.exe" ]
 {
-    actions .pack {    "C:\Program Files\7-ZIP\7zn.exe" a -r -tzip "$(<)" "$(>)" }
-    actions .zip  {    "C:\Program Files\7-ZIP\7zn.exe" a -r -tzip "$(<)" "$(>)" }
+    actions piecemeal .pack {    "C:\Program Files\7-ZIP\7zn.exe" a -r -tzip "$(<)" "$(>)" }
+    actions piecemeal .zip  {    "C:\Program Files\7-ZIP\7zn.exe" a -r -tzip "$(<)" "$(>)" }
 }
 else
 {
-    actions .pack {    zip -9r "$(<)" "$(>)" }
-    actions .zip  {    zip -9r "$(<)" "$(>)" }
+    actions piecemeal .pack {    zip -9r "$(<)" "$(>)" }
+    actions piecemeal .zip  {    zip -9r "$(<)" "$(>)" }
 }
-    actions .cp   {    cp -a "$(>)" "$(<)" }
+    actions piecemeal .cp   {    copy /Y "$(>)" "$(<)" }
 }
 if $(UNIX)
 {
diff --git a/jam_src/build.bat b/jam_src/build.bat
index a187b5858..0c5fe401b 100644
--- a/jam_src/build.bat
+++ b/jam_src/build.bat
@@ -16,12 +16,12 @@ if "%1" == "metrowerks" goto Set_Metrowerks
 if "%1" == "msvc" goto Set_MSVC_Defaut
 if "%1" == "vc7" goto Set_MSVC7_Defaut
 if "%1" == "borland" goto Set_Borland
-ECHO "###"
-ECHO "### Unknown toolset:" %1
-ECHO "###"
-ECHO "### You can specify the toolset as the argument, i.e.:"
-ECHO "###     .\build.bat msvc"
-ECHO "###"
+ECHO ###
+ECHO ### Unknown toolset: %1
+ECHO ###
+ECHO ### You can specify the toolset as the argument, i.e.:
+ECHO ###     .\build.bat msvc
+ECHO ###
 goto Finish
 
 REM Try and guess the toolset to bootstrap the build with...
@@ -43,15 +43,15 @@ goto Finish
 :Set_Metrowerks
 set BOOST_JAM_TOOLSET=metrowerks
 set BOOST_JAM_CC=mwcc -runtime staticsingle -O -DNT
-set BOOST_JAM_OPT_JAM=-o bootstrap.%JAM_TOOLSET%\jam0.exe
-set BOOST_JAM_OPT_MKJAMBASE=-o bootstrap.%JAM_TOOLSET%\mkjambase0.exe
+set BOOST_JAM_OPT_JAM=-o bootstrap.%BOOST_JAM_TOOLSET%\jam0.exe
+set BOOST_JAM_OPT_MKJAMBASE=-o bootstrap.%BOOST_JAM_TOOLSET%\mkjambase0.exe
 goto Build
 
 :Set_MSVC
 if EXIST "%MSVCDir%\VC7\bin" (set BOOST_JAM_TOOLSET=vc7) else (set BOOST_JAM_TOOLSET=msvc)
 set BOOST_JAM_CC=cl /nologo /GZ /Zi /MLd -DNT -DYYDEBUG %MSVCDIR%\lib\kernel32.lib
-set BOOST_JAM_OPT_JAM=/Febootstrap.%JAM_TOOLSET%\jam0
-set BOOST_JAM_OPT_MKJAMBASE=/Febootstrap.%JAM_TOOLSET%\mkjambase0
+set BOOST_JAM_OPT_JAM=/Febootstrap.%BOOST_JAM_TOOLSET%\jam0
+set BOOST_JAM_OPT_MKJAMBASE=/Febootstrap.%BOOST_JAM_TOOLSET%\mkjambase0
 goto Build
 
 :Set_MSVC_Default
@@ -97,7 +97,7 @@ md bootstrap.%BOOST_JAM_TOOLSET%
 @if NOT EXIST ".\bootstrap.%BOOST_JAM_TOOLSET%\mkjambase0.exe" goto Finish
 ".\bootstrap.%BOOST_JAM_TOOLSET%\mkjambase0.exe" jambase.c Jambase
 :Build_BJAM
-%BOOST_JAM_CC% %BOOST_JAM_OPT% %BJAM_SOURCES%
+%BOOST_JAM_CC% %BOOST_JAM_OPT_JAM% %BJAM_SOURCES%
 @if NOT EXIST ".\bootstrap.%BOOST_JAM_TOOLSET%\jam0.exe" goto Finish
 .\bootstrap.%BOOST_JAM_TOOLSET%\jam0 -f build.jam -sBOOST_JAM_TOOLSET=%BOOST_JAM_TOOLSET%
 
diff --git a/jam_src/build.jam b/jam_src/build.jam
index 156d333cb..322a2d7a3 100644
--- a/jam_src/build.jam
+++ b/jam_src/build.jam
@@ -279,15 +279,15 @@ if $(NT)
 {
 if [ GLOB "C:\\Program Files\\7-ZIP" : "7zn.exe" ]
 {
-    actions .pack {    "C:\Program Files\7-ZIP\7zn.exe" a -r -tzip "$(<)" "$(>)" }
-    actions .zip  {    "C:\Program Files\7-ZIP\7zn.exe" a -r -tzip "$(<)" "$(>)" }
+    actions piecemeal .pack {    "C:\Program Files\7-ZIP\7zn.exe" a -r -tzip "$(<)" "$(>)" }
+    actions piecemeal .zip  {    "C:\Program Files\7-ZIP\7zn.exe" a -r -tzip "$(<)" "$(>)" }
 }
 else
 {
-    actions .pack {    zip -9r "$(<)" "$(>)" }
-    actions .zip  {    zip -9r "$(<)" "$(>)" }
+    actions piecemeal .pack {    zip -9r "$(<)" "$(>)" }
+    actions piecemeal .zip  {    zip -9r "$(<)" "$(>)" }
 }
-    actions .cp   {    cp -a "$(>)" "$(<)" }
+    actions piecemeal .cp   {    copy /Y "$(>)" "$(<)" }
 }
 if $(UNIX)
 {