You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by rd...@apache.org on 2009/02/11 23:47:57 UTC
svn commit: r743544 - in /james/jsieve/trunk: build.xml mailet/build.xml
main/build.xml util/build.xml
Author: rdonkin
Date: Wed Feb 11 22:47:56 2009
New Revision: 743544
URL: http://svn.apache.org/viewvc?rev=743544&view=rev
Log:
Move duplicated jar into macro. JSIEVE-45
Modified:
james/jsieve/trunk/build.xml
james/jsieve/trunk/mailet/build.xml
james/jsieve/trunk/main/build.xml
james/jsieve/trunk/util/build.xml
Modified: james/jsieve/trunk/build.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/build.xml?rev=743544&r1=743543&r2=743544&view=diff
==============================================================================
--- james/jsieve/trunk/build.xml (original)
+++ james/jsieve/trunk/build.xml Wed Feb 11 22:47:56 2009
@@ -27,6 +27,34 @@
<project name='jsieve-master' default="main" basedir=".">
+ <macrodef name='Jar'>
+ <attribute name='name'/>
+ <attribute name='prefix' default='-'/>
+ <sequential>
+ <mkdir dir="${build.lib}" />
+ <echo message="Making jSieve Jar (${name}@{prefix}@{name}-${version}.jar)" />
+ <jar jarfile="${build.lib}/${name}@{prefix}@{name}-${version}.jar" basedir="${build.classes}">
+ <include name="org/apache/jsieve/**" />
+ <include name="META-INF/**" />
+ <manifest>
+ <attribute name="Extension-Name" value='${extension.name}' />
+ <attribute name="Specification-Title" value='${title.spec}' />
+ <attribute name="Specification-Vendor" value='${vendor}' />
+ <attribute name="Specification-Version" value='${version.spec}' />
+ <attribute name="Implementation-Vendor-Id" value='${vendor.id}' />
+ <attribute name="Implementation-Title" value='${title.impl}' />
+ <attribute name="Implementation-Vendor" value='${vendor}' />
+ <attribute name="Implementation-Version" value='${version}' />
+ <attribute name="X-Compile-Source-JDK" value='${jdk.source}' />
+ <attribute name="X-Compile-Target-JDK" value='${jdk.target}' />
+ </manifest>
+ </jar>
+
+ <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${bnd.jar.relative}" />
+ <bndwrap jars='${build.lib}/${name}-@{module}-${version}.jar' output='${build.lib}/${name}-@{module}-${version}.jar' definitions="." />
+ </sequential>
+ </macrodef>
+
<macrodef name='CompileTests'>
<sequential>
<fail unless="is.available.libs.test">JavaMail is required for testing</fail>
Modified: james/jsieve/trunk/mailet/build.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/mailet/build.xml?rev=743544&r1=743543&r2=743544&view=diff
==============================================================================
--- james/jsieve/trunk/mailet/build.xml (original)
+++ james/jsieve/trunk/mailet/build.xml Wed Feb 11 22:47:56 2009
@@ -135,30 +135,7 @@
-->
<target name="jar" depends="compile">
-
- <mkdir dir="${build.lib}" />
-
- <!-- Make jSieve jar-->
- <echo message="Making jSieve Jar (${name}-mailet-${version}.jar)" />
- <jar jarfile="${build.lib}/${name}-mailet-${version}.jar" basedir="${build.classes}">
- <include name="org/apache/jsieve/**" />
- <include name="META-INF/**" />
- <manifest>
- <attribute name="Extension-Name" value='${extension.name}' />
- <attribute name="Specification-Title" value='${title.spec}' />
- <attribute name="Specification-Vendor" value='${vendor}' />
- <attribute name="Specification-Version" value='${version.spec}' />
- <attribute name="Implementation-Vendor-Id" value='${vendor.id}' />
- <attribute name="Implementation-Title" value='${title.impl}' />
- <attribute name="Implementation-Vendor" value='${vendor}' />
- <attribute name="Implementation-Version" value='${version}' />
- <attribute name="X-Compile-Source-JDK" value='${jdk.source}' />
- <attribute name="X-Compile-Target-JDK" value='${jdk.target}' />
- </manifest>
- </jar>
-
- <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${bnd.jar.relative}" />
- <bndwrap jars='${build.lib}/${name}-${version}-utils.jar' output='${build.lib}/${name}-${version}-utils.jar' definitions="." />
+ <Jar name='mailet'/>
</target>
<target name="assemble" depends="jar">
Modified: james/jsieve/trunk/main/build.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/main/build.xml?rev=743544&r1=743543&r2=743544&view=diff
==============================================================================
--- james/jsieve/trunk/main/build.xml (original)
+++ james/jsieve/trunk/main/build.xml Wed Feb 11 22:47:56 2009
@@ -180,32 +180,8 @@
-->
<target name="jar" depends="compile">
-
- <mkdir dir="${build.lib}" />
-
- <!-- Make jSieve jar-->
- <echo message="Making jSieve Jar (${name}-${version}.jar)" />
- <jar jarfile="${build.lib}/${name}-${version}.jar" basedir="${build.classes}">
- <include name="org/apache/jsieve/**" />
- <include name="META-INF/**" />
- <manifest>
- <attribute name="Extension-Name" value='${extension.name}' />
- <attribute name="Specification-Title" value='${title.spec}' />
- <attribute name="Specification-Vendor" value='${vendor}' />
- <attribute name="Specification-Version" value='${version.spec}' />
- <attribute name="Implementation-Vendor-Id" value='${vendor.id}' />
- <attribute name="Implementation-Title" value='${title.impl}' />
- <attribute name="Implementation-Vendor" value='${vendor}' />
- <attribute name="Implementation-Version" value='${version}' />
- <attribute name="X-Compile-Source-JDK" value='${jdk.source}' />
- <attribute name="X-Compile-Target-JDK" value='${jdk.target}' />
- </manifest>
- </jar>
- <copy todir='${lib.jsieve.dir}' file='${build.lib}/${name}-${version}.jar' />
-
- <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${bnd.jar.relative}" />
- <bndwrap jars='${build.lib}/${name}-${version}.jar' output='${build.lib}/${name}-${version}.jar' definitions="." />
-
+ <Jar name='' prefix=''/>
+
<!-- Make jSieve jUnit jar-->
<echo message="Making jSieve jUnit Jar (${name}-junit-${version}.jar)" />
<jar jarfile="${build.lib}/${name}-tests-${version}.jar" basedir="${build.classes.test}">
Modified: james/jsieve/trunk/util/build.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/util/build.xml?rev=743544&r1=743543&r2=743544&view=diff
==============================================================================
--- james/jsieve/trunk/util/build.xml (original)
+++ james/jsieve/trunk/util/build.xml Wed Feb 11 22:47:56 2009
@@ -134,30 +134,7 @@
-->
<target name="jar" depends="compile">
-
- <mkdir dir="${build.lib}" />
-
- <!-- Make jSieve jar-->
- <echo message="Making jSieve Jar (${name}-util-${version}.jar)" />
- <jar jarfile="${build.lib}/${name}-util-${version}.jar" basedir="${build.classes}">
- <include name="org/apache/jsieve/**" />
- <include name="META-INF/**" />
- <manifest>
- <attribute name="Extension-Name" value='${extension.name}' />
- <attribute name="Specification-Title" value='${title.spec}' />
- <attribute name="Specification-Vendor" value='${vendor}' />
- <attribute name="Specification-Version" value='${version.spec}' />
- <attribute name="Implementation-Vendor-Id" value='${vendor.id}' />
- <attribute name="Implementation-Title" value='${title.impl}' />
- <attribute name="Implementation-Vendor" value='${vendor}' />
- <attribute name="Implementation-Version" value='${version}' />
- <attribute name="X-Compile-Source-JDK" value='${jdk.source}' />
- <attribute name="X-Compile-Target-JDK" value='${jdk.target}' />
- </manifest>
- </jar>
-
- <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${bnd.jar.relative}" />
- <bndwrap jars='${build.lib}/${name}-${version}-utils.jar' output='${build.lib}/${name}-${version}-utils.jar' definitions="." />
+ <Jar name='util'/>
</target>
<target name="assemble" depends="jar">
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org