Index: trunk/build/bw.bat =================================================================== --- trunk/build/bw.bat (revision 1908) +++ trunk/build/bw.bat (revision 1940) @@ -1,3 +1,3 @@ -:: This file is included by the quickstart script file "..\..\bw.bat" so that +:: This file is included by the quickstart script file "..\..\bw.bat" so that :: we may keep this script under version control in the svn repository. @@ -31,13 +31,11 @@ SET quickstart="yes" SHIFT - IF "%1noarg" == "noarg" GOTO doneWithArgs GOTO branch - -:bwchome + +:bwchome :: Define location of configs SHIFT SET BWCONFIGS=%1 SHIFT - IF "%1noarg" == "noarg" GOTO doneWithArgs GOTO branch @@ -46,16 +44,14 @@ SET bwc=%1 SHIFT - IF "%1noarg" == "noarg" GOTO doneWithArgs GOTO branch - + :offline ECHO Setting to offline mode; libraries will not be downloaded ... SET offline="-Dorg.bedework.offline.build=yes" SHIFT - IF "%1noarg" == "noarg" GOTO doneWithArgs GOTO branch :doneWithArgs - + IF NOT "%quickstart%empty" == "empty" GOTO checkBwConfig IF NOT "%BWCONFIGS%empty" == "empty" GOTO DoneQB @@ -92,20 +88,20 @@ :runBedework :: Make available for ant - SET BWCONFIG=-Dorg.bedework.user.build.properties=%BEDEWORK_CONFIG%\build.properties" - + SET BWCONFIG=-Dorg.bedework.user.build.properties=%BEDEWORK_CONFIG%\build.properties + ECHO. ECHO BWCONFIGS = %BWCONFIGS% ECHO BWCONFIG = %BWCONFIG% - ECHO. - + ECHO. + SET ANT_HOME=%QUICKSTART_HOME%\apache-ant-1.7.0 - + SET CLASSPATH="%ANT_HOME%\lib\ant-launcher.jar" - - "%JAVA_HOME%\bin\java.exe" -classpath %CLASSPATH% %offline% -Dant.home=%ANT_HOME% org.apache.tools.ant.launch.Launcher %BWCONFIG% %*% - + + "%JAVA_HOME%\bin\java.exe" -classpath %CLASSPATH% %offline% -Dant.home=%ANT_HOME% org.apache.tools.ant.launch.Launcher %BWCONFIG% %1 + GOTO:EOF - + :: Iterate over the command line arguments; :: DOS Batch labels can't contain hyphens, so convert them @@ -116,5 +112,6 @@ IF "%1" == "-bwc" GOTO bwc IF "%1" == "-offline" GOTO offline - +GOTO doneWithArgs + :usage ECHO Usage: @@ -122,5 +119,5 @@ ECHO %0 [ -quickstart OR -bwchome path ] [ -bwc configname ] [ -offline ] [ target ] ECHO. - ECHO -quickstart Use the current quickstart configurations. + ECHO -quickstart Use the current quickstart configurations. ECHO -bwchome Specify path to configurations ECHO -bwc Specify configuration name @@ -131,6 +128,6 @@ ECHO directory which contains one directory per configuration. ECHO. - ECHO Within each configuration directory we expect a file called - ECHO build.properties which should point to the property and options file + ECHO Within each configuration directory we expect a file called + ECHO build.properties which should point to the property and options file ECHO needed for the deploy process. ECHO.