qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rob...@apache.org
Subject svn commit: r1149163 - in /qpid/trunk/qpid/java: build.xml common.xml
Date Thu, 21 Jul 2011 13:18:28 GMT
Author: robbie
Date: Thu Jul 21 13:18:27 2011
New Revision: 1149163

URL: http://svn.apache.org/viewvc?rev=1149163&view=rev
Log:
QPID-3365: Extend build system to build optional client-plugins.

Applied patch from Keith Wall <keith.wall@gmail.com>

Modified:
    qpid/trunk/qpid/java/build.xml
    qpid/trunk/qpid/java/common.xml

Modified: qpid/trunk/qpid/java/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.xml?rev=1149163&r1=1149162&r2=1149163&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.xml (original)
+++ qpid/trunk/qpid/java/build.xml Thu Jul 21 13:18:27 2011
@@ -22,15 +22,15 @@
 
   <import file="common.xml"/>
 
-
   <findSubProjects name="broker-plugins" dir="broker-plugins"/>
+  <findSubProjects name="client-plugins" dir="client-plugins" erroronmissingdir="false"/>
   <findSubProjects name="management" dir="management" excludes="common,example"/>
 
   <property name="modules.core"       value="junit-toolkit common management/common broker
client tools"/>
   <property name="modules.examples"   value="client/example management/example"/>
   <property name="modules.tests"      value="systests perftests integrationtests testkit"/>
   <property name="modules.management" value="${management}"/>
-  <property name="modules.plugin"     value="${broker-plugins}"/>
+  <property name="modules.plugin"     value="${broker-plugins} ${client-plugins}"/>
   <property name="modules"            value="${modules.core} ${modules.examples}
    ${modules.management} ${modules.tests} ${modules.plugin}"/>
 

Modified: qpid/trunk/qpid/java/common.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common.xml?rev=1149163&r1=1149162&r2=1149163&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common.xml (original)
+++ qpid/trunk/qpid/java/common.xml Thu Jul 21 13:18:27 2011
@@ -116,9 +116,10 @@
 	<attribute name="dir"/>
         <attribute name="name"/>
 	<attribute name="excludes" default=""/>
+	<attribute name="erroronmissingdir" default="true"/>
 	  
 	<sequential>
-	  <dirset id="@{dir}.refid" dir="@{dir}" excludes="@{excludes}">
+	  <dirset id="@{dir}.refid" dir="@{dir}" excludes="@{excludes}" erroronmissingdir="@{erroronmissingdir}">
 	   <present targetdir="@{dir}">
         	 <mapper type="glob" from="*" to="*/build.xml" />
 	   </present>
@@ -132,8 +133,6 @@
  	</sequential>
   </macrodef>
 
-
-
   <macrodef name="jython">
     <attribute name="path"/>
     <element name="args"/>



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message