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:35:03 UTC
svn commit: r743539 - in /james/jsieve/trunk: build.xml mailet/build.xml
main/build.xml util/build.xml
Author: rdonkin
Date: Wed Feb 11 22:35:03 2009
New Revision: 743539
URL: http://svn.apache.org/viewvc?rev=743539&view=rev
Log:
Move common compilation code 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=743539&r1=743538&r2=743539&view=diff
==============================================================================
--- james/jsieve/trunk/build.xml (original)
+++ james/jsieve/trunk/build.xml Wed Feb 11 22:35:03 2009
@@ -25,7 +25,52 @@
==============================================================================
-->
-<project name='Apache JAMES JSieve' default="main" basedir=".">
+<project name='jsieve-master' default="main" basedir=".">
+
+ <macrodef name='CompileTests'>
+ <sequential>
+ <fail unless="is.available.libs.test">JavaMail is required for testing</fail>
+ <echo message="Compiling jSieve test sources" />
+ <mkdir dir="${build.classes.test}" />
+ <javac destdir="${build.classes.test}" debug="${debug}" optimize="${optimize}" deprecation="${deprecation}" source="${jdk.source}" target="${jdk.target}">
+ <classpath refid="project.test.class.path" />
+ <src path="${test.dir}" />
+ <include name="org/apache/jsieve/**" />
+ </javac>
+ <copy todir="${build.classes}">
+ <fileset dir="${java.dir}">
+ <include name="**/*.properties" />
+ </fileset>
+ </copy>
+ <copy todir="${build.classes.test}">
+ <fileset dir="${testconf.dir}">
+ <include name="**/*.properties" />
+ </fileset>
+ </copy>
+ <copy file='LICENSE.apache' tofile="${build.classes}/META-INF/LICENSE.txt" />
+ <copy tofile="${build.classes}/META-INF/NOTICE.txt" file='NOTICE.base' />
+ </sequential>
+ </macrodef>
+
+ <macrodef name='CompileMain'>
+ <sequential>
+ <echo message="Compiling JSieve sources" />
+ <mkdir dir="${build.classes}" />
+ <javac destdir="${build.classes}" debug="${debug}" optimize="${optimize}" deprecation="${deprecation}" source="${jdk.source}" target="${jdk.target}">
+ <classpath refid="project.class.path" />
+ <src path="${build.src}" />
+ <src path="${java.dir}" />
+ <include name="org/apache/jsieve/**" />
+ </javac>
+ <copy todir="${build.classes}">
+ <fileset dir="${conf.dir}">
+ <include name="**/*.properties" />
+ </fileset>
+ </copy>
+ <copy file='LICENSE.apache' tofile="${build.classes}/META-INF/LICENSE.txt" />
+ <copy tofile="${build.classes}/META-INF/NOTICE.txt" file='NOTICE.base' />
+ </sequential>
+ </macrodef>
<macrodef name='forall' description='Executes a target for all modules'>
<attribute name='do' />
Modified: james/jsieve/trunk/mailet/build.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/mailet/build.xml?rev=743539&r1=743538&r2=743539&view=diff
==============================================================================
--- james/jsieve/trunk/mailet/build.xml (original)
+++ james/jsieve/trunk/mailet/build.xml Wed Feb 11 22:35:03 2009
@@ -25,7 +25,7 @@
==============================================================================
-->
-<project name='Apache JAMES Sieve Mailet' default="main" basedir=".">
+<project name='jsieve-mailet' default="main" basedir=".">
<!--
Give user a chance to override without editing this file
(and without typing -D each time he compiles it)
@@ -63,6 +63,8 @@
<path refid="project.class.path" />
</path>
+ <import file='../build.xml'/>
+
<!--
===================================================================
Main target
@@ -121,48 +123,9 @@
compile
===================================================================
-->
- <target name="compile" depends="compile-main, compile-tests" />
-
- <target name="compile-main" depends="prepare">
- <echo message="Compiling jSieve Java sources" />
- <mkdir dir="${build.classes}" />
- <javac destdir="${build.classes}" debug="${debug}" optimize="${optimize}" deprecation="${deprecation}" source="${jdk.source}" target="${jdk.target}">
- <classpath refid="project.class.path" />
- <src path="${build.src}" />
- <src path="${java.dir}" />
- <include name="org/apache/jsieve/**" />
- </javac>
- <copy todir="${build.classes}">
- <fileset dir="${conf.dir}">
- <include name="**/*.properties" />
- </fileset>
- </copy>
- <copy file='LICENSE.apache' tofile="${build.classes}/META-INF/LICENSE.txt" />
- <copy tofile="${build.classes}/META-INF/NOTICE.txt" file='NOTICE.base' />
- </target>
-
- <target name="compile-tests" depends="prepare, compile-main">
- <fail unless="is.available.libs.test">JavaMail is required for testing</fail>
- <echo message="Compiling jSieve test sources" />
- <mkdir dir="${build.classes.test}" />
- <javac destdir="${build.classes.test}" debug="${debug}" optimize="${optimize}" deprecation="${deprecation}" source="${jdk.source}" target="${jdk.target}">
- <classpath refid="project.test.class.path" />
- <src path="${test.dir}" />
- <!--<include name="org/apache/jsieve/**"/>-->
- <exclude name="**" />
- </javac>
- <copy todir="${build.classes}">
- <fileset dir="${java.dir}">
- <include name="**/*.properties" />
- </fileset>
- </copy>
- <copy todir="${build.classes.test}">
- <fileset dir="${testconf.dir}">
- <include name="**/*.properties" />
- </fileset>
- </copy>
- <copy file='LICENSE.apache' tofile="${build.classes}/META-INF/LICENSE.txt" />
- <copy tofile="${build.classes}/META-INF/NOTICE.txt" file='NOTICE.base' />
+ <target name="compile" depends="prepare">
+ <CompileMain/>
+ <CompileTests/>
</target>
<!--
Modified: james/jsieve/trunk/main/build.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/main/build.xml?rev=743539&r1=743538&r2=743539&view=diff
==============================================================================
--- james/jsieve/trunk/main/build.xml (original)
+++ james/jsieve/trunk/main/build.xml Wed Feb 11 22:35:03 2009
@@ -25,7 +25,7 @@
==============================================================================
-->
-<project name='Apache JAMES JSieve' default="main" basedir=".">
+<project name='jsieve-main' default="main" basedir=".">
<!--
Give user a chance to override without editing this file
(and without typing -D each time he compiles it)
@@ -58,6 +58,8 @@
<path refid="project.class.path" />
<path refid="mail.class.path" />
</path>
+
+ <import file='../build.xml'/>
<!--
===================================================================
@@ -166,47 +168,9 @@
compile
===================================================================
-->
- <target name="compile" depends="compile-main, compile-tests" />
-
- <target name="compile-main" depends="prepare">
- <echo message="Compiling jSieve Java sources" />
- <mkdir dir="${build.classes}" />
- <javac destdir="${build.classes}" debug="${debug}" optimize="${optimize}" deprecation="${deprecation}" source="${jdk.source}" target="${jdk.target}">
- <classpath refid="project.class.path" />
- <src path="${build.src}" />
- <src path="${java.dir}" />
- <include name="org/apache/jsieve/**" />
- </javac>
- <copy todir="${build.classes}">
- <fileset dir="${conf.dir}">
- <include name="**/*.properties" />
- </fileset>
- </copy>
- <copy file='LICENSE.apache' tofile="${build.classes}/META-INF/LICENSE.txt" />
- <copy tofile="${build.classes}/META-INF/NOTICE.txt" file='NOTICE.base' />
- </target>
-
- <target name="compile-tests" depends="prepare, compile-main">
- <fail unless="is.available.libs.test">JavaMail is required for testing</fail>
- <echo message="Compiling jSieve test sources" />
- <mkdir dir="${build.classes.test}" />
- <javac destdir="${build.classes.test}" debug="${debug}" optimize="${optimize}" deprecation="${deprecation}" source="${jdk.source}" target="${jdk.target}">
- <classpath refid="project.test.class.path" />
- <src path="${test.dir}" />
- <include name="org/apache/jsieve/**" />
- </javac>
- <copy todir="${build.classes}">
- <fileset dir="${java.dir}">
- <include name="**/*.properties" />
- </fileset>
- </copy>
- <copy todir="${build.classes.test}">
- <fileset dir="${testconf.dir}">
- <include name="**/*.properties" />
- </fileset>
- </copy>
- <copy file='LICENSE.apache' tofile="${build.classes}/META-INF/LICENSE.txt" />
- <copy tofile="${build.classes}/META-INF/NOTICE.txt" file='NOTICE.base' />
+ <target name="compile" depends="prepare">
+ <CompileMain/>
+ <CompileTests/>
</target>
<!--
Modified: james/jsieve/trunk/util/build.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/util/build.xml?rev=743539&r1=743538&r2=743539&view=diff
==============================================================================
--- james/jsieve/trunk/util/build.xml (original)
+++ james/jsieve/trunk/util/build.xml Wed Feb 11 22:35:03 2009
@@ -25,7 +25,7 @@
==============================================================================
-->
-<project name='Apache JAMES JSieve Utilities' default="main" basedir=".">
+<project name='jsieve-util' default="main" basedir=".">
<!--
Give user a chance to override without editing this file
(and without typing -D each time he compiles it)
@@ -62,6 +62,8 @@
<pathelement location="${jmock.jar}" />
</path>
+ <import file='../build.xml'/>
+
<!--
===================================================================
Main target
@@ -120,48 +122,9 @@
compile
===================================================================
-->
- <target name="compile" depends="compile-main, compile-tests" />
-
- <target name="compile-main" depends="prepare">
- <echo message="Compiling jSieve Java sources" />
- <mkdir dir="${build.classes}" />
- <javac destdir="${build.classes}" debug="${debug}" optimize="${optimize}" deprecation="${deprecation}" source="${jdk.source}" target="${jdk.target}">
- <classpath refid="project.class.path" />
- <src path="${build.src}" />
- <src path="${java.dir}" />
- <include name="org/apache/jsieve/**" />
- </javac>
- <copy todir="${build.classes}">
- <fileset dir="${conf.dir}">
- <include name="**/*.properties" />
- </fileset>
- </copy>
- <copy file='LICENSE.apache' tofile="${build.classes}/META-INF/LICENSE.txt" />
- <copy tofile="${build.classes}/META-INF/NOTICE.txt" file='NOTICE.base' />
- </target>
-
- <target name="compile-tests" depends="prepare, compile-main">
- <fail unless="is.available.libs.test">JavaMail is required for testing</fail>
- <echo message="Compiling jSieve test sources" />
- <mkdir dir="${build.classes.test}" />
- <javac destdir="${build.classes.test}" debug="${debug}" optimize="${optimize}" deprecation="${deprecation}" source="${jdk.source}" target="${jdk.target}">
- <classpath refid="project.test.class.path" />
- <src path="${test.dir}" />
- <!--<include name="org/apache/jsieve/**"/>-->
- <exclude name="**" />
- </javac>
- <copy todir="${build.classes}">
- <fileset dir="${java.dir}">
- <include name="**/*.properties" />
- </fileset>
- </copy>
- <copy todir="${build.classes.test}">
- <fileset dir="${testconf.dir}">
- <include name="**/*.properties" />
- </fileset>
- </copy>
- <copy file='LICENSE.apache' tofile="${build.classes}/META-INF/LICENSE.txt" />
- <copy tofile="${build.classes}/META-INF/NOTICE.txt" file='NOTICE.base' />
+ <target name="compile" depends="prepare">
+ <CompileMain/>
+ <CompileTests/>
</target>
<!--
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org