svn commit: r530764 - in /spamassassin/trunk: Makefile.PL build/mkrules

[jm...@apache.org]

Author: jm
Date: Fri Apr 20 05:25:18 2007
New Revision: 530764

URL: http://svn.apache.org/viewvc?view=rev&rev=530764
Log:
bug 5427: replace unportable [ -d rulesrc ] idiom in Makefile

Modified:
    spamassassin/trunk/Makefile.PL
    spamassassin/trunk/build/mkrules

Modified: spamassassin/trunk/Makefile.PL
URL: http://svn.apache.org/viewvc/spamassassin/trunk/Makefile.PL?view=diff&rev=530764&r1=530763&r2=530764
==============================================================================
--- spamassassin/trunk/Makefile.PL (original)
+++ spamassassin/trunk/Makefile.PL Fri Apr 20 05:25:18 2007
@@ -1140,7 +1140,7 @@
 	$(PREPROCESS) $(FIXBYTES) $(FIXVARS) $(FIXBANG) -m$(PERM_RWX) -i$? -o$@
 
 build_rules: 
-	[ ! -d rulesrc ] || $(PERL) build/mkrules --src rulesrc --out rules --manifest MANIFEST --manifestskip MANIFEST.SKIP
+	$(PERL) build/mkrules --exit_on_no_src --src rulesrc --out rules --manifest MANIFEST --manifestskip MANIFEST.SKIP
 
 SPAMC_MAKEFILE  = spamc/Makefile
 MAKE_SPAMC      = $(MAKE) -f $(SPAMC_MAKEFILE)

Modified: spamassassin/trunk/build/mkrules
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/mkrules?view=diff&rev=530764&r1=530763&r2=530764
==============================================================================
--- spamassassin/trunk/build/mkrules (original)
+++ spamassassin/trunk/build/mkrules Fri Apr 20 05:25:18 2007
@@ -23,7 +23,7 @@
 # http://wiki.apache.org/spamassassin/RulesProjPromotion 
 
 sub usage {
-  die "build/mkrules [--src srcdir] [--out outputdir]\n";
+  die "build/mkrules [--src srcdir] [--exit_on_no_src] [--out outputdir]\n";
 }
 
 my $RULE_KEYWORDS_RE = qr{
@@ -47,7 +47,7 @@
     @opt_srcs $opt_out $opt_sandboxout $opt_manifest
     $opt_manifestskip $opt_listpromotable $opt_active
     $opt_activeout $default_file_header
-    $opt_rulemetadata
+    $opt_rulemetadata $opt_exit_on_no_src
 );
 GetOptions("src=s" => \@opt_srcs,
     "out=s",
@@ -57,6 +57,7 @@
     "manifest=s",
     "manifestskip=s",
     "rulemetadata=s",
+    "exit_on_no_src",
   );
 
 if (!@opt_srcs) {
@@ -80,6 +81,18 @@
   $opt_active = "rules/active.list";
 }
 
+if ($opt_exit_on_no_src) {
+  my $foundone = 0;
+  foreach my $src (@opt_srcs) {
+    if (-d $src) { $foundone++; last; }
+  }
+
+  if (!$foundone) {
+    print "no source directory found: exiting\n";
+    exit 0;
+  }
+}
+# else
 die "no src" unless (@opt_srcs >= 1);
 
 my $promolist;