Author: jmitchell
Date: Thu Sep 22 08:15:10 2005
New Revision: 290959
URL: http://svn.apache.org/viewcvs?rev=290959&view=rev
Log:
Updates to the nightly shell script to better handle dated logs
Update 'clean-lib' target to depend on 'clean'
Modified:
struts/core/branches/STRUTS_1_2_BRANCH/build.xml
struts/core/branches/STRUTS_1_2_BRANCH/nightly.sh
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=290959&r1=290958&r2=290959&view=diff
==============================================================================
--- struts/core/branches/STRUTS_1_2_BRANCH/build.xml (original)
+++ struts/core/branches/STRUTS_1_2_BRANCH/build.xml Thu Sep 22 08:15:10 2005
@@ -895,9 +895,9 @@
</target>
<!--
- Clean up build and distribution directories
+ Clean up build and distribution directories, then remove the
downloaded dependencies directory
-->
- <target name="clean-lib"
+ <target name="clean-lib" depends="clean"
description="Clean the downloaded libs (you only run this if you also use
'download-dependencies' target)">
<delete dir="${libdir}"/>
</target>
Modified: struts/core/branches/STRUTS_1_2_BRANCH/nightly.sh
URL:
http://svn.apache.org/viewcvs/struts/core/branches/STRUTS_1_2_BRANCH/nightly.sh?rev=290959&r1=290958&r2=290959&view=diff
==============================================================================
--- struts/core/branches/STRUTS_1_2_BRANCH/nightly.sh (original)
+++ struts/core/branches/STRUTS_1_2_BRANCH/nightly.sh Thu Sep 22 08:15:10 2005
@@ -3,9 +3,16 @@
cd /home/jmitchell/svn/STRUTS_1_2_BRANCH
-ant clean > nightly.log; svn status >> nightly.log; ant download-dependencies
nightly >> nightly.log & tail -f nightly.log
+export TODAY=`date +%Y%m%d`
+export LOGFILE=/home/jmitchell/svn/STRUTS_1_2_BRANCH/nightly-$TODAY.log
+ant clean-lib > $LOGFILE
+svn status >> $LOGFILE
+ant download-dependencies nightly >> $LOGFILE
+
+scp /home/jmitchell/svn/STRUTS_1_2_BRANCH/release/upload/*bin*
cvs.apache.org:/www/cvs.apache.org/builds/jakarta-struts/maven/STRUTS_1_2_BRANCH/nightly/binary
>> $LOGFILE
+scp /home/jmitchell/svn/STRUTS_1_2_BRANCH/release/upload/*lib*
cvs.apache.org:/www/cvs.apache.org/builds/jakarta-struts/maven/STRUTS_1_2_BRANCH/nightly/lib
>> $LOGFILE
+scp /home/jmitchell/svn/STRUTS_1_2_BRANCH/release/upload/*src*
cvs.apache.org:/www/cvs.apache.org/builds/jakarta-struts/maven/STRUTS_1_2_BRANCH/nightly/src
>> $LOGFILE
+scp $LOGFILE
cvs.apache.org:/www/cvs.apache.org/builds/jakarta-struts/maven/STRUTS_1_2_BRANCH/nightly/logs
+
+
-scp /home/jmitchell/svn/STRUTS_1_2_BRANCH/release/upload/*bin*
cvs.apache.org:/www/cvs.apache.org/builds/jakarta-struts/maven/STRUTS_1_2_BRANCH/nightly/binary
>> nightly.log
-scp /home/jmitchell/svn/STRUTS_1_2_BRANCH/release/upload/*lib*
cvs.apache.org:/www/cvs.apache.org/builds/jakarta-struts/maven/STRUTS_1_2_BRANCH/nightly/lib
>> nightly.log
-scp /home/jmitchell/svn/STRUTS_1_2_BRANCH/release/upload/*src*
cvs.apache.org:/www/cvs.apache.org/builds/jakarta-struts/maven/STRUTS_1_2_BRANCH/nightly/src
>> nightly.log
-scp nightly.log
/www/cvs.apache.org/builds/jakarta-struts/maven/STRUTS_1_2_BRANCH/nightly/logs
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
