conor 2003/09/24 07:32:11
Modified: . Tag: ANT_16_BRANCH build.bat
src/main/org/apache/tools/ant/launch Tag: ANT_16_BRANCH
Launcher.java
src/script Tag: ANT_16_BRANCH ant.bat
Log:
Update Windows scripts to support multiple -lib option
Revision Changes Path
No revision
No revision
1.38.2.1 +3 -10 ant/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/ant/build.bat,v
retrieving revision 1.38
retrieving revision 1.38.2.1
diff -u -w -u -r1.38 -r1.38.2.1
--- build.bat 11 Aug 2003 13:18:19 -0000 1.38
+++ build.bat 24 Sep 2003 14:32:10 -0000 1.38.2.1
@@ -3,7 +3,6 @@
REM Copyright (c) 2000-2002 The Apache Software Foundation. All rights
REM reserved.
-set OLDCLASSPATH=%CLASSPATH%
set REAL_ANT_HOME=%ANT_HOME%
set ANT_HOME=bootstrap
if exist bootstrap\lib\ant.jar if exist bootstrap\bin\ant.bat if exist
bootstrap\bin\lcp.bat if exist bootstrap\bin\antRun.bat goto runAnt
@@ -13,21 +12,15 @@
goto cleanup
:runAnt
-set LOCALCLASSPATH=
-for %%i in (lib\optional\*.jar) do call bootstrap\bin\lcp.bat %%i
-set CLASSPATH=lib\optional\xalanj1compat.jar;%LOCALCLASSPATH%;%CLASSPATH%
-set LOCALCLASSPATH=
-
if not "%REAL_ANT_HOME%" == "" goto install_ant
-call bootstrap\bin\ant.bat -emacs %1 %2 %3 %4 %5 %6 %7 %8 %9
+call bootstrap\bin\ant.bat -lib lib/optional %1 %2 %3 %4 %5 %6 %7 %8 %9
goto cleanup
:install_ant
-call bootstrap\bin\ant.bat -emacs -Dant.install="%REAL_ANT_HOME%" %1 %2 %3
%4 %5 %6 %7 %8 %9
+call bootstrap\bin\ant.bat -lib lib/optional -Dant.install="%REAL_ANT_HOME%"
%1 %2 %3 %4 %5 %6 %7 %8 %9
rem clean up
:cleanup
set ANT_HOME=%REAL_ANT_HOME%
set REAL_ANT_HOME=
-set CLASSPATH=%OLDCLASSPATH%
-set OLDCLASSPATH=
+
No revision
No revision
1.5.2.3 +4 -0 ant/src/main/org/apache/tools/ant/launch/Launcher.java
Index: Launcher.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/launch/Launcher.java,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -w -u -r1.5.2.2 -r1.5.2.3
--- Launcher.java 23 Sep 2003 15:40:36 -0000 1.5.2.2
+++ Launcher.java 24 Sep 2003 14:32:10 -0000 1.5.2.3
@@ -193,6 +193,10 @@
// now update the class.path property
StringBuffer baseClassPath
= new StringBuffer(System.getProperty("java.class.path"));
+ if (baseClassPath.charAt(baseClassPath.length() - 1)
+ == File.pathSeparatorChar) {
+ baseClassPath.setLength(baseClassPath.length() - 1);
+ }
for (int i = 0; i < jars.length; ++i) {
baseClassPath.append(File.pathSeparatorChar);
No revision
No revision
1.32.2.2 +4 -6 ant/src/script/ant.bat
Index: ant.bat
===================================================================
RCS file: /home/cvs/ant/src/script/ant.bat,v
retrieving revision 1.32.2.1
retrieving revision 1.32.2.2
diff -u -w -u -r1.32.2.1 -r1.32.2.2
--- ant.bat 22 Sep 2003 21:15:41 -0000 1.32.2.1
+++ ant.bat 24 Sep 2003 14:32:10 -0000 1.32.2.2
@@ -54,7 +54,6 @@
:checkJava
set _JAVACMD=%JAVACMD%
-set LOCALCLASSPATH=%ANT_HOME%\lib\ant-launcher.jar
if "%JAVA_HOME%" == "" goto noJavaHome
if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
@@ -69,24 +68,23 @@
:runAnt
if not "%CLASSPATH%"=="" goto runAntWithClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%LOCALCLASSPATH%"
"-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS%
%ANT_CMD_LINE_ARGS%
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar"
"-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS%
%ANT_CMD_LINE_ARGS%
goto end
:runAntWithClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%LOCALCLASSPATH%"
"-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS%
%ANT_CMD_LINE_ARGS% -lib "%CLASSPATH%"
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar"
"-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -lib
"%CLASSPATH%" %ANT_CMD_LINE_ARGS%
goto end
:runAntWithJikes
if not "%CLASSPATH%"=="" goto runAntWithJikesAndClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%LOCALCLASSPATH%"
"-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%"
org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar"
"-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%"
org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
goto end
:runAntWithJikesAndClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%LOCALCLASSPATH%"
"-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%"
org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS% -lib
"%CLASSPATH%"
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar"
"-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%"
org.apache.tools.ant.launch.Launcher %ANT_ARGS% -lib "%CLASSPATH%"
%ANT_CMD_LINE_ARGS%
goto end
:end
-set LOCALCLASSPATH=
set _JAVACMD=
set ANT_CMD_LINE_ARGS=
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
