Skip to content
This repository has been archived by the owner on May 9, 2020. It is now read-only.

Commit

Permalink
OPTIMIZE: For all <subant> calls that need to deal with possible
Browse files Browse the repository at this point in the history
extension compnonents, switch them over to a macro, <externalsubant>.
The reason for this will soon become apparent.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1497887 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
eigood committed Jun 28, 2013
1 parent c88fb7b commit bd5fab6
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
12 changes: 6 additions & 6 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand All @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions macros.xml
Original file line number Diff line number Diff line change
Expand Up @@ -257,4 +257,8 @@ under the License.
</if>
</sequential>
</macrodef>

<presetdef name="externalsubant">
<subant inheritall="false"/>
</presetdef>
</project>

0 comments on commit bd5fab6

Please sign in to comment.