From c7806a87fef5994edd407e146b710fa68fbebb98 Mon Sep 17 00:00:00 2001 From: Jason Hunter Date: Fri, 17 Mar 2000 23:15:35 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267634 13f79535-47bb-0310-9956-ffa450edef68 --- bootstrap.bat | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/bootstrap.bat b/bootstrap.bat index 7527272ea..53be8e055 100755 --- a/bootstrap.bat +++ b/bootstrap.bat @@ -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 @@ if not "%OS%" == "Windows_NT" if exist classes\nul deltree/y classes 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= +