You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2006/10/16 15:47:53 UTC
svn commit: r464493 -
/incubator/harmony/enhanced/classlib/trunk/make/properties.xml
Author: hindessm
Date: Mon Oct 16 06:47:52 2006
New Revision: 464493
URL: http://svn.apache.org/viewvc?view=rev&rev=464493
Log:
Simplify call-modules macro and do not use costly antcalls.
Modified:
incubator/harmony/enhanced/classlib/trunk/make/properties.xml
Modified: incubator/harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/properties.xml?view=diff&rev=464493&r1=464492&r2=464493
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/properties.xml Mon Oct 16 06:47:52 2006
@@ -143,6 +143,9 @@
<property name="lcms.home" value="/usr" />
<property name="jpeg.home" value="/usr" />
+ <!-- default property for call-modules macro - i.e. all modules -->
+ <property name="build.module" value="*" />
+
<target name="echo" depends="svn-prop, svn-info"
description="Display the properties defined by this ant file" >
<echo>
@@ -246,28 +249,11 @@
<macrodef name="call-modules">
<attribute name="target" />
<sequential>
- <antcall target="call-modules-all">
- <param name="target" value="@{target}" />
- </antcall>
- <antcall target="call-modules-one">
- <param name="target" value="@{target}" />
- </antcall>
+ <subant target="@{target}">
+ <dirset dir="modules" includes="${build.module}" />
+ </subant>
</sequential>
</macrodef>
-
- <target name="call-modules-all" unless="build.module">
- <subant target="${target}">
- <fileset dir="modules">
- <include name="*/build.xml" />
- </fileset>
- </subant>
- </target>
-
- <target name="call-modules-one" if="build.module">
- <subant target="${target}">
- <dirset dir="modules" includes="${build.module}" />
- </subant>
- </target>
<!-- macros for modules -->
<!-- TOFIX move to a shared file in the HDK/build/make directory. -->