Author: jacopoc
Date: Thu May 1 02:54:35 2008
New Revision: 652466
URL: http://svn.apache.org/viewvc?rev=652466&view=rev
Log:
Improved the way failonerror was used for subtasks: now, it fails on errors
happening in subtasks only if the specialpurpose and application folders are
present.
If they are missing it doesn't fail on error.
Before this change you got a succesful build even if one component could not be
built due to compile errors... and in fact now the build is broken even if no
one could see this.
Modified:
ofbiz/trunk/build.xml
Modified: ofbiz/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=652466&r1=652465&r2=652466&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Thu May 1 02:54:35 2008
@@ -22,6 +22,9 @@
<property name="site.dir" value="../site"/>
<property name="memory.max.param" value="-Xmx384M"/>
+ <available file="applications/build.xml"
property="applications.present"/>
+ <available file="specialpurpose/build.xml"
property="specialpurpose.present"/>
+
<!-- ================================================================== -->
<!-- Initialization of all property settings -->
<!-- ================================================================== -->
@@ -98,10 +101,11 @@
<include name="**/build.xml"/>
</fileset>
</subant>
- <subant target="clean" failonerror="false" description="Use
failonerror=false in case the specialpurpose directory is not there">
+
+ <subant target="clean" failonerror="${specialpurpose.present}"
description="Use failonerror=false in case the specialpurpose directory is not
there">
<filelist dir="." files="specialpurpose/build.xml"/>
</subant>
- <subant target="clean" failonerror="false" description="Use
failonerror=false in case the applications directory is not there">
+ <subant target="clean" failonerror="${applications.present}"
description="Use failonerror=false in case the applications directory is not
there">
<filelist dir="." files="applications/build.xml"/>
</subant>
<subant target="clean">
@@ -121,10 +125,10 @@
<subant inheritall="false">
<filelist dir="." files="framework/build.xml"/>
</subant>
- <subant inheritall="false" failonerror="false">
+ <subant inheritall="false" failonerror="${applications.present}">
<filelist dir="." files="applications/build.xml"/>
</subant>
- <subant inheritall="false" failonerror="false">
+ <subant inheritall="false" failonerror="${specialpurpose.present}">
<filelist dir="." files="specialpurpose/build.xml"/>
</subant>
<subant inheritall="false">
@@ -147,10 +151,10 @@
<subant target="docs">
<filelist dir="." files="framework/build.xml"/>
</subant>
- <subant target="docs" failonerror="false">
+ <subant target="docs" failonerror="${applications.present}">
<filelist dir="." files="applications/build.xml"/>
</subant>
- <subant target="docs" failonerror="false">
+ <subant target="docs" failonerror="${specialpurpose.present}">
<filelist dir="." files="specialpurpose/build.xml"/>
</subant>
<subant target="docs">
