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 2008/09/14 17:32:40 UTC

svn commit: r695238 - in /james/mailet/base/trunk: build.xml default.properties

Author: rdonkin
Date: Sun Sep 14 08:32:40 2008
New Revision: 695238

URL: http://svn.apache.org/viewvc?rev=695238&view=rev
Log:
Create distributions in target

Modified:
    james/mailet/base/trunk/build.xml
    james/mailet/base/trunk/default.properties

Modified: james/mailet/base/trunk/build.xml
URL: http://svn.apache.org/viewvc/james/mailet/base/trunk/build.xml?rev=695238&r1=695237&r2=695238&view=diff
==============================================================================
--- james/mailet/base/trunk/build.xml (original)
+++ james/mailet/base/trunk/build.xml Sun Sep 14 08:32:40 2008
@@ -141,13 +141,6 @@
         </doclet>
       </javadoc>
     </target>
-	
-    <!--
-    ===================================================================
-                                  Build all distributions
-    ===================================================================
-    -->
-    <target name="dist" depends="clean,dist-bin,dist-src"/>
 
     <!--
     ===================================================================
@@ -219,64 +212,23 @@
     ===================================================================
     -->
 
-    <target name="dist-bin" depends="dist-lite, javadocs">
+    <target name="dist" depends="dist-lite, 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">
-            <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">
-            <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, 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>
+      <mkdir dir="${dist.dir}"/>
+        <zip zipfile="${dist.base}/${dist.name}.zip">
+            <zipfileset dir="${dist.dir}" prefix="${dist.name}">
+            </zipfileset>
         </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"/>
+        <tar longfile="gnu" tarfile="${dist.base}/${dist.name}.tar">
+            <tarfileset 
+                    dir="${dist.dir}" 
+                    username="${name}" 
+                    group="${name}"
+                    prefix="${dist.name}">
             </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/base/trunk/default.properties
URL: http://svn.apache.org/viewvc/james/mailet/base/trunk/default.properties?rev=695238&r1=695237&r2=695238&view=diff
==============================================================================
--- james/mailet/base/trunk/default.properties (original)
+++ james/mailet/base/trunk/default.properties Sun Sep 14 08:32:40 2008
@@ -79,12 +79,6 @@
 #  distribution directories
 #
 
-dist.base = ${mailet.dir}/dist
+dist.base = ${mailet.dir}/target
 dist.name = ${project}-${name}-${version}
-dist.dir = ${dist.base}/${dist.name}
-
-#
-#  properties for the website directories
-#
-
-www.dir = ${mailet.dir}/www
+dist.dir = ${dist.base}/dist



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org