You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2013/06/28 21:07:57 UTC
svn commit: r1497887 - in /ofbiz/trunk: build.xml macros.xml
Author: doogie
Date: Fri Jun 28 19:07:57 2013
New Revision: 1497887
URL: http://svn.apache.org/r1497887
Log:
OPTIMIZE: For all <subant> calls that need to deal with possible
extension compnonents, switch them over to a macro, <externalsubant>.
The reason for this will soon become apparent.
Modified:
ofbiz/trunk/build.xml
ofbiz/trunk/macros.xml
Modified: ofbiz/trunk/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1497887&r1=1497886&r2=1497887&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Fri Jun 28 19:07:57 2013
@@ -209,11 +209,11 @@ under the License.
<subant inheritall="false" failonerror="${specialpurpose.present}">
<filelist dir="." files="specialpurpose/build.xml"/>
</subant>
- <subant inheritall="false">
+ <externalsubant>
<fileset dir="${basedir}/themes">
<include name="*/build.xml" />
</fileset>
- </subant>
+ </externalsubant>
<hotdeployant/>
<antcall target="clean-svninfo"/>
@@ -231,17 +231,17 @@ under the License.
<if>
<available file="hot-deploy/build.xml" property="useHotDeployBuild"/>
<then>
- <subant inheritall="false">
+ <externalsubant>
<filelist dir="." files="hot-deploy/build.xml"/>
- </subant>
+ </externalsubant>
</then>
<else>
- <subant inheritall="false">
+ <externalsubant>
<fileset dir="${basedir}/hot-deploy" casesensitive="no">
<exclude name="disabled/**"/>
<include name="*/build.xml"/>
</fileset>
- </subant>
+ </externalsubant>
</else>
</if>
</sequential>
Modified: ofbiz/trunk/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/macros.xml?rev=1497887&r1=1497886&r2=1497887&view=diff
==============================================================================
--- ofbiz/trunk/macros.xml (original)
+++ ofbiz/trunk/macros.xml Fri Jun 28 19:07:57 2013
@@ -257,4 +257,8 @@ under the License.
</if>
</sequential>
</macrodef>
+
+ <presetdef name="externalsubant">
+ <subant inheritall="false"/>
+ </presetdef>
</project>