Author: rdonkin
Date: Sun Jan 18 14:22:00 2009
New Revision: 735560

URL: http://svn.apache.org/viewvc?rev=735560&view=rev
Log:
Simplify build by consolidation

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

Modified: james/mailet/base/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/james/mailet/base/trunk/build.xml?rev=735560&r1=735559&r2=735560&view=diff
==============================================================================
--- james/mailet/base/trunk/build.xml (original)
+++ james/mailet/base/trunk/build.xml Sun Jan 18 14:22:00 2009
@@ -18,7 +18,7 @@
   under the License.                                           
 -->
 
-<project name="mailet-base" default="main" basedir=".">
+<project name="mailet-base" default="dist" basedir=".">
     <!--
     Give user a chance to override without editing this file
     (and without typing -D each time he compiles it)
@@ -45,13 +45,6 @@
 
     <!--
     ===================================================================
-                                  Main target
-    ===================================================================
-    -->
-    <target name="main" depends="dist-lite"/>
-
-    <!--
-    ===================================================================
     Prepare-common target - common tasks executed in preparation for
     all targets
     ===================================================================
@@ -80,9 +73,7 @@
                                   compile
     ===================================================================
     -->
-    <target name="compile" depends="compile-main"/>
-    
-    <target name="compile-main" depends="prepare">
+    <target name="compile" depends="prepare">
       <echo message="Compiling Java sources"/>
       <mkdir dir="${build.classes}"/>
       <javac 
@@ -193,32 +184,20 @@
 
     <!--
     ===================================================================
-            Make dist directory with unpacked dist ready to run
+                                  Distribution
     ===================================================================
     -->
-    
-
-    <target name="dist-lite" depends="jar">
 
-      <echo message="Installing Mailet to ${dist.dir}"/>
+    <target name="dist" depends="jar, javadocs">
+        <echo message="Installing Mailet to ${dist.dir}"/>
 
-      <!--Copies the Mailet jars into ./dist/lib -->
-      <copy todir="${dist.dir}/lib">
-        <fileset dir="${build.lib}">
-          <include name="*.jar"/>
-        </fileset>
-      </copy>
-    </target>
-
-    
-
-    <!--
-    ===================================================================
-                                  binary distribution
-    ===================================================================
-    -->
-
-    <target name="dist" depends="dist-lite, javadocs">
+        <!--Copies the Mailet jars into ./dist/lib -->
+        <copy todir="${dist.dir}/lib">
+          <fileset dir="${build.lib}">
+            <include name="*.jar"/>
+          </fileset>
+        </copy>
+        
       <echo message ="Building binary distribution"/>
       <mkdir dir="${dist.dir}"/>
         <zip zipfile="${dist.base}/${dist.name}.zip">



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to