ant.bat exit strategy improvements and issues, Bugzilla 41039, patch supplied by Mark DeLaFranier

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1024417 13f79535-47bb-0310-9956-ffa450edef68

CONTRIBUTORS

@@ -197,6 +197,7 @@ Marcel Schutte
 Marcus Börger
 Mario Frasca 
 Mariusz Nowostawski
+Mark DeLaFranier
 Mark Hecker
 Mark Salter
 Mark R. Diggory

WHATSNEW

@@ -157,6 +157,10 @@ Fixed bugs:
    directory that has a "!" in its name.
    Bugzilla Report 50007.
 
+ * ant.bat exit strategy improvements and issues
+   make the exit codes work in environments where 4NT or MKS are installed
+   Bugzilla Report 41039.
+
 Other changes:
 --------------
 

contributors.xml

@@ -817,6 +817,10 @@
     <first>Mariusz</first>
     <last>Nowostawski</last>
   </name>
+  <name>
+    <first>Mark</first>
+    <last>DeLaFranier</last>
+  </name>
   <name>
     <first>Mark</first>
     <last>Hecker</last>

src/script/ant.bat

@@ -191,13 +191,6 @@ if not "%_ANT_CMD_LINE_ARGS%"=="" set ANT_CMD_LINE_ARGS=
 
 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
@@ -222,3 +215,4 @@ if exist "%USERPROFILE%\antrc_post.bat" call "%USERPROFILE%\antrc_post.bat"
 
 :omega
 
+exit /b %ANT_ERROR%