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:55:15 UTC

svn commit: r743551 - in /james/jsieve/trunk: mailet/build.xml main/build.xml

Author: rdonkin
Date: Wed Feb 11 22:55:15 2009
New Revision: 743551

URL: http://svn.apache.org/viewvc?rev=743551&view=rev
Log:
Simplify build by source preparation. JSIEVE-45

Modified:
    james/jsieve/trunk/mailet/build.xml
    james/jsieve/trunk/main/build.xml

Modified: james/jsieve/trunk/mailet/build.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/mailet/build.xml?rev=743551&r1=743550&r2=743551&view=diff
==============================================================================
--- james/jsieve/trunk/mailet/build.xml (original)
+++ james/jsieve/trunk/mailet/build.xml Wed Feb 11 22:55:15 2009
@@ -74,40 +74,10 @@
 
     <!--
     ===================================================================
-    Prepare-common target - common tasks executed in preparation for
-    all targets
-    ===================================================================
-    -->
-    <target name="prepare-common">
-
-        <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}" />
-    </target>
-
-    <!--
-    ===================================================================
                                   Prepare target
     ===================================================================
     -->
-    <target name="prepare" depends="prepare-common">
+    <target name="prepare">
         <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">

Modified: james/jsieve/trunk/main/build.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/main/build.xml?rev=743551&r1=743550&r2=743551&view=diff
==============================================================================
--- james/jsieve/trunk/main/build.xml (original)
+++ james/jsieve/trunk/main/build.xml Wed Feb 11 22:55:15 2009
@@ -67,44 +67,12 @@
     ===================================================================
     -->
     <target name="main" depends="run-tests" />
-
-    <!--
-    ===================================================================
-    Prepare-common target - common tasks executed in preparation for
-    all targets
-    ===================================================================
-    -->
-    <target name="prepare-common">
-
-        <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}" />
-    </target>
-
     <!--
     ===================================================================
                                   Prepare target
     ===================================================================
     -->
-    <target name="prepare" depends="prepare-common, preprocess">
+    <target name="prepare" depends="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" />
         <condition property="is.available.libs.test">
@@ -125,7 +93,7 @@
     file, is built, consider the following processing a black box.
     Or zen for the more spiritual amongst you.
     -->
-    <target name="preprocess" depends="prepare-common">
+    <target name="preprocess">
         <!--
         Generate JavaCC source inserting parse tree building actions 
         and the Java source for the parse classes.



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