From 90ec391053013f39c2d859350377d731034d986e Mon Sep 17 00:00:00 2001
From: Conor MacNeill <conor@apache.org>
Date: Sun, 25 Jun 2000 15:18:39 +0000
Subject: [PATCH] Allow the use of the JAVACMD environment variable in ant.bat
 to modify how ant's JVM is invoked.

This aligns ant.bat with the ant shell script version.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267701 13f79535-47bb-0310-9956-ffa450edef68
---
 src/bin/ant.bat | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/bin/ant.bat b/src/bin/ant.bat
index 320195733..de92c9031 100755
--- a/src/bin/ant.bat
+++ b/src/bin/ant.bat
@@ -1,31 +1,33 @@
 @echo off
 @setlocal
 if "%ANT_HOME%"=="" goto checkProgFiles
-goto checkJavaHome
+goto checkJava
 
 :checkProgFiles
 rem check for ant on system drive
 if not exist "%SystemDrive%\Program Files\ant" goto checkSystemDrive
 
 set ANT_HOME=%SystemDrive%\Program Files\ant
-goto checkJavaHome
+goto checkJava
 
 :checkSystemDrive
 if not exist "%SystemDrive%\ant" goto noAntHome
 set ANT_HOME=%SystemDrive%\ant
-goto checkJavaHome
+goto checkJava
 
 :noAntHome
 echo ANT_HOME is not set and ant could not be located
 goto end
 
-:checkJavaHome
+:checkJava
+if "%JAVACMD%" == "" set JAVACMD=java
+
 if "%JAVA_HOME%" == "" goto runAnt
 set CLASSPATH=%JAVA_HOME%\lib\tools.jar;%CLASSPATH%
 
 :runAnt
 set CLASSPATH=%ANT_HOME%\lib\ant.jar;%ANT_HOME%\lib\xml.jar;%CLASSPATH%
-java -Dant.home="%ANT_HOME%" org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
+%JAVACMD% -Dant.home="%ANT_HOME%" org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 :end
 @endlocal