You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by an...@apache.org on 2010/10/19 23:23:23 UTC
svn commit: r1024417 - in /ant/core/trunk: CONTRIBUTORS WHATSNEW
contributors.xml src/script/ant.bat
Author: antoine
Date: Tue Oct 19 21:23:22 2010
New Revision: 1024417
URL: http://svn.apache.org/viewvc?rev=1024417&view=rev
Log:
ant.bat exit strategy improvements and issues, Bugzilla 41039, patch supplied by Mark DeLaFranier
Modified:
ant/core/trunk/CONTRIBUTORS
ant/core/trunk/WHATSNEW
ant/core/trunk/contributors.xml
ant/core/trunk/src/script/ant.bat
Modified: ant/core/trunk/CONTRIBUTORS
URL: http://svn.apache.org/viewvc/ant/core/trunk/CONTRIBUTORS?rev=1024417&r1=1024416&r2=1024417&view=diff
==============================================================================
--- ant/core/trunk/CONTRIBUTORS (original)
+++ ant/core/trunk/CONTRIBUTORS Tue Oct 19 21:23:22 2010
@@ -197,6 +197,7 @@ Marcel Schutte
Marcus Börger
Mario Frasca
Mariusz Nowostawski
+Mark DeLaFranier
Mark Hecker
Mark Salter
Mark R. Diggory
Modified: ant/core/trunk/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=1024417&r1=1024416&r2=1024417&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Tue Oct 19 21:23:22 2010
@@ -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:
--------------
Modified: ant/core/trunk/contributors.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/contributors.xml?rev=1024417&r1=1024416&r2=1024417&view=diff
==============================================================================
--- ant/core/trunk/contributors.xml (original)
+++ ant/core/trunk/contributors.xml Tue Oct 19 21:23:22 2010
@@ -819,6 +819,10 @@
</name>
<name>
<first>Mark</first>
+ <last>DeLaFranier</last>
+ </name>
+ <name>
+ <first>Mark</first>
<last>Hecker</last>
</name>
<name>
Modified: ant/core/trunk/src/script/ant.bat
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/script/ant.bat?rev=1024417&r1=1024416&r2=1024417&view=diff
==============================================================================
--- ant/core/trunk/src/script/ant.bat (original)
+++ ant/core/trunk/src/script/ant.bat Tue Oct 19 21:23:22 2010
@@ -191,13 +191,6 @@ if not "%_ANT_CMD_LINE_ARGS%"=="" set AN
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"
:omega
+exit /b %ANT_ERROR%