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 2007/03/10 23:18:52 UTC
svn commit: r516797 - in /james/server/trunk: ./ build-tools/ build.xml
default.properties phoenix-deployment/build.xml
Author: rdonkin
Date: Sat Mar 10 14:18:51 2007
New Revision: 516797
URL: http://svn.apache.org/viewvc?view=rev&rev=516797
Log:
Update master distribution directory with result of phoenix distribution build.
Modified:
james/server/trunk/ (props changed)
james/server/trunk/build-tools/ (props changed)
james/server/trunk/build.xml
james/server/trunk/default.properties
james/server/trunk/phoenix-deployment/build.xml
Propchange: james/server/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Mar 10 14:18:51 2007
@@ -1 +1,2 @@
.*
+dist
Propchange: james/server/trunk/build-tools/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Mar 10 14:18:51 2007
@@ -0,0 +1 @@
+.*
Modified: james/server/trunk/build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/build.xml?view=diff&rev=516797&r1=516796&r2=516797
==============================================================================
--- james/server/trunk/build.xml (original)
+++ james/server/trunk/build.xml Sat Mar 10 14:18:51 2007
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-<!-- JAMES server master build file -->
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -21,6 +20,10 @@
<project default="lite" basedir=".">
+<description>
+Master build file for JAMES server.
+</description>
+
<!--
=========================================================================
MACRO DEFINITIONS
@@ -94,26 +97,39 @@
<!--
=========================================================================
+ INTERNAL
+ =========================================================================
+-->
+
+ <target name='clean-dist' description='Cleans master distribution directory'>
+ <delete dir='dist'/>
+ <mkdir dir='dist'/>
+ </target>
+
+<!--
+ =========================================================================
USER TARGETS
=========================================================================
-->
<target
name='clean'
- description='Cleans all modules'>
+ description='Cleans all modules'
+ depends='clean-dist'>
<echo>Cleaning all modules</echo>
<foralldo do='clean'/>
</target>
<target
- name='lite'
- description='Builds modules and performs lightweight deployment'>
+ name='lite'
+ description='Builds modules and performs lightweight deployment'>
<echo>Building modules and performing lightweight deployments</echo>
<fordeploymentsdo do='dist-lite'/>
</target>
<target
- name='dist'
- description='Builds modules, performs standard deployment and creates standard distributions'>
+ name='dist'
+ description='Builds modules, performs standard deployment and creates standard distributions'
+ depends='clean-dist'>
<echo>Building modules, performing standard deployments and creating standard distributions</echo>
<foralldo do='dist'/>
</target>
@@ -121,7 +137,7 @@
<target
name='full'
description='Complete clean build, deployment and creates full distributions'
- depends='clean'>
+ depends='clean, clean-dist'>
<echo>Building, deploying and creating full distributions for everything</echo>
<forapido do='dist'/>
<forlibrariesdo do='dist'/>
Modified: james/server/trunk/default.properties
URL: http://svn.apache.org/viewvc/james/server/trunk/default.properties?view=diff&rev=516797&r1=516796&r2=516797
==============================================================================
--- james/server/trunk/default.properties (original)
+++ james/server/trunk/default.properties Sat Mar 10 14:18:51 2007
@@ -116,6 +116,7 @@
dir.build.test=${dir.build}/test-classes
dir.build.test-reports=${dir.build}/test-reports
dir.stage.james=../stage/org.apache.james/jars
+dir.master.dist=../dist/${name}-${version}/downloads
vendor.spec=The Apache Software Foundation
vendor.impl=The Apache Software Foundation
Modified: james/server/trunk/phoenix-deployment/build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/build.xml?view=diff&rev=516797&r1=516796&r2=516797
==============================================================================
--- james/server/trunk/phoenix-deployment/build.xml (original)
+++ james/server/trunk/phoenix-deployment/build.xml Sat Mar 10 14:18:51 2007
@@ -594,6 +594,10 @@
includes="org/apache/mailet/**"/ -->
<!-- copy file="${build.lib}/mailet.jar" todir="${dist.dir}/lib"/ -->
</target>
+
+ <target name='prepare-master-dist'>
+ <mkdir dir='${dir.master.dist}'/>
+ </target>
<!--
===================================================================
@@ -601,13 +605,16 @@
===================================================================
-->
- <target name="dist-bin-phoenix-warn" depends="dist-bin-common" unless="phoenix.bin.present">
+ <target name="dist-bin-phoenix-warn" depends="dist-bin-common, prepare-master-dist" unless="phoenix.bin.present">
<echo message ="The Phoenix distribution is not present - the James w/Phoenix binary distribution will not be built."/>
</target>
<target name="dist-bin-phoenix" depends="dist-bin-common" if="phoenix.bin.present">
<echo message ="Building binary w/Phoenix distributions"/>
- <zip zipfile="${dist.binary.dir}/${name}-binary-${version}.zip">
+ <property
+ name='dist.binary.file.zip'
+ value='${dist.binary.dir}/${name}-binary-${version}.zip'/>
+ <zip zipfile="${dist.binary.file.zip}">
<fileset dir="dist">
<include name="${name}-${version}/**"/>
<exclude name="${name}-${version}/downloads/**"/>
@@ -617,6 +624,10 @@
<include name="UPGRADE.txt"/>
</fileset>
</zip>
+ <copy todir='${dir.master.dist}' file='${dist.binary.file.zip}'/>
+ <property
+ name='dist.binary.file.tgz'
+ value='${dist.binary.dir}/${name}-binary-${version}.tar.gz'/>
<tar longfile="gnu" tarfile="${dist.binary.dir}/${name}-binary-${version}.tar">
<tarfileset dir="dist" username="${name}" group="${name}">
<include name="${name}-${version}/**"/>
@@ -627,8 +638,10 @@
<include name="UPGRADE.txt"/>
</tarfileset>
</tar>
- <gzip zipfile="${dist.binary.dir}/${name}-binary-${version}.tar.gz" src="${dist.binary.dir}/${name}-binary-${version}.tar"/>
+ <gzip zipfile="${dist.binary.file.tgz}"
+ src="${dist.binary.dir}/${name}-binary-${version}.tar"/>
<delete file="${dist.binary.dir}/${name}-binary-${version}.tar"/>
+ <copy todir='${dir.master.dist}' file='${dist.binary.file.tgz}'/>
</target>
<!-- target name="dist-bin-common" depends="dist-lite,xdocs,javadocs" -->
@@ -651,10 +664,13 @@
<echo message ="The Phoenix distribution is not present - the James source distribution with Phoenix binaries will not be built."/>
</target>
- <target name="dist-src-phoenix" depends="dist-src-common" if="phoenix.bin.present">
+ <target name="dist-src-phoenix" depends="dist-src-common, prepare-master-dist" if="phoenix.bin.present">
<!--Source With Phoenix -->
<echo message ="Building source distributions with Phoenix binaries"/>
- <zip zipfile="${dist.source.dir}/${name}-with-phoenix-${version}-src.zip">
+ <property
+ name='dist.src.file.zip'
+ value='${dist.source.dir}/${name}-with-phoenix-${version}-src.zip'/>
+ <zip zipfile="${dist.src.file.zip}">
<fileset dir=".">
<include name="*.txt"/>
<include name="build.*"/>
@@ -666,6 +682,10 @@
<include name="*.ent" />
</fileset>
</zip>
+ <copy todir='${dir.master.dist}' file='${dist.src.file.zip}'/>
+ <property
+ name='dist.src.file.tgz'
+ value='${dist.source.dir}/${name}-with-phoenix-${version}-src.tar.gz'/>
<tar longfile="gnu" tarfile="${dist.source.dir}/${name}-with-phoenix-${version}-src.tar">
<tarfileset dir="." username="${name}" group="${name}">
<include name="*.txt"/>
@@ -678,8 +698,9 @@
<include name="*.ent" />
</tarfileset>
</tar>
- <gzip zipfile="${dist.source.dir}/${name}-with-phoenix-${version}-src.tar.gz"
+ <gzip zipfile="${dist.src.file.tgz}"
src="${dist.source.dir}/${name}-with-phoenix-${version}-src.tar"/>
+ <copy todir='${dir.master.dist}' file='${dist.src.file.tgz}'/>
<delete file="${dist.source.dir}/${name}-with-phoenix-${version}-src.tar"/>
</target>
@@ -721,7 +742,7 @@
Mailet SDK distribution
===================================================================
-->
- <target name="dist-mailet-SDK" depends="dist-lite,xdocs,javadocs">
+ <target name="dist-mailet-SDK" depends="dist-lite,xdocs,javadocs, prepare-master-dist">
<echo message ="building mailet SDK distributions"/>
@@ -790,21 +811,30 @@
<include name='${javax-mail.jar}'/>
</fileset>
</copy>
- <zip zipfile="${dist.downloads.bin}/${sdk.stem}.zip">
+ <property
+ name='dist.mailetsdk.file.zip'
+ value='${dist.downloads.bin}/${sdk.stem}.zip'/>
+ <zip zipfile="${dist.mailetsdk.file.zip}">
<fileset dir="dist">
<include name="${name}-${version}/**"/>
<exclude name="${name}-${version}/downloads/**"/>
</fileset>
</zip>
+ <copy todir='${dir.master.dist}' file='${dist.mailetsdk.file.zip}'/>
+ <property
+ name='dist.mailetsdk.file.tgz'
+ value='${dist.downloads.bin}/${sdk.stem}.tar.gz'/>
<tar longfile="gnu" tarfile="${dist.downloads.bin}/${sdk.stem}.tar">
<tarfileset dir="dist" username="${name}" group="${name}">
<include name="${name}-${version}/**"/>
<exclude name="${name}-${version}/downloads/**"/>
</tarfileset>
</tar>
- <gzip zipfile="${dist.downloads.bin}/${sdk.stem}.tar.gz"
+ <gzip zipfile="${dist.mailetsdk.file.tgz}"
src="${dist.downloads.bin}/${sdk.stem}.tar"/>
<delete file="${dist.downloads.bin}/{sdk.stem}.tar"/>
+ <copy todir='${dir.master.dist}' file='${dist.mailetsdk.file.tgz}'/>
+
<delete dir="${sdk.dir}"/>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org