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 22:42:40 UTC
svn commit: r743520 - in /james/jsieve/trunk: build.xml mailet/build.xml
main/build.xml util/build.xml
Author: rdonkin
Date: Wed Feb 11 21:42:40 2009
New Revision: 743520
URL: http://svn.apache.org/viewvc?rev=743520&view=rev
Log:
Just applied standard formatting. 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=743520&r1=743519&r2=743520&view=diff
==============================================================================
--- james/jsieve/trunk/build.xml (original)
+++ james/jsieve/trunk/build.xml Wed Feb 11 21:42:40 2009
@@ -27,30 +27,28 @@
<project name='Apache JAMES JSieve' default="main" basedir=".">
- <macrodef
- name='forall'
- description='Executes a target for all modules'>
- <attribute name='do'/>
- <attribute name='dir' default='.'/>
+ <macrodef name='forall' description='Executes a target for all modules'>
+ <attribute name='do' />
+ <attribute name='dir' default='.' />
<sequential>
<subant target='@{do}'>
- <fileset dir='@{dir}' includes='main/build.xml'/>
- <fileset dir='@{dir}' includes='util/build.xml'/>
- <fileset dir='@{dir}' includes='mailet/build.xml'/>
- </subant>
- </sequential>
+ <fileset dir='@{dir}' includes='main/build.xml' />
+ <fileset dir='@{dir}' includes='util/build.xml' />
+ <fileset dir='@{dir}' includes='mailet/build.xml' />
+ </subant>
+ </sequential>
</macrodef>
- <target name='clean' description='Cleans each module'>
- <forall do='clean'/>
- </target>
-
- <target name='main' description='Builds each module'>
- <forall do='main'/>
- </target>
-
- <target name='dist' description='Creates distribution for each module'>
- <forall do='dist'/>
- </target>
+ <target name='clean' description='Cleans each module'>
+ <forall do='clean' />
+ </target>
+
+ <target name='main' description='Builds each module'>
+ <forall do='main' />
+ </target>
+
+ <target name='dist' description='Creates distribution for each module'>
+ <forall do='dist' />
+ </target>
</project>
Modified: james/jsieve/trunk/mailet/build.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/mailet/build.xml?rev=743520&r1=743519&r2=743520&view=diff
==============================================================================
--- james/jsieve/trunk/mailet/build.xml (original)
+++ james/jsieve/trunk/mailet/build.xml Wed Feb 11 21:42:40 2009
@@ -30,38 +30,38 @@
Give user a chance to override without editing this file
(and without typing -D each time he compiles it)
-->
- <property file=".ant.properties"/>
- <property file="${user.home}/.ant.properties"/>
- <property file="../include.properties"/>
- <property file="../default.properties"/>
+ <property file=".ant.properties" />
+ <property file="${user.home}/.ant.properties" />
+ <property file="../include.properties" />
+ <property file="../default.properties" />
<!--
===================================================================
Set the classpath
===================================================================
-->
-
- <path id="mail.class.path">
- <pathelement location='${mail.jar}'/>
- <pathelement location='${activation.jar}'/>
- </path>
-
+
+ <path id="mail.class.path">
+ <pathelement location='${mail.jar}' />
+ <pathelement location='${activation.jar}' />
+ </path>
+
<path id="project.class.path">
- <pathelement location="${commons-logging.jar}"/>
- <pathelement location="${log4j.jar}"/>
- <pathelement location="${junit.jar}"/>
- <pathelement location='${lib.jsieve.dir}/${name}-${version}.jar'/>
- <pathelement location="${mailet.jar}"/>
- <pathelement location="${mailet-base.jar}"/>
- <pathelement location="${mime4j.jar}"/>
- <path refid="mail.class.path"/>
+ <pathelement location="${commons-logging.jar}" />
+ <pathelement location="${log4j.jar}" />
+ <pathelement location="${junit.jar}" />
+ <pathelement location='${lib.jsieve.dir}/${name}-${version}.jar' />
+ <pathelement location="${mailet.jar}" />
+ <pathelement location="${mailet-base.jar}" />
+ <pathelement location="${mime4j.jar}" />
+ <path refid="mail.class.path" />
<pathelement path="${java.class.path}" />
<pathelement path="${build.classes}" />
</path>
-
+
<path id="project.test.class.path">
- <path refid="project.class.path"/>
- </path>
+ <path refid="project.class.path" />
+ </path>
<!--
===================================================================
@@ -74,7 +74,7 @@
Main target
===================================================================
-->
- <target name="main" depends="dist-lite"/>
+ <target name="main" depends="dist-lite" />
<!--
===================================================================
@@ -84,26 +84,26 @@
-->
<target name="prepare-common">
- <echo message="Preparing code"/>
+ <echo message="Preparing code" />
- <tstamp/>
- <mkdir dir="${dist.dir}"/>
- <copy todir="${dist.dir}">
- <fileset dir=".">
- <include name="LICENSE.txt"/>
- <include name="README.txt"/>
- <include name="NOTICE.txt"/>
- </fileset>
- </copy>
- <fixcrlf srcdir="${java.dir}" includes="**/*.java" eol="lf" tab="remove" tablength="4" />
- <fixcrlf srcdir="${java.dir}" includes="**/*.html" eol="lf" tab="remove" tablength="4" />
- <fixcrlf srcdir="${test.dir}" includes="**/*.java" eol="lf" tab="remove" tablength="4" />
- <fixcrlf srcdir="${conf.dir}" includes="**/*.properties" eol="lf" tab="remove" tablength="4" />
- <fixcrlf srcdir="${testconf.dir}" includes="**/*.properties" eol="lf" tab="remove" tablength="4" />
- <fixcrlf srcdir="." includes="build.sh" eol="lf"/>
- <fixcrlf srcdir="." includes="build.bat" eol="crlf"/>
- <fixcrlf srcdir="." includes="build.xml" eol="lf"/>
- <mkdir dir="${build.src}"/>
+ <tstamp />
+ <mkdir dir="${dist.dir}" />
+ <copy todir="${dist.dir}">
+ <fileset dir=".">
+ <include name="LICENSE.txt" />
+ <include name="README.txt" />
+ <include name="NOTICE.txt" />
+ </fileset>
+ </copy>
+ <fixcrlf srcdir="${java.dir}" includes="**/*.java" eol="lf" tab="remove" tablength="4" />
+ <fixcrlf srcdir="${java.dir}" includes="**/*.html" eol="lf" tab="remove" tablength="4" />
+ <fixcrlf srcdir="${test.dir}" includes="**/*.java" eol="lf" tab="remove" tablength="4" />
+ <fixcrlf srcdir="${conf.dir}" includes="**/*.properties" eol="lf" tab="remove" tablength="4" />
+ <fixcrlf srcdir="${testconf.dir}" includes="**/*.properties" eol="lf" tab="remove" tablength="4" />
+ <fixcrlf srcdir="." includes="build.sh" eol="lf" />
+ <fixcrlf srcdir="." includes="build.bat" eol="crlf" />
+ <fixcrlf srcdir="." includes="build.xml" eol="lf" />
+ <mkdir dir="${build.src}" />
</target>
<!--
@@ -112,85 +112,63 @@
===================================================================
-->
<target name="prepare" depends="prepare-common">
- <available
- classname="javax.mail.Message"
- property="is.available.javamail"
- classpathref="project.test.class.path"/>
- <available
- classname="javax.activation.MimeType"
- property="is.available.activation"
- classpathref="project.test.class.path"/>
+ <available classname="javax.mail.Message" property="is.available.javamail" classpathref="project.test.class.path" />
+ <available classname="javax.activation.MimeType" property="is.available.activation" classpathref="project.test.class.path" />
<condition property="is.available.libs.test">
<and>
- <isset property='is.available.javamail'/>
- <isset property='is.available.activation'/>
- </and>
- </condition>
- </target>
+ <isset property='is.available.javamail' />
+ <isset property='is.available.activation' />
+ </and>
+ </condition>
+ </target>
<!--
===================================================================
compile
===================================================================
-->
- <target name="compile" depends="compile-main, compile-tests"/>
-
+ <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>
+ <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'/>
+ <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>
<!--
@@ -199,28 +177,28 @@
===================================================================
-->
<target name="javadocs" depends="compile">
- <echo message="Making jSieve Javadocs"/>
+ <echo message="Making jSieve Javadocs" />
- <delete dir="${build.javadocs}"/>
- <mkdir dir="${build.javadocs}"/>
- <javadoc failonerror="yes" packagenames="org.apache.jsieve.*" destdir="${build.javadocs}">
- <sourcepath>
- <pathelement path="${java.dir}"/>
- <pathelement path="${build.src}"/>
- </sourcepath>
- <classpath refid="project.class.path"/>
- <doclet name="com.sun.tools.doclets.standard.Standard">
- <param name="-author"/>
- <param name="-version"/>
- <param name="-use"/>
- <param name="-breakiterator"/>
- <param name="-link" value="http://java.sun.com/j2se/1.4/docs/api"/>
- <param name="-link" value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api"/>
- <param name="-doctitle" value="${Name} ${version}"/>
- <param name="-windowtitle" value="${Name} API"/>
- <param name="-bottom" value="Copyright (c) ${year} <a href='http://www.apache.org'>Apache Software Foundation</a> Apache 2.0 Licensed."/>
- </doclet>
- </javadoc>
+ <delete dir="${build.javadocs}" />
+ <mkdir dir="${build.javadocs}" />
+ <javadoc failonerror="yes" packagenames="org.apache.jsieve.*" destdir="${build.javadocs}">
+ <sourcepath>
+ <pathelement path="${java.dir}" />
+ <pathelement path="${build.src}" />
+ </sourcepath>
+ <classpath refid="project.class.path" />
+ <doclet name="com.sun.tools.doclets.standard.Standard">
+ <param name="-author" />
+ <param name="-version" />
+ <param name="-use" />
+ <param name="-breakiterator" />
+ <param name="-link" value="http://java.sun.com/j2se/1.4/docs/api" />
+ <param name="-link" value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api" />
+ <param name="-doctitle" value="${Name} ${version}" />
+ <param name="-windowtitle" value="${Name} API" />
+ <param name="-bottom" value="Copyright (c) ${year} <a href='http://www.apache.org'>Apache Software Foundation</a> Apache 2.0 Licensed." />
+ </doclet>
+ </javadoc>
</target>
<!--
@@ -229,16 +207,16 @@
===================================================================
-->
<target name="all">
- <antcall target='clean'/>
- <antcall target='dist'/>
- </target>
+ <antcall target='clean' />
+ <antcall target='dist' />
+ </target>
<!--
===================================================================
Build all distributions
===================================================================
-->
- <target name="dist" depends="dist-lite,javadocs"/>
+ <target name="dist" depends="dist-lite,javadocs" />
<!--
===================================================================
@@ -248,36 +226,29 @@
<target name="jar" depends="compile">
- <mkdir dir="${build.lib}"/>
+ <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>
- <!-- 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="."/>
+ <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="." />
</target>
<!--
@@ -285,68 +256,68 @@
Make dist directory with unpacked dist ready to run
===================================================================
-->
- <target name="dist-lite" depends="dist-lite-test"/>
+ <target name="dist-lite" depends="dist-lite-test" />
<target name="dist-lite-build" depends="jar">
- <echo message="Installing jSieve to ${dist.dir}"/>
+ <echo message="Installing jSieve to ${dist.dir}" />
+
+ <!--Copies the jSieve jars into ./dist/lib -->
+ <copy todir="${dist.dir}/lib">
+ <fileset dir="${build.lib}">
+ <include name="*.jar" />
+ </fileset>
+ </copy>
+
+ <!--Copies the required support jars -->
+ <copy todir="${dist.dir}/lib" file="${commons-logging.jar}" />
+ <copy todir="${dist.dir}/lib" file="${log4j.jar}" />
+ <copy todir="${dist.dir}/lib" file="${junit.jar}" />
- <!--Copies the jSieve jars into ./dist/lib -->
- <copy todir="${dist.dir}/lib">
- <fileset dir="${build.lib}">
- <include name="*.jar"/>
- </fileset>
- </copy>
-
- <!--Copies the required support jars -->
- <copy todir="${dist.dir}/lib" file="${commons-logging.jar}"/>
- <copy todir="${dist.dir}/lib" file="${log4j.jar}"/>
- <copy todir="${dist.dir}/lib" file="${junit.jar}"/>
-
</target>
<!--
===================================================================
Test the dist-lite build
===================================================================
- -->
+ -->
<target name="dist-lite-test" depends="dist-lite-build">
- <echo message="Testing dist-lite build"/>
- <mkdir dir="${dist.dir}/reports"/>
+ <echo message="Testing dist-lite build" />
+ <mkdir dir="${dist.dir}/reports" />
<junit printsummary="yes" haltonfailure="yes" filtertrace="on">
<!-- Uncomment this to remotely debug the tests
<jvmarg line="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y"/>
-->
<classpath id="junit.class.path">
- <pathelement location="${testconf.dir}"/>
+ <pathelement location="${testconf.dir}" />
<fileset dir="${dist.dir}/lib">
- <include name="**/*.jar"/>
+ <include name="**/*.jar" />
</fileset>
- <pathelement location="${dist.dir}/conf/"/>
- <pathelement path="${java.class.path}"/>
- <pathelement location="${junit.jar}"/>
- <path refid='mail.class.path'/>
+ <pathelement location="${dist.dir}/conf/" />
+ <pathelement path="${java.class.path}" />
+ <pathelement location="${junit.jar}" />
+ <path refid='mail.class.path' />
</classpath>
- <formatter type="plain"/>
+ <formatter type="plain" />
<batchtest fork="yes" todir="${dist.dir}/reports">
<fileset dir="${build.classes.test}">
- <include name="**/*Test.class"/>
+ <include name="**/*Test.class" />
</fileset>
</batchtest>
</junit>
</target>
-
+
<!--
===================================================================
delete dist/, build/ and www/
===================================================================
-->
<target name="clean">
- <echo message ="deleting working directories ready for a clean build"/>
- <delete dir="${dist.base}"/>
- <mkdir dir="${dist.base}"/>
- <delete dir="${build.dir}"/>
- <delete dir='target'/>
+ <echo message="deleting working directories ready for a clean build" />
+ <delete dir="${dist.base}" />
+ <mkdir dir="${dist.base}" />
+ <delete dir="${build.dir}" />
+ <delete dir='target' />
</target>
<!--
@@ -355,24 +326,24 @@
===================================================================
-->
<target name="usage">
- <echo message=""/>
- <echo message=""/>
- <echo message="jSieve Build file"/>
- <echo message="-------------------------------------------------------------"/>
- <echo message=""/>
- <echo message=" available targets are:"/>
- <echo message=""/>
- <echo message=" dist-lite --> generates unpacked distribution (default)"/>
- <echo message=" dist-lite-test --> tests the jarred classes"/>
- <echo message=" compile --> compiles the source code"/>
- <echo message=" dist --> generates all the jSieve distributions, packed"/>
- <echo message=" clean --> cleans up the directory"/>
- <echo message=" javadocs --> creates the Javadoc"/>
- <echo message=""/>
+ <echo message="" />
+ <echo message="" />
+ <echo message="jSieve Build file" />
+ <echo message="-------------------------------------------------------------" />
+ <echo message="" />
+ <echo message=" available targets are:" />
+ <echo message="" />
+ <echo message=" dist-lite --> generates unpacked distribution (default)" />
+ <echo message=" dist-lite-test --> tests the jarred classes" />
+ <echo message=" compile --> compiles the source code" />
+ <echo message=" dist --> generates all the jSieve distributions, packed" />
+ <echo message=" clean --> cleans up the directory" />
+ <echo message=" javadocs --> creates the Javadoc" />
+ <echo message="" />
<echo message=" See the comments inside the build.xml file for more details."/>
<echo message="-------------------------------------------------------------"/>
<echo message=""/>
<echo message=""/>
</target>
-
+
</project>
Modified: james/jsieve/trunk/main/build.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/main/build.xml?rev=743520&r1=743519&r2=743520&view=diff
==============================================================================
--- james/jsieve/trunk/main/build.xml (original)
+++ james/jsieve/trunk/main/build.xml Wed Feb 11 21:42:40 2009
@@ -30,10 +30,10 @@
Give user a chance to override without editing this file
(and without typing -D each time he compiles it)
-->
- <property file=".ant.properties"/>
- <property file="${user.home}/.ant.properties"/>
- <property file="../include.properties"/>
- <property file="../default.properties"/>
+ <property file=".ant.properties" />
+ <property file="${user.home}/.ant.properties" />
+ <property file="../include.properties" />
+ <property file="../default.properties" />
<!--
===================================================================
@@ -42,22 +42,22 @@
-->
<path id="project.class.path">
- <pathelement location="${commons-logging.jar}"/>
- <pathelement location="${log4j.jar}"/>
- <pathelement location="${junit.jar}"/>
+ <pathelement location="${commons-logging.jar}" />
+ <pathelement location="${log4j.jar}" />
+ <pathelement location="${junit.jar}" />
<pathelement path="${java.class.path}" />
<pathelement path="${build.classes}" />
</path>
-
+
<path id="mail.class.path">
- <pathelement location='${mail.jar}'/>
- <pathelement location='${activation.jar}'/>
- </path>
-
+ <pathelement location='${mail.jar}' />
+ <pathelement location='${activation.jar}' />
+ </path>
+
<path id="project.test.class.path">
- <path refid="project.class.path"/>
- <path refid="mail.class.path"/>
- </path>
+ <path refid="project.class.path" />
+ <path refid="mail.class.path" />
+ </path>
<!--
===================================================================
@@ -70,7 +70,7 @@
Main target
===================================================================
-->
- <target name="main" depends="dist-lite"/>
+ <target name="main" depends="dist-lite" />
<!--
===================================================================
@@ -80,27 +80,27 @@
-->
<target name="prepare-common">
- <echo message="Preparing code"/>
+ <echo message="Preparing code" />
- <tstamp/>
- <mkdir dir="${dist.dir}"/>
- <copy todir="${dist.dir}">
- <fileset dir=".">
- <include name="LICENSE.txt"/>
- <include name="README.txt"/>
- <include name="NOTICE.txt"/>
- </fileset>
- </copy>
- <fixcrlf srcdir="${java.dir}" includes="**/*.java" eol="lf" tab="remove" tablength="4" />
- <fixcrlf srcdir="${java.dir}" includes="**/*.html" eol="lf" tab="remove" tablength="4" />
- <fixcrlf srcdir="${test.dir}" includes="**/*.java" eol="lf" tab="remove" tablength="4" />
- <fixcrlf srcdir="${conf.dir}" includes="**/*.properties" eol="lf" tab="remove" tablength="4" />
- <fixcrlf srcdir="${testconf.dir}" includes="**/*.properties" eol="lf" tab="remove" tablength="4" />
- <fixcrlf srcdir="." includes="build.sh" eol="lf"/>
- <fixcrlf srcdir="." includes="build.bat" eol="crlf"/>
- <fixcrlf srcdir="." includes="build.xml" eol="lf"/>
- <fixcrlf srcdir="${javacc.dir}" includes="**/*.jj*" eol="lf" tab="remove" tablength="4" />
- <mkdir dir="${build.src}"/>
+ <tstamp />
+ <mkdir dir="${dist.dir}" />
+ <copy todir="${dist.dir}">
+ <fileset dir=".">
+ <include name="LICENSE.txt" />
+ <include name="README.txt" />
+ <include name="NOTICE.txt" />
+ </fileset>
+ </copy>
+ <fixcrlf srcdir="${java.dir}" includes="**/*.java" eol="lf" tab="remove" tablength="4" />
+ <fixcrlf srcdir="${java.dir}" includes="**/*.html" eol="lf" tab="remove" tablength="4" />
+ <fixcrlf srcdir="${test.dir}" includes="**/*.java" eol="lf" tab="remove" tablength="4" />
+ <fixcrlf srcdir="${conf.dir}" includes="**/*.properties" eol="lf" tab="remove" tablength="4" />
+ <fixcrlf srcdir="${testconf.dir}" includes="**/*.properties" eol="lf" tab="remove" tablength="4" />
+ <fixcrlf srcdir="." includes="build.sh" eol="lf" />
+ <fixcrlf srcdir="." includes="build.bat" eol="crlf" />
+ <fixcrlf srcdir="." includes="build.xml" eol="lf" />
+ <fixcrlf srcdir="${javacc.dir}" includes="**/*.jj*" eol="lf" tab="remove" tablength="4" />
+ <mkdir dir="${build.src}" />
</target>
<!--
@@ -109,21 +109,15 @@
===================================================================
-->
<target name="prepare" depends="prepare-common, preprocess">
- <available
- classname="javax.mail.Message"
- property="is.available.javamail"
- classpathref="project.test.class.path"/>
- <available
- classname="javax.activation.MimeType"
- property="is.available.activation"
- classpathref="project.test.class.path"/>
+ <available classname="javax.mail.Message" property="is.available.javamail" classpathref="project.test.class.path" />
+ <available classname="javax.activation.MimeType" property="is.available.activation" classpathref="project.test.class.path" />
<condition property="is.available.libs.test">
<and>
- <isset property='is.available.javamail'/>
- <isset property='is.available.activation'/>
- </and>
- </condition>
- </target>
+ <isset property='is.available.javamail' />
+ <isset property='is.available.activation' />
+ </and>
+ </condition>
+ </target>
<!--
===================================================================
@@ -140,37 +134,37 @@
Generate JavaCC source inserting parse tree building actions
and the Java source for the parse classes.
-->
- <mkdir dir="${build.src}/org/apache/jsieve/parser/generated/address"/>
+ <mkdir dir="${build.src}/org/apache/jsieve/parser/generated/address" />
<java classname="jjtree" fork="yes" failonerror="true" dir="${build.src}">
- <arg line="${javacc.dir}/sieve/sieve.jjt"/>
+ <arg line="${javacc.dir}/sieve/sieve.jjt" />
<classpath>
- <pathelement location="${javacc.jar}"/>
+ <pathelement location="${javacc.jar}" />
<pathelement path="${java.class.path}" />
</classpath>
</java>
<java classname="jjtree" fork="yes" failonerror="true" dir="${build.src}">
- <arg line="${javacc.dir}/address/AddressListParser.jjt"/>
- <classpath>
- <pathelement location="${javacc.jar}"/>
- <pathelement path="${java.class.path}" />
- </classpath>
+ <arg line="${javacc.dir}/address/AddressListParser.jjt" />
+ <classpath>
+ <pathelement location="${javacc.jar}" />
+ <pathelement path="${java.class.path}" />
+ </classpath>
</java>
<!-- Generate Java source from the JavaCC source -->
<java classname="javacc" fork="yes" failonerror="true" dir="${build.src}">
- <arg line="${build.src}/org/apache/jsieve/parser/generated/sieve.jj"/>
+ <arg line="${build.src}/org/apache/jsieve/parser/generated/sieve.jj" />
<classpath>
- <pathelement location="${javacc.jar}"/>
+ <pathelement location="${javacc.jar}" />
<pathelement path="${java.class.path}" />
</classpath>
- </java>
+ </java>
<java classname="javacc" fork="yes" failonerror="true" dir="${build.src}">
- <arg line="${build.src}/org/apache/jsieve/parser/generated/address/AddressListParser.jj"/>
+ <arg line="${build.src}/org/apache/jsieve/parser/generated/address/AddressListParser.jj" />
<classpath>
- <pathelement location="${javacc.jar}"/>
+ <pathelement location="${javacc.jar}" />
<pathelement path="${java.class.path}" />
</classpath>
- </java>
+ </java>
</target>
<!--
@@ -178,63 +172,47 @@
compile
===================================================================
-->
- <target name="compile" depends="compile-main, compile-tests"/>
-
+ <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>
+ <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'/>
+ <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>
<!--
@@ -244,28 +222,28 @@
-->
<target name="javadocs" depends="compile">
- <echo message="Making jSieve Javadocs"/>
+ <echo message="Making jSieve Javadocs" />
- <delete dir="${build.javadocs}"/>
- <mkdir dir="${build.javadocs}"/>
- <javadoc failonerror="yes" packagenames="org.apache.jsieve.*" destdir="${build.javadocs}">
- <sourcepath>
- <pathelement path="${java.dir}"/>
- <pathelement path="${build.src}"/>
- </sourcepath>
- <classpath refid="project.class.path"/>
- <doclet name="com.sun.tools.doclets.standard.Standard">
- <param name="-author"/>
- <param name="-version"/>
- <param name="-use"/>
- <param name="-breakiterator"/>
- <param name="-link" value="http://java.sun.com/j2se/1.4/docs/api"/>
- <param name="-link" value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api"/>
- <param name="-doctitle" value="${Name} ${version}"/>
- <param name="-windowtitle" value="${Name} API"/>
- <param name="-bottom" value="Copyright (c) ${year} <a href='http://www.apache.org'>Apache Software Foundation</a> Apache 2.0 Licensed."/>
- </doclet>
- </javadoc>
+ <delete dir="${build.javadocs}" />
+ <mkdir dir="${build.javadocs}" />
+ <javadoc failonerror="yes" packagenames="org.apache.jsieve.*" destdir="${build.javadocs}">
+ <sourcepath>
+ <pathelement path="${java.dir}" />
+ <pathelement path="${build.src}" />
+ </sourcepath>
+ <classpath refid="project.class.path" />
+ <doclet name="com.sun.tools.doclets.standard.Standard">
+ <param name="-author" />
+ <param name="-version" />
+ <param name="-use" />
+ <param name="-breakiterator" />
+ <param name="-link" value="http://java.sun.com/j2se/1.4/docs/api" />
+ <param name="-link" value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api" />
+ <param name="-doctitle" value="${Name} ${version}" />
+ <param name="-windowtitle" value="${Name} API" />
+ <param name="-bottom" value="Copyright (c) ${year} <a href='http://www.apache.org'>Apache Software Foundation</a> Apache 2.0 Licensed." />
+ </doclet>
+ </javadoc>
</target>
<!--
@@ -274,16 +252,16 @@
===================================================================
-->
<target name="all">
- <antcall target='clean'/>
- <antcall target='dist'/>
- </target>
+ <antcall target='clean' />
+ <antcall target='dist' />
+ </target>
<!--
===================================================================
Build all distributions
===================================================================
-->
- <target name="dist" depends="dist-lite,javadocs"/>
+ <target name="dist" depends="dist-lite,javadocs" />
<!--
===================================================================
@@ -293,52 +271,44 @@
<target name="jar" depends="compile">
- <mkdir dir="${build.lib}"/>
+ <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="."/>
-
- <!-- 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}">
- <include name="org/apache/jsieve/**"/>
- <include name="META-INF/**"/>
+ <!-- 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="." />
+
+ <!-- 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}">
+ <include name="org/apache/jsieve/**" />
+ <include name="META-INF/**" />
<manifest>
- <attribute name="Created-By" value='${creator}'/>
- <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}-tests-${version}.jar'/>
+ <attribute name="Created-By" value='${creator}' />
+ <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}-tests-${version}.jar' />
</target>
<!--
@@ -346,71 +316,71 @@
Make dist directory with unpacked dist ready to run
===================================================================
-->
- <target name="dist-lite" depends="dist-lite-test"/>
+ <target name="dist-lite" depends="dist-lite-test" />
<target name="dist-lite-build" depends="jar">
- <echo message="Installing jSieve to ${dist.dir}"/>
+ <echo message="Installing jSieve to ${dist.dir}" />
- <!--Copies the jSieve jars into ./dist/lib -->
- <copy todir="${dist.dir}/lib">
- <fileset dir="${build.lib}">
- <include name="*.jar"/>
- </fileset>
- </copy>
-
- <!--Copies the required support jars -->
- <copy todir="${dist.dir}/lib" file="${commons-logging.jar}"/>
- <copy todir="${dist.dir}/lib" file="${log4j.jar}"/>
- <copy todir="${dist.dir}/lib" file="${junit.jar}"/>
-
- <!--Copies the configuration files -->
- <mkdir dir="${dist.dir}/conf"/>
- <copy todir="${dist.dir}/conf" file="${testconf.dir}/log4j.properties"/>
+ <!--Copies the jSieve jars into ./dist/lib -->
+ <copy todir="${dist.dir}/lib">
+ <fileset dir="${build.lib}">
+ <include name="*.jar" />
+ </fileset>
+ </copy>
+
+ <!--Copies the required support jars -->
+ <copy todir="${dist.dir}/lib" file="${commons-logging.jar}" />
+ <copy todir="${dist.dir}/lib" file="${log4j.jar}" />
+ <copy todir="${dist.dir}/lib" file="${junit.jar}" />
+
+ <!--Copies the configuration files -->
+ <mkdir dir="${dist.dir}/conf" />
+ <copy todir="${dist.dir}/conf" file="${testconf.dir}/log4j.properties" />
</target>
<!--
===================================================================
Test the dist-lite build
===================================================================
- -->
+ -->
<target name="dist-lite-test" depends="dist-lite-build">
- <echo message="Testing dist-lite build"/>
- <mkdir dir="${dist.dir}/reports"/>
+ <echo message="Testing dist-lite build" />
+ <mkdir dir="${dist.dir}/reports" />
<junit printsummary="yes" haltonfailure="yes" filtertrace="on">
<!-- Uncomment this to remotely debug the tests
<jvmarg line="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y"/>
-->
<classpath id="junit.class.path">
- <pathelement location="${testconf.dir}"/>
+ <pathelement location="${testconf.dir}" />
<fileset dir="${dist.dir}/lib">
- <include name="**/*.jar"/>
+ <include name="**/*.jar" />
</fileset>
- <pathelement location="${dist.dir}/conf/"/>
- <pathelement path="${java.class.path}"/>
- <pathelement location="${junit.jar}"/>
- <path refid='mail.class.path'/>
+ <pathelement location="${dist.dir}/conf/" />
+ <pathelement path="${java.class.path}" />
+ <pathelement location="${junit.jar}" />
+ <path refid='mail.class.path' />
</classpath>
- <formatter type="plain"/>
+ <formatter type="plain" />
<batchtest fork="yes" todir="${dist.dir}/reports">
<fileset dir="${build.classes.test}">
- <include name="**/*Test.class"/>
+ <include name="**/*Test.class" />
</fileset>
</batchtest>
</junit>
</target>
-
+
<!--
===================================================================
delete dist/, build/ and www/
===================================================================
-->
<target name="clean">
- <echo message ="deleting working directories ready for a clean build"/>
- <delete dir="${dist.base}"/>
- <mkdir dir="${dist.base}"/>
- <delete dir="${build.dir}"/>
- <delete dir='target'/>
+ <echo message="deleting working directories ready for a clean build" />
+ <delete dir="${dist.base}" />
+ <mkdir dir="${dist.base}" />
+ <delete dir="${build.dir}" />
+ <delete dir='target' />
</target>
<!--
@@ -419,24 +389,24 @@
===================================================================
-->
<target name="usage">
- <echo message=""/>
- <echo message=""/>
- <echo message="jSieve Build file"/>
- <echo message="-------------------------------------------------------------"/>
- <echo message=""/>
- <echo message=" available targets are:"/>
- <echo message=""/>
- <echo message=" dist-lite --> generates unpacked distribution (default)"/>
- <echo message=" dist-lite-test --> tests the jarred classes"/>
- <echo message=" compile --> compiles the source code"/>
- <echo message=" dist --> generates all the jSieve distributions, packed"/>
- <echo message=" clean --> cleans up the directory"/>
- <echo message=" javadocs --> creates the Javadoc"/>
- <echo message=""/>
+ <echo message="" />
+ <echo message="" />
+ <echo message="jSieve Build file" />
+ <echo message="-------------------------------------------------------------" />
+ <echo message="" />
+ <echo message=" available targets are:" />
+ <echo message="" />
+ <echo message=" dist-lite --> generates unpacked distribution (default)" />
+ <echo message=" dist-lite-test --> tests the jarred classes" />
+ <echo message=" compile --> compiles the source code" />
+ <echo message=" dist --> generates all the jSieve distributions, packed" />
+ <echo message=" clean --> cleans up the directory" />
+ <echo message=" javadocs --> creates the Javadoc" />
+ <echo message="" />
<echo message=" See the comments inside the build.xml file for more details."/>
<echo message="-------------------------------------------------------------"/>
<echo message=""/>
<echo message=""/>
</target>
-
+
</project>
Modified: james/jsieve/trunk/util/build.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/util/build.xml?rev=743520&r1=743519&r2=743520&view=diff
==============================================================================
--- james/jsieve/trunk/util/build.xml (original)
+++ james/jsieve/trunk/util/build.xml Wed Feb 11 21:42:40 2009
@@ -30,37 +30,37 @@
Give user a chance to override without editing this file
(and without typing -D each time he compiles it)
-->
- <property file=".ant.properties"/>
- <property file="${user.home}/.ant.properties"/>
- <property file="../include.properties"/>
- <property file="../default.properties"/>
+ <property file=".ant.properties" />
+ <property file="${user.home}/.ant.properties" />
+ <property file="../include.properties" />
+ <property file="../default.properties" />
<!--
===================================================================
Set the classpath
===================================================================
-->
-
- <path id="mail.class.path">
- <pathelement location='${mail.jar}'/>
- <pathelement location='${activation.jar}'/>
- </path>
-
+
+ <path id="mail.class.path">
+ <pathelement location='${mail.jar}' />
+ <pathelement location='${activation.jar}' />
+ </path>
+
<path id="project.class.path">
- <pathelement location="${commons-logging.jar}"/>
- <pathelement location="${log4j.jar}"/>
- <pathelement location='${lib.jsieve.dir}/${name}-${version}.jar'/>
- <pathelement location="${mailet.jar}"/>
- <path refid="mail.class.path"/>
+ <pathelement location="${commons-logging.jar}" />
+ <pathelement location="${log4j.jar}" />
+ <pathelement location='${lib.jsieve.dir}/${name}-${version}.jar' />
+ <pathelement location="${mailet.jar}" />
+ <path refid="mail.class.path" />
<pathelement path="${java.class.path}" />
<pathelement path="${build.classes}" />
</path>
-
+
<path id="project.test.class.path">
- <path refid="project.class.path"/>
- <pathelement location="${junit.jar}"/>
- <pathelement location="${jmock.jar}"/>
- </path>
+ <path refid="project.class.path" />
+ <pathelement location="${junit.jar}" />
+ <pathelement location="${jmock.jar}" />
+ </path>
<!--
===================================================================
@@ -73,7 +73,7 @@
Main target
===================================================================
-->
- <target name="main" depends="dist-lite"/>
+ <target name="main" depends="dist-lite" />
<!--
===================================================================
@@ -83,26 +83,26 @@
-->
<target name="prepare-common">
- <echo message="Preparing code"/>
+ <echo message="Preparing code" />
- <tstamp/>
- <mkdir dir="${dist.dir}"/>
- <copy todir="${dist.dir}">
- <fileset dir=".">
- <include name="LICENSE.txt"/>
- <include name="README.txt"/>
- <include name="NOTICE.txt"/>
- </fileset>
- </copy>
- <fixcrlf srcdir="${java.dir}" includes="**/*.java" eol="lf" tab="remove" tablength="4" />
- <fixcrlf srcdir="${java.dir}" includes="**/*.html" eol="lf" tab="remove" tablength="4" />
- <fixcrlf srcdir="${test.dir}" includes="**/*.java" eol="lf" tab="remove" tablength="4" />
- <fixcrlf srcdir="${conf.dir}" includes="**/*.properties" eol="lf" tab="remove" tablength="4" />
- <fixcrlf srcdir="${testconf.dir}" includes="**/*.properties" eol="lf" tab="remove" tablength="4" />
- <fixcrlf srcdir="." includes="build.sh" eol="lf"/>
- <fixcrlf srcdir="." includes="build.bat" eol="crlf"/>
- <fixcrlf srcdir="." includes="build.xml" eol="lf"/>
- <mkdir dir="${build.src}"/>
+ <tstamp />
+ <mkdir dir="${dist.dir}" />
+ <copy todir="${dist.dir}">
+ <fileset dir=".">
+ <include name="LICENSE.txt" />
+ <include name="README.txt" />
+ <include name="NOTICE.txt" />
+ </fileset>
+ </copy>
+ <fixcrlf srcdir="${java.dir}" includes="**/*.java" eol="lf" tab="remove" tablength="4" />
+ <fixcrlf srcdir="${java.dir}" includes="**/*.html" eol="lf" tab="remove" tablength="4" />
+ <fixcrlf srcdir="${test.dir}" includes="**/*.java" eol="lf" tab="remove" tablength="4" />
+ <fixcrlf srcdir="${conf.dir}" includes="**/*.properties" eol="lf" tab="remove" tablength="4" />
+ <fixcrlf srcdir="${testconf.dir}" includes="**/*.properties" eol="lf" tab="remove" tablength="4" />
+ <fixcrlf srcdir="." includes="build.sh" eol="lf" />
+ <fixcrlf srcdir="." includes="build.bat" eol="crlf" />
+ <fixcrlf srcdir="." includes="build.xml" eol="lf" />
+ <mkdir dir="${build.src}" />
</target>
<!--
@@ -111,85 +111,63 @@
===================================================================
-->
<target name="prepare" depends="prepare-common">
- <available
- classname="javax.mail.Message"
- property="is.available.javamail"
- classpathref="project.test.class.path"/>
- <available
- classname="javax.activation.MimeType"
- property="is.available.activation"
- classpathref="project.test.class.path"/>
+ <available classname="javax.mail.Message" property="is.available.javamail" classpathref="project.test.class.path" />
+ <available classname="javax.activation.MimeType" property="is.available.activation" classpathref="project.test.class.path" />
<condition property="is.available.libs.test">
<and>
- <isset property='is.available.javamail'/>
- <isset property='is.available.activation'/>
- </and>
- </condition>
- </target>
+ <isset property='is.available.javamail' />
+ <isset property='is.available.activation' />
+ </and>
+ </condition>
+ </target>
<!--
===================================================================
compile
===================================================================
-->
- <target name="compile" depends="compile-main, compile-tests"/>
-
+ <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>
+ <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'/>
+ <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>
<!--
@@ -198,28 +176,28 @@
===================================================================
-->
<target name="javadocs" depends="compile">
- <echo message="Making jSieve Javadocs"/>
+ <echo message="Making jSieve Javadocs" />
- <delete dir="${build.javadocs}"/>
- <mkdir dir="${build.javadocs}"/>
- <javadoc failonerror="yes" packagenames="org.apache.jsieve.*" destdir="${build.javadocs}">
- <sourcepath>
- <pathelement path="${java.dir}"/>
- <pathelement path="${build.src}"/>
- </sourcepath>
- <classpath refid="project.class.path"/>
- <doclet name="com.sun.tools.doclets.standard.Standard">
- <param name="-author"/>
- <param name="-version"/>
- <param name="-use"/>
- <param name="-breakiterator"/>
- <param name="-link" value="http://java.sun.com/j2se/1.4/docs/api"/>
- <param name="-link" value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api"/>
- <param name="-doctitle" value="${Name} ${version}"/>
- <param name="-windowtitle" value="${Name} API"/>
- <param name="-bottom" value="Copyright (c) ${year} <a href='http://www.apache.org'>Apache Software Foundation</a> Apache 2.0 Licensed."/>
- </doclet>
- </javadoc>
+ <delete dir="${build.javadocs}" />
+ <mkdir dir="${build.javadocs}" />
+ <javadoc failonerror="yes" packagenames="org.apache.jsieve.*" destdir="${build.javadocs}">
+ <sourcepath>
+ <pathelement path="${java.dir}" />
+ <pathelement path="${build.src}" />
+ </sourcepath>
+ <classpath refid="project.class.path" />
+ <doclet name="com.sun.tools.doclets.standard.Standard">
+ <param name="-author" />
+ <param name="-version" />
+ <param name="-use" />
+ <param name="-breakiterator" />
+ <param name="-link" value="http://java.sun.com/j2se/1.4/docs/api" />
+ <param name="-link" value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api" />
+ <param name="-doctitle" value="${Name} ${version}" />
+ <param name="-windowtitle" value="${Name} API" />
+ <param name="-bottom" value="Copyright (c) ${year} <a href='http://www.apache.org'>Apache Software Foundation</a> Apache 2.0 Licensed." />
+ </doclet>
+ </javadoc>
</target>
<!--
@@ -228,16 +206,16 @@
===================================================================
-->
<target name="all">
- <antcall target='clean'/>
- <antcall target='dist'/>
- </target>
+ <antcall target='clean' />
+ <antcall target='dist' />
+ </target>
<!--
===================================================================
Build all distributions
===================================================================
-->
- <target name="dist" depends="dist-lite,javadocs"/>
+ <target name="dist" depends="dist-lite,javadocs" />
<!--
===================================================================
@@ -247,36 +225,29 @@
<target name="jar" depends="compile">
- <mkdir dir="${build.lib}"/>
+ <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="."/>
+ <!-- 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="." />
</target>
<!--
@@ -284,66 +255,66 @@
Make dist directory with unpacked dist ready to run
===================================================================
-->
- <target name="dist-lite" depends="dist-lite-test"/>
+ <target name="dist-lite" depends="dist-lite-test" />
<target name="dist-lite-build" depends="jar">
- <echo message="Installing jSieve to ${dist.dir}"/>
+ <echo message="Installing jSieve to ${dist.dir}" />
- <!--Copies the jSieve jars into ./dist/lib -->
- <copy todir="${dist.dir}/lib">
- <fileset dir="${build.lib}">
- <include name="*.jar"/>
- </fileset>
- </copy>
-
- <!--Copies the required support jars -->
- <copy todir="${dist.dir}/lib" file="${commons-logging.jar}"/>
- <copy todir="${dist.dir}/lib" file="${log4j.jar}"/>
- <copy todir="${dist.dir}/lib" file="${junit.jar}"/>
-
- <!--Copies the configuration files -->
- <mkdir dir="${dist.dir}/conf"/>
- <copy todir="${dist.dir}/conf" file="${testconf.dir}/log4j.properties"/>
+ <!--Copies the jSieve jars into ./dist/lib -->
+ <copy todir="${dist.dir}/lib">
+ <fileset dir="${build.lib}">
+ <include name="*.jar" />
+ </fileset>
+ </copy>
+
+ <!--Copies the required support jars -->
+ <copy todir="${dist.dir}/lib" file="${commons-logging.jar}" />
+ <copy todir="${dist.dir}/lib" file="${log4j.jar}" />
+ <copy todir="${dist.dir}/lib" file="${junit.jar}" />
+
+ <!--Copies the configuration files -->
+ <mkdir dir="${dist.dir}/conf" />
+ <copy todir="${dist.dir}/conf" file="${testconf.dir}/log4j.properties" />
</target>
<!--
===================================================================
Test the dist-lite build
===================================================================
- -->
+ -->
<target name="dist-lite-test" depends="dist-lite-build">
- <echo message="Testing dist-lite build"/>
- <mkdir dir="${dist.dir}/reports"/>
+ <echo message="Testing dist-lite build" />
+ <mkdir dir="${dist.dir}/reports" />
<junit printsummary="yes" haltonfailure="yes" filtertrace="on">
<!-- Uncomment this to remotely debug the tests
<jvmarg line="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y"/>
-->
<classpath id="junit.class.path">
- <pathelement location="${testconf.dir}"/>
- <pathelement location='${build.classes.test}'/>
- <path refid='project.test.class.path'/>
+ <pathelement location="${testconf.dir}" />
+ <pathelement location='${build.classes.test}' />
+ <path refid='project.test.class.path' />
</classpath>
- <formatter type="plain"/>
+ <formatter type="plain" />
<batchtest fork="yes" todir="${dist.dir}/reports">
<fileset dir="${build.classes.test}">
- <include name="**/*Test.class"/>
+ <include name="**/*Test.class" />
</fileset>
</batchtest>
</junit>
</target>
-
+
<!--
===================================================================
delete dist/, build/ and www/
===================================================================
-->
<target name="clean">
- <echo message ="deleting working directories ready for a clean build"/>
- <delete dir="${dist.base}"/>
- <mkdir dir="${dist.base}"/>
- <delete dir="${build.dir}"/>
- <delete dir='target'/>
+ <echo message="deleting working directories ready for a clean build" />
+ <delete dir="${dist.base}" />
+ <mkdir dir="${dist.base}" />
+ <delete dir="${build.dir}" />
+ <delete dir='target' />
</target>
<!--
@@ -352,24 +323,24 @@
===================================================================
-->
<target name="usage">
- <echo message=""/>
- <echo message=""/>
- <echo message="jSieve Build file"/>
- <echo message="-------------------------------------------------------------"/>
- <echo message=""/>
- <echo message=" available targets are:"/>
- <echo message=""/>
- <echo message=" dist-lite --> generates unpacked distribution (default)"/>
- <echo message=" dist-lite-test --> tests the jarred classes"/>
- <echo message=" compile --> compiles the source code"/>
- <echo message=" dist --> generates all the jSieve distributions, packed"/>
- <echo message=" clean --> cleans up the directory"/>
- <echo message=" javadocs --> creates the Javadoc"/>
+ <echo message="" />
+ <echo message="" />
+ <echo message="jSieve Build file" />
+ <echo message="-------------------------------------------------------------" />
+ <echo message="" />
+ <echo message=" available targets are:" />
+ <echo message="" />
+ <echo message=" dist-lite --> generates unpacked distribution (default)" />
+ <echo message=" dist-lite-test --> tests the jarred classes" />
+ <echo message=" compile --> compiles the source code" />
+ <echo message=" dist --> generates all the jSieve distributions, packed" />
+ <echo message=" clean --> cleans up the directory" />
+ <echo message=" javadocs --> creates the Javadoc" />
<echo message=""/>
<echo message=" See the comments inside the build.xml file for more details."/>
<echo message="-------------------------------------------------------------"/>
<echo message=""/>
<echo message=""/>
</target>
-
+
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org