Author: jkf
Date: Fri Mar 12 08:41:21 2010
New Revision: 922178
URL: http://svn.apache.org/viewvc?rev=922178&view=rev
Log:
pr 48896
tools.jar no longer present on bootstrap classpath
Modified:
ant/core/trunk/bootstrap.bat
Modified: ant/core/trunk/bootstrap.bat
URL:
http://svn.apache.org/viewvc/ant/core/trunk/bootstrap.bat?rev=922178&r1=922177&r2=922178&view=diff
==============================================================================
--- ant/core/trunk/bootstrap.bat (original)
+++ ant/core/trunk/bootstrap.bat Fri Mar 12 08:41:21 2010
@@ -39,6 +39,7 @@ if not "%OS%" == "Windows_NT" if exist b
if "%OS%" == "Windows_NT" if exist build\nul rmdir/s/q build
if not "%OS%" == "Windows_NT" if exist build\nul deltree/y build
+SET LOCALCLASSPATH=
for %%i in (lib\optional\*.jar) do call src\script\lcp.bat %%i
if exist "%JAVA_HOME%\lib\tools.jar" call src\script\lcp.bat
%JAVA_HOME%\lib\tools.jar
if exist "%JAVA_HOME%\lib\classes.zip" call src\script\lcp.bat
%JAVA_HOME%\lib\classes.zip
@@ -46,7 +47,7 @@ if exist "%JAVA_HOME%\lib\classes.zip" c
set TOOLS=src\main\org\apache\tools
set CLASSDIR=build\classes
-SET CLASSPATH=%CLASSDIR%;src\main;%CLASSPATH%
+SET CLASSPATH=%LOCALCLASSPATH%;%CLASSDIR%;src\main;%CLASSPATH%
echo JAVA_HOME=%JAVA_HOME%
echo JAVA=%JAVA%
@@ -132,5 +133,6 @@ set ANT_HOME=%OLDANTHOME%
set OLDJAVA=
set OLDJAVAC=
set BOOTOLDCLASSPATH=
+set LOCALCLASSPATH=
set OLDANTHOME=
set TOOLS=
