conor 2003/07/09 20:32:34
Modified: . build.bat build.sh
src/main/org/apache/tools/ant/launch Launcher.java
src/script ant.bat
Log:
Make launcher work on Win2K
Revision Changes Path
1.36 +1 -1 ant/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/ant/build.bat,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -w -u -r1.35 -r1.36
--- build.bat 1 Jun 2002 12:26:31 -0000 1.35
+++ build.bat 10 Jul 2003 03:32:34 -0000 1.36
@@ -13,7 +13,7 @@
goto cleanup
:runAnt
-set LOCALCLASSPATH=lib\xercesImpl.jar;lib\xml-apis.jar;bootstrap\lib\ant.jar
+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=
1.33 +1 -1 ant/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/ant/build.sh,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -w -u -r1.32 -r1.33
--- build.sh 15 Apr 2003 19:56:20 -0000 1.32
+++ build.sh 10 Jul 2003 03:32:34 -0000 1.33
@@ -28,7 +28,7 @@
exit
fi
-LOCALCLASSPATH=lib/xercesImpl.jar:lib/xml-apis.jar:bootstrap/lib/ant.jar
+LOCALCLASSPATH=
# add in the dependency .jar files
DIRLIBS=lib/optional/*.jar
for i in ${DIRLIBS}
1.4 +2 -2 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.3
retrieving revision 1.4
diff -u -w -u -r1.3 -r1.4
--- Launcher.java 9 Jul 2003 13:11:15 -0000 1.3
+++ Launcher.java 10 Jul 2003 03:32:34 -0000 1.4
@@ -149,7 +149,7 @@
for (int i = 0; i < jars.length; ++i) {
baseClassPath.append(File.pathSeparatorChar);
- baseClassPath.append(jars[i].getFile());
+ baseClassPath.append(Locator.fromURI(jars[i].toString()));
}
System.setProperty("java.class.path", baseClassPath.toString());
1.30 +4 -7 ant/src/script/ant.bat
Index: ant.bat
===================================================================
RCS file: /home/cvs/ant/src/script/ant.bat,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -w -u -r1.29 -r1.30
--- ant.bat 9 Jul 2003 13:14:51 -0000 1.29
+++ ant.bat 10 Jul 2003 03:32:34 -0000 1.30
@@ -54,14 +54,11 @@
:checkJava
set _JAVACMD=%JAVACMD%
-set LOCALCLASSPATH=%CLASSPATH%
-for %%i in ("%ANT_HOME%\lib\*.jar") do call "%ANT_HOME%\bin\lcp.bat" %%i
+set LOCALCLASSPATH=%ANT_HOME%\lib\ant-launcher.jar;%CLASSPATH%
if "%JAVA_HOME%" == "" goto noJavaHome
if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
-if exist "%JAVA_HOME%\lib\tools.jar" set
LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%LOCALCLASSPATH%
-if exist "%JAVA_HOME%\lib\classes.zip" set
LOCALCLASSPATH=%JAVA_HOME%\lib\classes.zip;%LOCALCLASSPATH%
goto checkJikes
:noJavaHome
@@ -77,11 +74,11 @@
if not "%JIKESPATH%"=="" goto runAntWithJikes
:runAnt
-"%_JAVACMD%" %ANT_OPTS% -classpath "%LOCALCLASSPATH%"
"-Dant.home=%ANT_HOME%" org.apache.tools.ant.Main %ANT_ARGS% %ANT_CMD_LINE_ARGS%
+"%_JAVACMD%" %ANT_OPTS% -classpath "%LOCALCLASSPATH%"
"-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS%
%ANT_CMD_LINE_ARGS%
goto end
:runAntWithJikes
-"%_JAVACMD%" %ANT_OPTS% -classpath "%LOCALCLASSPATH%"
"-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%"
org.apache.tools.ant.Main %ANT_ARGS% %ANT_CMD_LINE_ARGS%
+"%_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%
goto end
:end
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
