You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/05/26 08:36:30 UTC
svn commit: r178608 - in /maven/maven-1/core/trunk: build-bootstrap.xml
src/bin/maven.bat
Author: brett
Date: Wed May 25 23:36:29 2005
New Revision: 178608
URL: http://svn.apache.org/viewcvs?rev=178608&view=rev
Log:
properly erxit the script such that it doesn't kill cmd.exe normally, but does when running under ant as it is needed for failonerror to work
Modified:
maven/maven-1/core/trunk/build-bootstrap.xml
maven/maven-1/core/trunk/src/bin/maven.bat
Modified: maven/maven-1/core/trunk/build-bootstrap.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/build-bootstrap.xml?rev=178608&r1=178607&r2=178608&view=diff
==============================================================================
--- maven/maven-1/core/trunk/build-bootstrap.xml (original)
+++ maven/maven-1/core/trunk/build-bootstrap.xml Wed May 25 23:36:29 2005
@@ -227,6 +227,8 @@
<arg value="-e"/>
<arg value="${maven.bootstrap.online}"/>
<arg value="maven:plugins-install"/>
+ <!-- Allows failonerror to work -->
+ <env key="MAVEN_TERMINATE_CMD" value="on" />
</exec>
<delete includeEmptyDirs="true">
<fileset dir="${maven.home}/plugins" includes="${maven.bootstrap.plugins}" />
@@ -252,6 +254,7 @@
<arg value="-e"/>
<arg value="${maven.bootstrap.online}"/>
<arg value="maven:plugins-test"/>
+ <env key="MAVEN_TERMINATE_CMD" value="on" />
</exec>
-->
@@ -269,6 +272,8 @@
<arg value="clean"/>
<arg value="jar:jar"/>
<arg value="maven:run-touchstone"/>
+ <!-- Allows failonerror to work -->
+ <env key="MAVEN_TERMINATE_CMD" value="on" />
</exec>
<antcall target="clean-maven-home"/>
Modified: maven/maven-1/core/trunk/src/bin/maven.bat
URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/bin/maven.bat?rev=178608&r1=178607&r2=178608&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/bin/maven.bat (original)
+++ maven/maven-1/core/trunk/src/bin/maven.bat Wed May 25 23:36:29 2005
@@ -162,5 +162,7 @@
@REM pause the batch file if MAVEN_BATCH_PAUSE is set to 'on'
if "%MAVEN_BATCH_PAUSE%" == "on" pause
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
exit /B %ERROR_CODE%
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org