svn commit: r418141 - in /spamassassin/trunk: Makefile.PL build/mkupdates/run_part2

[jm...@apache.org]

Author: jm
Date: Thu Jun 29 14:23:27 2006
New Revision: 418141

URL: http://svn.apache.org/viewvc?rev=418141&view=rev
Log:
allow plugin .pm files in sa-update tarballs

Modified:
    spamassassin/trunk/Makefile.PL
    spamassassin/trunk/build/mkupdates/run_part2

Modified: spamassassin/trunk/Makefile.PL
URL: http://svn.apache.org/viewvc/spamassassin/trunk/Makefile.PL?rev=418141&r1=418140&r2=418141&view=diff
==============================================================================
--- spamassassin/trunk/Makefile.PL (original)
+++ spamassassin/trunk/Makefile.PL Thu Jun 29 14:23:27 2006
@@ -145,9 +145,13 @@
 }
 
 
-# Gather the rules files in the range 00-69; we do this in perl because it's more portable
-my @datafiles = map { s,^rules/,,; $_ } (<rules/*.cf>);
-my $datafiles = join(' ', (grep { /^(?:[0-6][0-9]|72)_/ } @datafiles), qw(user_prefs.template languages sa-update-pubkey.txt));
+# Gather the rules files in the range 00-69; we do this in perl because
+# it's more portable.  Also, plugin .pm files.
+my @datafiles = map { s,^rules/,,; $_ }
+                grep { -f $_ } (<rules/*.cf>, <rules/*.pm>);
+my $datafiles = join(' ', (grep 
+                { /^(?:(?:[0-6][0-9]|72)_\S+\.cf|\S+\.pm)/ } @datafiles),
+                qw(user_prefs.template languages sa-update-pubkey.txt));
 
 
 # See lib/ExtUtils/MakeMaker.pm for details of how to influence

Modified: spamassassin/trunk/build/mkupdates/run_part2
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/mkupdates/run_part2?rev=418141&r1=418140&r2=418141&view=diff
==============================================================================
--- spamassassin/trunk/build/mkupdates/run_part2 (original)
+++ spamassassin/trunk/build/mkupdates/run_part2 Thu Jun 29 14:23:27 2006
@@ -54,7 +54,7 @@
 # to be honest, right now this is unused.
 version="$1"
 
-tmpdir=/home/updatesd/tmp/stage
+tmpdir=/home/updatesd/tmp/stage/$version
 rm -rf $tmpdir; mkdir -p $tmpdir         || exit $?
 
 
@@ -73,7 +73,7 @@
 
 # remove new features, unsupported in existing code in the field
 # (TODO: need a better way to exclude files that require new features
-# like this)
+# like this; judicious use of "ifplugin" may help)
 rm rules/60_shortcircuit.cf
 
 # and ensure the ruleset lints!
@@ -85,7 +85,7 @@
 
 (
   cd $rulesdir 
-  tar cf - *.cf                          || exit $?
+  tar cvf - *.cf *.pm                    || exit $?
 
 ) | gzip -9 > $tmpdir/update.tgz         || exit $?