svn commit: r357565 - in /spamassassin/trunk/build/mkupdates: run_nightly run_part2

[jm...@apache.org]

Author: jm
Date: Sun Dec 18 15:49:50 2005
New Revision: 357565

URL: http://svn.apache.org/viewcvs?rev=357565&view=rev
Log:
use sudo smartly; also, add the second half of the updates-building backend

Modified:
    spamassassin/trunk/build/mkupdates/run_nightly
    spamassassin/trunk/build/mkupdates/run_part2

Modified: spamassassin/trunk/build/mkupdates/run_nightly
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/build/mkupdates/run_nightly?rev=357565&r1=357564&r2=357565&view=diff
==============================================================================
--- spamassassin/trunk/build/mkupdates/run_nightly (original)
+++ spamassassin/trunk/build/mkupdates/run_nightly Sun Dec 18 15:49:50 2005
@@ -17,17 +17,17 @@
 (
 echo "
 
-To perform this, someone log into the zone and type:
+To enact this, someone log into the zone and type:
 
         ssh spamassassin.zones.apache.org
         cd /home/updatesd/svn/spamassassin
-        sudo su updatesd -c \"svn commit -m 'daily promoted rules list' rules/active.list\"
+        sudo -u updatesd svn commit -m 'daily promotions' rules/active.list
 
 "
 svn diff
 
 ) | mailx \
-        -s "Planned commit for active.list" \
+        -s "[admin] planned commit for active.list" \
         dev@Spamassassin.apache.org
 
 

Modified: spamassassin/trunk/build/mkupdates/run_part2
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/build/mkupdates/run_part2?rev=357565&r1=357564&r2=357565&view=diff
==============================================================================
--- spamassassin/trunk/build/mkupdates/run_part2 (original)
+++ spamassassin/trunk/build/mkupdates/run_part2 Sun Dec 18 15:49:50 2005
@@ -16,16 +16,33 @@
 
 stagedir=/var/www/buildbot.spamassassin.org/updatestage
 
+versions="3.2.0"
+
 # ---------------------------------------------------------------------------
 
 [ -d $stagedir ] || echo "no stagedir" 1>&2
 [ -d $stagedir ] || exit 6
 
+for version in $versions ; do
+  make_tarball_for_version $version
+done
+
+ls -l $stagedir
+cycle_logfiles
+exit
+
+make_tarball_for_version () {
+
+# to be honest, right now this is unused.
+version="$1"
+
 tmpdir=/home/updatesd/tmp/stage
 rm -rf $tmpdir; mkdir -p $tmpdir         || exit $?
 
 # use "make install" logic, since we want rules as close as possible
 # to what's installed
+# TODO: this *would* be performed in a checkout of the desired
+# version's branch
 $PERL Makefile.PL PREFIX=$tmpdir         || exit $?
 make                                     || exit $?
 make install                             || exit $?
@@ -67,16 +84,20 @@
   exit 5
 fi
 
+# TODO: if we were maintaining multiple versions, these would be
+# copied into a path specific to the version
+
 mv $tmpdir/update.tgz      $stagedir/$svnrev.tar.gz            || exit $?
 mv $tmpdir/update.tgz.sha1 $stagedir/$svnrev.tar.gz.sha1       || exit $?
 # mv $tmpdir/update.tgz.asc  $stagedir/$svnrev.tar.gz.asc        || exit $?
 
 chmod 644 $stagedir/$svnrev.*
 
-ls -l $stagedir
+}
 
 # ---------------------------------------------------------------------------
 
+cycle_logfiles () {
 # cycle the logfiles; keep 6 (3 days worth I think)
 (
   cd /var/www/buildbot.spamassassin.org/bbmass
@@ -88,4 +109,5 @@
   mv mkupdatespt2_1.txt  mkupdatespt2_2.txt
   mv mkupdatespt2.txt    mkupdatespt2_1.txt
 )
+}