From 453d5532fa827336cdb9a2c5b3b5b6614e868de0 Mon Sep 17 00:00:00 2001
From: Conor MacNeill <conor@apache.org>
Date: Thu, 10 Jul 2003 03:32:34 +0000
Subject: [PATCH] Make launcher work on Win2K

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274799 13f79535-47bb-0310-9956-ffa450edef68
---
 build.bat                                          |  2 +-
 build.sh                                           |  2 +-
 src/main/org/apache/tools/ant/launch/Launcher.java |  4 ++--
 src/script/ant.bat                                 | 11 ++++-------
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/build.bat b/build.bat
index 297478a76..4025d28dc 100755
--- a/build.bat
+++ b/build.bat
@@ -13,7 +13,7 @@ echo Bootstrap FAILED
 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=
diff --git a/build.sh b/build.sh
index 29f551074..2c6ea1016 100755
--- a/build.sh
+++ b/build.sh
@@ -28,7 +28,7 @@ if test ! -f bootstrap/lib/ant.jar -o  ! -x bootstrap/bin/ant -o ! -x bootstrap/
   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}
diff --git a/src/main/org/apache/tools/ant/launch/Launcher.java b/src/main/org/apache/tools/ant/launch/Launcher.java
index c0744b284..085178755 100644
--- a/src/main/org/apache/tools/ant/launch/Launcher.java
+++ b/src/main/org/apache/tools/ant/launch/Launcher.java
@@ -149,11 +149,11 @@ public class Launcher {
 
         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());
-
+        
         URLClassLoader loader = new URLClassLoader(jars);
         try {
             Class mainClass = loader.loadClass(MAIN_CLASS);
diff --git a/src/script/ant.bat b/src/script/ant.bat
index a828c8f5c..43d73de64 100755
--- a/src/script/ant.bat
+++ b/src/script/ant.bat
@@ -23,7 +23,7 @@ if ""%1""=="""" goto doneStart
 set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1
 shift
 goto setupArgs
-rem This label provides a place for the argument list loop to break out 
+rem This label provides a place for the argument list loop to break out
 rem and for NT handling to skip to.
 
 :doneStart
@@ -54,14 +54,11 @@ goto end
 
 :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 @@ echo.
 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