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:13:28 UTC
svn commit: r743532 - in /james/jsieve/trunk: build.xml mailet/build.xml
main/build.xml util/build.xml
Author: rdonkin
Date: Wed Feb 11 22:13:28 2009
New Revision: 743532
URL: http://svn.apache.org/viewvc?rev=743532&view=rev
Log:
Clean up build. 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=743532&r1=743531&r2=743532&view=diff
==============================================================================
--- james/jsieve/trunk/build.xml (original)
+++ james/jsieve/trunk/build.xml Wed Feb 11 22:13:28 2009
@@ -47,8 +47,4 @@
<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=743532&r1=743531&r2=743532&view=diff
==============================================================================
--- james/jsieve/trunk/mailet/build.xml (original)
+++ james/jsieve/trunk/mailet/build.xml Wed Feb 11 22:13:28 2009
@@ -65,16 +65,10 @@
<!--
===================================================================
- Dependency Check
- ===================================================================
- -->
-
- <!--
- ===================================================================
Main target
===================================================================
-->
- <target name="main" depends="dist-lite" />
+ <target name="main" depends="run-tests" />
<!--
===================================================================
@@ -173,23 +167,6 @@
<!--
===================================================================
- Build everything
- ===================================================================
- -->
- <target name="all">
- <antcall target='clean' />
- <antcall target='dist' />
- </target>
-
- <!--
- ===================================================================
- Build all distributions
- ===================================================================
- -->
- <target name="dist" depends="dist-lite" />
-
- <!--
- ===================================================================
Make jSieve jars
===================================================================
-->
@@ -221,14 +198,7 @@
<bndwrap jars='${build.lib}/${name}-${version}-utils.jar' output='${build.lib}/${name}-${version}-utils.jar' definitions="." />
</target>
- <!--
- ===================================================================
- Make dist directory with unpacked dist ready to run
- ===================================================================
- -->
- <target name="dist-lite" depends="dist-lite-test" />
-
- <target name="dist-lite-build" depends="jar">
+ <target name="assemble" depends="jar">
<echo message="Installing jSieve to ${dist.dir}" />
@@ -251,7 +221,7 @@
Test the dist-lite build
===================================================================
-->
- <target name="dist-lite-test" depends="dist-lite-build">
+ <target name="run-tests" depends="assemble">
<echo message="Testing dist-lite build" />
<mkdir dir="${dist.dir}/reports" />
<junit printsummary="yes" haltonfailure="yes" filtertrace="on">
@@ -304,7 +274,7 @@
<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=" run-tests --> 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" />
Modified: james/jsieve/trunk/main/build.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/main/build.xml?rev=743532&r1=743531&r2=743532&view=diff
==============================================================================
--- james/jsieve/trunk/main/build.xml (original)
+++ james/jsieve/trunk/main/build.xml Wed Feb 11 22:13:28 2009
@@ -61,16 +61,10 @@
<!--
===================================================================
- Dependency Check
- ===================================================================
- -->
-
- <!--
- ===================================================================
Main target
===================================================================
-->
- <target name="main" depends="dist-lite" />
+ <target name="main" depends="run-tests" />
<!--
===================================================================
@@ -217,23 +211,6 @@
<!--
===================================================================
- Build everything
- ===================================================================
- -->
- <target name="all">
- <antcall target='clean' />
- <antcall target='dist' />
- </target>
-
- <!--
- ===================================================================
- Build all distributions
- ===================================================================
- -->
- <target name="dist" depends="dist-lite" />
-
- <!--
- ===================================================================
Make jSieve jars
===================================================================
-->
@@ -280,14 +257,7 @@
<copy todir='${lib.jsieve.dir}' file='${build.lib}/${name}-tests-${version}.jar' />
</target>
- <!--
- ===================================================================
- Make dist directory with unpacked dist ready to run
- ===================================================================
- -->
- <target name="dist-lite" depends="dist-lite-test" />
-
- <target name="dist-lite-build" depends="jar">
+ <target name="assemble" depends="jar">
<echo message="Installing jSieve to ${dist.dir}" />
@@ -313,7 +283,7 @@
Test the dist-lite build
===================================================================
-->
- <target name="dist-lite-test" depends="dist-lite-build">
+ <target name="run-tests" depends="assemble">
<echo message="Testing dist-lite build" />
<mkdir dir="${dist.dir}/reports" />
<junit printsummary="yes" haltonfailure="yes" filtertrace="on">
@@ -366,7 +336,7 @@
<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=" run-tests --> 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" />
Modified: james/jsieve/trunk/util/build.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/util/build.xml?rev=743532&r1=743531&r2=743532&view=diff
==============================================================================
--- james/jsieve/trunk/util/build.xml (original)
+++ james/jsieve/trunk/util/build.xml Wed Feb 11 22:13:28 2009
@@ -64,16 +64,10 @@
<!--
===================================================================
- Dependency Check
- ===================================================================
- -->
-
- <!--
- ===================================================================
Main target
===================================================================
-->
- <target name="main" depends="dist-lite" />
+ <target name="main" depends="run-tests" />
<!--
===================================================================
@@ -169,24 +163,7 @@
<copy file='LICENSE.apache' tofile="${build.classes}/META-INF/LICENSE.txt" />
<copy tofile="${build.classes}/META-INF/NOTICE.txt" file='NOTICE.base' />
</target>
-
- <!--
- ===================================================================
- Build everything
- ===================================================================
- -->
- <target name="all">
- <antcall target='clean' />
- <antcall target='dist' />
- </target>
-
- <!--
- ===================================================================
- Build all distributions
- ===================================================================
- -->
- <target name="dist" depends="dist-lite" />
-
+
<!--
===================================================================
Make jSieve jars
@@ -220,14 +197,7 @@
<bndwrap jars='${build.lib}/${name}-${version}-utils.jar' output='${build.lib}/${name}-${version}-utils.jar' definitions="." />
</target>
- <!--
- ===================================================================
- Make dist directory with unpacked dist ready to run
- ===================================================================
- -->
- <target name="dist-lite" depends="dist-lite-test" />
-
- <target name="dist-lite-build" depends="jar">
+ <target name="assemble" depends="jar">
<echo message="Installing jSieve to ${dist.dir}" />
@@ -253,7 +223,7 @@
Test the dist-lite build
===================================================================
-->
- <target name="dist-lite-test" depends="dist-lite-build">
+ <target name="run-tests" depends="assemble">
<echo message="Testing dist-lite build" />
<mkdir dir="${dist.dir}/reports" />
<junit printsummary="yes" haltonfailure="yes" filtertrace="on">
@@ -301,7 +271,7 @@
<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=" run-tests --> 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" />
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org