jhunter 00/03/17 15:15:36
Modified: . bootstrap.bat Log: Stopped the script from blowing away the JAVA_HOME/JAVA/JAVAC/CLASSPATH values. Without this fix it didn't work on my NT JDK 1.3b system. I've tested the current script on JDK 1.3b and JDK 1.2 and it now respects JAVA_HOME. Revision Changes Path 1.7 +10 -7 jakarta-ant/bootstrap.bat Index: bootstrap.bat =================================================================== RCS file: /home/cvs/jakarta-ant/bootstrap.bat,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bootstrap.bat 2000/03/17 15:22:08 1.6 +++ bootstrap.bat 2000/03/17 23:15:35 1.7 @@ -2,9 +2,9 @@ REM You will need to specify JAVA_HOME if compiling with 1.2 or later. -set JAVA_HOME= -set JAVA= -set JAVAC= +set OLDJAVA=%JAVA% +set OLDJAVAC=%JAVAC% +set OLDCLASSPATH=%CLASSPATH% if exist ..\antrc.bat call ..\antrc.bat @@ -58,8 +58,11 @@ echo. echo ... Done Bootstrapping Ant Distribution -set JAVA_HOME= -set JAVA= -set JAVAC= -set CLASSPATH= +set JAVA=%OLDJAVA% +set JAVAC=%OLDJAVAC% +set CLASSPATH=%OLDCLASSPATH% +set OLDJAVA= +set OLDJAVAC= +set OLDCLASSPATH= set TOOLS= +
