Author: rdonkin
Date: Sat Sep 13 01:19:05 2008
New Revision: 694895
URL: http://svn.apache.org/viewvc?rev=694895&view=rev
Log:
MAILET-19 - create distribution in target
Modified:
james/mailet/api/trunk/build.xml
james/mailet/api/trunk/default.properties
Modified: james/mailet/api/trunk/build.xml
URL:
http://svn.apache.org/viewvc/james/mailet/api/trunk/build.xml?rev=694895&r1=694894&r2=694895&view=diff
==============================================================================
--- james/mailet/api/trunk/build.xml (original)
+++ james/mailet/api/trunk/build.xml Sat Sep 13 01:19:05 2008
@@ -213,14 +213,7 @@
Build everything
===================================================================
-->
- <target name="everything" depends="clean,website,dist-bin,dist-src"/>
-
- <!--
- ===================================================================
- Build all distributions
- ===================================================================
- -->
- <target name="dist" depends="dist-bin,dist-src"/>
+ <target name="everything" depends="clean,website,dist"/>
<!--
===================================================================
@@ -292,64 +285,25 @@
===================================================================
-->
- <target name="dist-bin" depends="dist-lite,xdocs,javadocs">
+ <target name="dist" depends="dist-lite,xdocs,javadocs">
<echo message ="Building binary distribution"/>
- <property name="dist.binary.dir" value="${dist.dir}/downloads/bin"/>
- <mkdir dir="${dist.binary.dir}"/>
- <zip zipfile="${dist.binary.dir}/${dist.name}-bin.zip">
+ <mkdir dir="${dist.dir}"/>
+ <zip zipfile="${dist.base}/${dist.name}.zip">
<fileset dir="${dist.dir}">
<include name="lib/**"/>
<include name="*.txt"/>
<include name="KEYS"/>
</fileset>
</zip>
- <tar longfile="gnu" tarfile="${dist.binary.dir}/${dist.name}-bin.tar">
+ <tar longfile="gnu" tarfile="${dist.base}/${dist.name}.tar">
<tarfileset dir="${dist.dir}" username="${name}" group="${name}">
<include name="lib/**"/>
<include name="*.txt"/>
<include name="KEYS"/>
</tarfileset>
</tar>
- <gzip zipfile="${dist.binary.dir}/${dist.name}-bin.tar.gz"
src="${dist.binary.dir}/${dist.name}-bin.tar"/>
- <delete file="${dist.binary.dir}/${dist.name}-bin.tar"/>
- </target>
-
- <!--
- ===================================================================
- source distributions
- ===================================================================
- -->
- <target name="dist-src" depends="dist-lite,xdocs,javadocs">
- <echo message ="Building source distributions"/>
-
- <property name="dist.source.dir" value="${dist.dir}/downloads/src"/>
- <mkdir dir="${dist.source.dir}"/>
- <zip zipfile="${dist.source.dir}/${dist.name}-src.zip">
- <fileset dir=".">
- <include name="src/**"/>
- <include name="lib/**"/>
- <include name="www/**"/>
- <include name="tools/**"/>
- <include name="*.xml"/>
- <include name="*.properties"/>
- <include name="*.txt"/>
- <include name="KEYS"/>
- </fileset>
- </zip>
- <tar longfile="gnu" tarfile="${dist.source.dir}/${dist.name}-src.tar">
- <tarfileset dir="." username="${name}" group="${name}">
- <include name="src/**"/>
- <include name="lib/**"/>
- <include name="www/**"/>
- <include name="tools/**"/>
- <include name="*.xml"/>
- <include name="*.properties"/>
- <include name="*.txt"/>
- <include name="KEYS"/>
- </tarfileset>
- </tar>
- <gzip zipfile="${dist.source.dir}/${dist.name}-src.tar.gz"
src="${dist.source.dir}/${dist.name}-src.tar"/>
- <delete file="${dist.source.dir}/${dist.name}-src.tar"/>
+ <gzip zipfile="${dist.base}/${dist.name}.tar.gz"
src="${dist.base}/${dist.name}.tar"/>
+ <delete file="${dist.base}/${dist.name}.tar"/>
</target>
<!--
Modified: james/mailet/api/trunk/default.properties
URL:
http://svn.apache.org/viewvc/james/mailet/api/trunk/default.properties?rev=694895&r1=694894&r2=694895&view=diff
==============================================================================
--- james/mailet/api/trunk/default.properties (original)
+++ james/mailet/api/trunk/default.properties Sat Sep 13 01:19:05 2008
@@ -99,9 +99,9 @@
# distribution directories
#
-dist.base = ${mailet.dir}/dist
+dist.base = ${mailet.dir}/target
dist.name = ${name}-${version}
-dist.dir = ${dist.base}/${dist.name}
+dist.dir = ${dist.base}/dist
#
# properties for the website directories
