charlesb 01/05/21 02:49:00
Modified: . build.xml
src/java/org/apache/james Constants.java
Log:
Added src-dist target to buildfile & clean up
Revision Changes Path
1.69 +124 -38 jakarta-james/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-james/build.xml,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- build.xml 2001/05/18 12:07:34 1.68
+++ build.xml 2001/05/21 09:48:51 1.69
@@ -13,27 +13,9 @@
Legal:
Copyright (c) 1999-2001 The Apache Software Foundation. All Rights Reserved.
-===============================================================================
+==============================================================================
+ -->
- Needed packages to run JAMES
- ============================
-
-JAMES is a mail server running on top of the Avalon. Avalon is a component-
-based server framework. Components are organized into blocks, and one or more
- blocks are packaged in block archive files (*.bar). James is a single block in
- its own archive.
-
-To compile and run James you need the phoenix-loader.jar and phoenix-engine.jar
- as well as the JAMES.bar. The default implementation of JAMES also uses the
- blocks from cornerstone.bar.
-
-After that you'll need activation.jar and mail.jar from Sun. For optional TLS
- support, you will need the JSSE jars from Sun.
-
-All these package are in current distribution.
-
-=========================================================================== -->
-
<project default="main" basedir=".">
<!--
@@ -48,14 +30,10 @@
<property name="version" value="1.2.2-dev"/>
<property name="year" value="1999-2001"/>
-<!-- There should be no need to override default compiler but need to change javac
task to run without this -->
+ <!-- There should be no need to override default compiler but need to change
+ javac task to run without this -->
<property name="build.compiler" value="classic"/>
- <property name="debug" value="on"/>
- <property name="optimize" value="on"/>
- <property name="deprecation" value="on"/>
-
-
<!--
these are here only for those who use jikes compiler. For other
developers this part makes no difference.
@@ -66,6 +44,11 @@
<property name="build.compiler.depend" value="true"/>
<property name="build.compiler.fulldepend" value="true"/>
+ <property name="debug" value="on"/>
+ <property name="optimize" value="on"/>
+ <property name="deprecation" value="on"/>
+
+
<!--
===================================================================
Set the properties for intermediate directory
@@ -126,17 +109,17 @@
<property name="scratchpad.jar" value="${lib.dir}/avalon-scratchpad.jar"/>
<property name="logkit.jar" value="${lib.dir}/logkit.jar"/>
<property name="cornerstone.bar" value="${lib.dir}/cornerstone.bar"/>
-<!--
<property name="phoenix.client.jar" value="${lib.dir}/phoenix-client.jar"/>
-
- <property name="activation.jar" value="${lib.dir}/activation.jar"/>
--->
+ <!--
+ <property name="activation.jar" value="${lib.dir}/activation.jar"/>
+ -->
<path id="project.class.path">
<pathelement location="${xerces.jar}"/>
<pathelement location="${framework.jar}"/>
<pathelement location="${excalibur.jar}"/>
<pathelement location="${scratchpad.jar}"/>
<pathelement location="${logkit.jar}"/>
+ <pathelement location="${phoenix.client.jar}"/>
<pathelement location="${cornerstone.bar}"/>
<pathelement path="${java.class.path}" />
<fileset dir="${lib.dir}">
@@ -146,6 +129,7 @@
<exclude name="excalibur.jar"/>
<exclude name="scratchpad.jar"/>
<exclude name="logkit.jar"/>
+ <exclude name="phoenix.client.jar"/>
</fileset>
<pathelement path="${build.classes}" />
</path>
@@ -208,6 +192,7 @@
<property name="src.dist.javadocs" value="${src.dist.dir}/docs/api"/>
<property name="src.dist.lib" value="${src.dist.dir}/lib"/>
<property name="src.dist.tools" value="${src.dist.dir}/tools"/>
+ <property name="src.dist.proposals" value="${src.dist.dir}/proposals"/>
</target>
@@ -263,7 +248,7 @@
<!-- Compiles the source directory -->
<!-- =================================================================== -->
<target name="compile" depends="prepare-proposal">
- <mkdir dir="${build.dir}"/>
+ <!-- <mkdir dir="${build.dir}"/> -->
<available property="jndi.present" classname="javax.naming.InitialContext" />
<mkdir dir="${build.classes}"/>
@@ -359,7 +344,7 @@
</target>
<!-- =================================================================== -->
- <!-- Creates the distribution -->
+ <!-- Creates the unpacked binary distribution -->
<!-- =================================================================== -->
<target name="dist-lite" depends="sar">
@@ -411,11 +396,6 @@
<copy file="build.xml" tofile="${dist.dir}/build.xml"/>
</target>
- <target name="dist" depends="dist-lite">
- <zip zipfile="${name}-${version}-${DSTAMP}.zip" basedir="${dist.dir}"
includes="**"/>
- <tar tarfile="${name}-${version}-${DSTAMP}.tar" basedir="${dist.dir}"
includes="**"/>
- <gzip zipfile="${name}-${version}-${DSTAMP}.tar.gz"
src="${name}-${version}-${DSTAMP}.tar"/>
- </target>
<!-- =================================================================== -->
<!-- Cleans everything -->
@@ -431,7 +411,10 @@
<!-- Cleans absolutely everything up -->
<target name="real-clean" depends="clean">
<delete dir="${docs.dir}" />
- <delete dir="${dist.base}" />
+ <delete dir="${src.dist.dir}" />
+ <delete file="${name}-${version}-${DSTAMP}-src.zip"/>
+ <delete file="${name}-${version}-${DSTAMP}-src.tar"/>
+ <delete file="${name}-${version}-${DSTAMP}-src.tar.gz"/>
</target>
@@ -519,6 +502,9 @@
</copy>
</target>
+
+ <target name="docs" depends="javadocs,xdocs"/>
+
<!--
===================================================================
Create the Local site documentation
@@ -587,4 +573,104 @@
</target>
+ <!--
+ ===================================================================
+ Create the binary distribution
+ ===================================================================
+ -->
+
+ <target name="dist" depends="dist-lite, docs">
+
+ <mkdir dir="${dist.docs}"/>
+ <mkdir dir="${dist.javadocs}"/>
+
+ <copy todir="${dist.docs}">
+ <fileset dir="${build.docs}"/>
+ </copy>
+
+ <copy todir="${dist.javadocs}">
+ <fileset dir="${build.javadocs}"/>
+ </copy>
+
+ <zip zipfile="${name}-${version}-${DSTAMP}.zip" basedir="${dist.dir}"
includes="**"/>
+ <tar tarfile="${name}-${version}-${DSTAMP}.tar" basedir="${dist.dir}"
includes="**"/>
+ <gzip zipfile="${name}-${version}-${DSTAMP}.tar.gz"
src="${name}-${version}-${DSTAMP}.tar"/>
+ </target>
+
+
+ <!--
+ ===================================================================
+ Create the source distribution
+ ===================================================================
+ -->
+ <target name="src-dist" depends="javadocs,xdocs,setup-properties">
+
+ <mkdir dir="${src.dist.dir}" />
+ <mkdir dir="${src.dist.docs}"/>
+ <mkdir dir="${src.dist.javadocs}"/>
+
+ <copy todir="${src.dist.tools}">
+ <fileset dir="${tools.dir}"/>
+ </copy>
+
+ <copy todir="${src.dist.lib}">
+ <fileset dir="${lib.dir}"/>
+ </copy>
+
+ <copy todir="${src.dist.src}">
+ <fileset dir="${src.dir}"/>
+ </copy>
+
+ <copy todir="${src.dist.proposals}">
+ <fileset dir="${proposal.base}"/>
+ </copy>
+
+ <copy todir="${src.dist.docs}">
+ <fileset dir="${build.docs}"/>
+ </copy>
+
+ <copy todir="${src.dist.javadocs}">
+ <fileset dir="${build.javadocs}"/>
+ </copy>
+
+ <copy todir="${src.dist.dir}">
+ <fileset dir=".">
+ <include name="build.bat"/>
+ <include name="build.sh"/>
+ <include name="build.xml"/>
+ <include name="README"/>
+ <include name="LICENSE.txt"/>
+ </fileset>
+ </copy>
+
+ <fixcrlf srcdir="${src.dist.dir}" includes="build.sh" cr="remove"/>
+ <fixcrlf srcdir="${src.dist.dir}" includes="build.bat" cr="add"/>
+
+ <chmod perm="+x">
+ <fileset dir="${src.dist.dir}">
+ <include name="build.sh" />
+ </fileset>
+ </chmod>
+
+ <fixcrlf srcdir="${src.dist.src}/java" includes="**/*.java" cr="remove"/>
+
+ <chmod dir="${src.dist.dir}" perm="go-rwx" />
+
+ <zip zipfile="${name}-${version}-${DSTAMP}-src.zip" basedir="${src.dist.dir}"
includes="**"/>
+ <tar tarfile="${name}-${version}-${DSTAMP}-src.tar" basedir="${src.dist.dir}"
includes="**"/>
+ <gzip zipfile="${name}-${version}-${DSTAMP}-src.tar.gz"
src="${name}-${version}-${DSTAMP}.tar"/>
+
+ </target>
+
+
+ <!--
+ ===================================================================
+ Completely build all dists
+ ===================================================================
+ -->
+ <target name="distributions" depends="dist, src-dist">
+
+ </target>
+
</project>
+
1.2 +13 -3 jakarta-james/src/java/org/apache/james/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/Constants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Constants.java 2001/05/11 10:36:17 1.1
+++ Constants.java 2001/05/21 09:48:57 1.2
@@ -8,14 +8,21 @@
package org.apache.james;
/**
+ * Assorted Constants for use in all James blocks
+ * The Software Version, Software Name and Build Date are set by ant during
+ * the build process.
+ *
* @version 1.0.0, 24/04/1999
- * @author Federico Barbieri <[EMAIL PROTECTED]>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Federico Barbieri</a>
+ *
+ * This is $Revision: 1.2 $
+ * Committed on $Date: 2001/05/21 09:48:57 $ by: $Author: charlesb $
*/
public class Constants {
- public static final String SOFTWARE_VERSION = "@@version@@";
+ public static final String SOFTWARE_VERSION = "@@VERSION@@";
- public static final String SOFTWARE_NAME = "JAMES Mail Server";
+ public static final String SOFTWARE_NAME = "@@NAME@@";
public static final String SERVER_NAMES = "SERVER_NAMES";
@@ -28,4 +35,7 @@
public static final int HEADERLIMIT = 2048;
public static final String AVALON_COMPONENT_MANAGER = "AVALON_COMP_MGR";
+
+ public static final String BUILD_DATE = "@@DATE@@";
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
