From 7b5de19ea6cdb4e4351c9b2116d84b26f4053462 Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Mon, 26 Apr 2010 14:33:24 +0000
Subject: QPID-2530 : Updated build system to have a new findSubProjects macro
 in build.xml that will correctly locate and add all subprojects (those with a
 build.xml file) to the modules.plugin variable. This will correctly allow new
 plugins to be automatically picked up without any further build system
 changes.

To further simplify the build process and make better use of the module.depends option the build.deps file has been updated to contain only the libraries the module actually depends on. The dependant libraries due to a module.depends are now automatically pulled in by the build system. A further enhancement would be to do transitive dependencies, which would also allow dependencies to be built when in a sub module directory.

e.g. client depends on common, but client.libs should not contain mina, common contains mina and so those libraries are pulled in via the fact that client's module.depends contains common.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@938059 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/common.xml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'qpid/java/common.xml')

diff --git a/qpid/java/common.xml b/qpid/java/common.xml
index 611be5a0b8..456d1804fd 100644
--- a/qpid/java/common.xml
+++ b/qpid/java/common.xml
@@ -93,6 +93,28 @@
     </sequential>
   </macrodef>
 
+  <macrodef name="findSubProjects">
+	<attribute name="dir"/>
+        <attribute name="name"/>
+	<attribute name="excludes" default=""/>
+	  
+	<sequential>
+	  <dirset id="@{dir}.refid" dir="@{dir}" excludes="@{excludes}">
+	   <present targetdir="@{dir}">
+        	 <mapper type="glob" from="*" to="*/build.xml" />
+	   </present>
+	  </dirset>
+
+	  <pathconvert property="@{name}"
+        	       refid="@{dir}.refid"
+	               pathsep=" ">
+		<map from="${project.root}/" to=""/>
+          </pathconvert>
+ 	</sequential>
+  </macrodef>
+
+
+
   <macrodef name="jython">
     <attribute name="path"/>
     <element name="args"/>
@@ -109,6 +131,10 @@
     <compilerarg line="${javac.compiler.args}"/>
   </javac>
 
+
+  <typedef name="propertymapper" classname="org.apache.qpid.tasks.PropertyMapper"
+             classpath="${tasks.classes}"/>
+
   <taskdef name="map" classname="org.apache.qpid.tasks.Map"
            classpath="${tasks.classes}"/>
   <taskdef name="foreach" classname="org.apache.qpid.tasks.Foreach"
-- 
cgit v1.2.1