Author: jmitchell
Date: Wed Sep 21 14:44:00 2005
New Revision: 290838
URL: http://svn.apache.org/viewcvs?rev=290838&view=rev
Log:
Fix nightly build to:
* allow a single target to build the nightlies
* change the binary distribution to be struts-bin.[zip|tar.gz|md5]
* clean the mailreader app properly
* add a new 'clean-lib' to remove what 'download-dependencies' creates
Modified:
struts/core/branches/STRUTS_1_2_BRANCH/build.xml
Modified: struts/core/branches/STRUTS_1_2_BRANCH/build.xml
URL:
http://svn.apache.org/viewcvs/struts/core/branches/STRUTS_1_2_BRANCH/build.xml?rev=290838&r1=290837&r2=290838&view=diff
==============================================================================
--- struts/core/branches/STRUTS_1_2_BRANCH/build.xml (original)
+++ struts/core/branches/STRUTS_1_2_BRANCH/build.xml Wed Sep 21 14:44:00 2005
@@ -548,7 +548,6 @@
</target>
-
<!--
Construct complete binary distribution
-->
@@ -557,14 +556,27 @@
description="Construct binary distribution"/>
<!--
+ Construct the nightly build
+-->
+ <target name="nightly">
+ <tstamp>
+ <format property="TODAY" pattern="yyyyMMdd" locale="en"/>
+ </tstamp>
+ <antcall target="release">
+ <param name="upload.file.base"
value="${project.name}-SNAPSHOT-${TODAY}"/>
+ </antcall>
+ </target>
+
+
+<!--
Construct complete release distributions
-->
<target name="release" depends="clean,dist"
description="Construct release distribution">
- <mkdir dir="${stage.bin.dir}/${upload.file.base}"/>
+ <mkdir dir="${stage.bin.dir}/${upload.file.base}-bin"/>
<mkdir dir="${stage.lib.dir}/${upload.file.base}-lib"/>
<mkdir dir="${stage.src.dir}/${upload.file.base}-src"/>
- <copy todir="${stage.bin.dir}/${upload.file.base}">
+ <copy todir="${stage.bin.dir}/${upload.file.base}-bin">
<fileset dir="${dist.home}"/>
</copy>
<copy todir="${stage.lib.dir}/${upload.file.base}-lib">
@@ -597,13 +609,13 @@
<delete dir="${stage.src.dir}/${upload.file.base}-src/contrib/el"/>
<mkdir dir="${upload.dir}"/>
- <zip zipfile="${upload.dir}/${upload.file.base}.zip"
+ <zip zipfile="${upload.dir}/${upload.file.base}-bin.zip"
basedir="${stage.bin.dir}"/>
<zip zipfile="${upload.dir}/${upload.file.base}-lib.zip"
basedir="${stage.lib.dir}"/>
<zip zipfile="${upload.dir}/${upload.file.base}-src.zip"
basedir="${stage.src.dir}"/>
- <tar tarfile="${upload.dir}/${upload.file.base}.tar"
+ <tar tarfile="${upload.dir}/${upload.file.base}-bin.tar"
basedir="${stage.bin.dir}"
longfile="gnu"/>
<tar tarfile="${upload.dir}/${upload.file.base}-lib.tar"
@@ -612,8 +624,8 @@
<tar tarfile="${upload.dir}/${upload.file.base}-src.tar"
basedir="${stage.src.dir}"
longfile="gnu"/>
- <gzip src="${upload.dir}/${upload.file.base}.tar"
- zipfile="${upload.dir}/${upload.file.base}.tar.gz"/>
+ <gzip src="${upload.dir}/${upload.file.base}-bin.tar"
+ zipfile="${upload.dir}/${upload.file.base}-bin.tar.gz"/>
<gzip src="${upload.dir}/${upload.file.base}-lib.tar"
zipfile="${upload.dir}/${upload.file.base}-lib.tar.gz"/>
<gzip src="${upload.dir}/${upload.file.base}-src.tar"
@@ -878,6 +890,16 @@
<delete dir="${build.home}"/>
<delete dir="${dist.home}"/>
<delete dir="${release.home}"/>
+ <ant dir="${basedir}/struts-examples/mailreader"
+ target="clean" inheritAll="false"/>
+ </target>
+
+<!--
+ Clean up build and distribution directories
+-->
+ <target name="clean-lib"
+ description="Clean the downloaded libs (you only run this if you also use
'download-dependencies' target)">
+ <delete dir="${libdir}"/>
</target>
<!--
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
