From b002eddf94ec3b320791999adbd905f99afc2884 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 17 Jan 2012 10:15:55 +0000
Subject: [PATCH] Fix OPENDJ-407: Upgrade version of Ant included in OpenDJ server sources

---
 opends/ext/ant/bin/ant.bat |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/opends/ext/ant/bin/ant.bat b/opends/ext/ant/bin/ant.bat
index 6d57c81..3486e14 100644
--- a/opends/ext/ant/bin/ant.bat
+++ b/opends/ext/ant/bin/ant.bat
@@ -59,9 +59,7 @@
 
 rem Slurp the command line arguments. This loop allows for an unlimited number
 rem of arguments (up to the command line limit, anyway).
-set ANT_CMD_LINE_ARGS=%1
-if ""%1""=="""" goto doneStart
-shift
+set ANT_CMD_LINE_ARGS=
 :setupArgs
 if ""%1""=="""" goto doneStart
 if ""%1""==""-noclasspath"" goto clearclasspath
@@ -80,7 +78,7 @@
 
 :doneStart
 
-if _USE_CLASSPATH==no goto findAntHome
+if "%_USE_CLASSPATH%"=="no" goto findAntHome
 
 :stripClasspath
 if not _%CLASSPATH:~-1%==_\ goto findAntHome
@@ -193,13 +191,6 @@
 
 if "%ANT_ERROR%"=="0" goto mainEnd
 
-rem Set the return code if we are not in NT.  We can only set
-rem a value of 1, but it's better than nothing.
-if not "%OS%"=="Windows_NT" echo 1 > nul | choice /n /c:1
-
-rem Set the ERRORLEVEL if we are running NT.
-if "%OS%"=="Windows_NT" color 00
-
 goto omega
 
 :mainEnd
@@ -224,3 +215,4 @@
 
 :omega
 
+exit /b %ANT_ERROR%

--
Gitblit v1.10.0