summaryrefslogtreecommitdiff
path: root/bootstrap.bat
diff options
context:
space:
mode:
authorSam Ruby <rubys@apache.org>2000-07-07 01:30:43 +0000
committerSam Ruby <rubys@apache.org>2000-07-07 01:30:43 +0000
commitdd7b8f662346496d52028cb3cdac3b8e3d28aae9 (patch)
tree73099af78ce9d497cf87b68fc0c8eb591dcdad05 /bootstrap.bat
parent9bd75d2c4e8bb5387ec65dd76ccf483f2bec59e7 (diff)
downloadant-dd7b8f662346496d52028cb3cdac3b8e3d28aae9.tar.gz
Pick up jar files from the lib directory in the bootstrap process
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267741 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'bootstrap.bat')
-rwxr-xr-xbootstrap.bat12
1 files changed, 8 insertions, 4 deletions
diff --git a/bootstrap.bat b/bootstrap.bat
index 0424f6bfc..fd25d9cda 100755
--- a/bootstrap.bat
+++ b/bootstrap.bat
@@ -17,8 +17,12 @@ if "" == "%JAVAC%" set JAVAC=%JAVA_HOME%\bin\javac
echo.
echo ... Bootstrapping Ant Distribution
-set CLASSPATH=src\main;classes;%CLASSPATH%
-if exist %JAVA_HOME%\lib\tools.jar set CLASSPATH=%CLASSPATH%;%JAVA_HOME%\lib\tools.jar
+SET LOCALCLASSPATH=classes
+if exist lib\ant.jar erase lib\ant.jar
+for %%i in (lib\*.jar) do call lcp.bat %%i
+if exist %JAVA_HOME%\lib\tools.jar call lcp.bat %JAVA_HOME%\lib\tools.jar
+if exist %JAVA_HOME%\lib\classes.zip call lcp.bat %JAVA_HOME%\lib\classes.zip
+SET CLASSPATH=%CLASSPATH%;%LOCALCLASSPATH%
echo JAVA_HOME=%JAVA_HOME%
echo JAVA=%JAVA%
@@ -44,8 +48,7 @@ copy %TOOLS%\ant\taskdefs\*.properties classes\org\apache\tools\ant\taskdefs
echo.
echo ... Building Ant Distribution
-%JAVA% org.apache.tools.ant.Main clean main %1 %2 %3 %4 %5
-%JAVA% org.apache.tools.ant.Main install %1 %2 %3 %4 %5
+%JAVA% org.apache.tools.ant.Main clean main install %1 %2 %3 %4 %5
echo.
echo ... Cleaning Up Build Directories
@@ -64,5 +67,6 @@ set CLASSPATH=%OLDCLASSPATH%
set OLDJAVA=
set OLDJAVAC=
set OLDCLASSPATH=
+set LOCALCLASSPATH=
set TOOLS=