diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2010-04-26 14:33:24 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2010-04-26 14:33:24 +0000 |
| commit | a17d2de4a13ab47445a042d68df34b023d240698 (patch) | |
| tree | 94c166289d21ab09b4e2cd72c3b22720f1a16412 /java/common.xml | |
| parent | 1eb5e731e3d17791356100f6af4aef087da48061 (diff) | |
| download | qpid-python-a17d2de4a13ab47445a042d68df34b023d240698.tar.gz | |
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/qpid@938059 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/common.xml')
| -rw-r--r-- | java/common.xml | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/java/common.xml b/java/common.xml index 611be5a0b8..456d1804fd 100644 --- a/java/common.xml +++ b/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" |