You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fe...@apache.org on 2006/11/23 06:06:25 UTC
svn commit: r478466 - in /spamassassin/trunk/masses: Makefile find-extremes
generate-translation hit-frequencies logs-to-c mass-check mk-roc-graphs
rewrite-cf-with-new-scores score-ranges-from-freqs
Author: felicity
Date: Wed Nov 22 21:06:21 2006
New Revision: 478466
URL: http://svn.apache.org/viewvc?view=rev&rev=478466
Log:
missed this for the parse-rules-for-masses masses->build move :(
Modified:
spamassassin/trunk/masses/Makefile
spamassassin/trunk/masses/find-extremes
spamassassin/trunk/masses/generate-translation
spamassassin/trunk/masses/hit-frequencies
spamassassin/trunk/masses/logs-to-c
spamassassin/trunk/masses/mass-check
spamassassin/trunk/masses/mk-roc-graphs
spamassassin/trunk/masses/rewrite-cf-with-new-scores
spamassassin/trunk/masses/score-ranges-from-freqs
Modified: spamassassin/trunk/masses/Makefile
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/Makefile?view=diff&rev=478466&r1=478465&r2=478466
==============================================================================
--- spamassassin/trunk/masses/Makefile (original)
+++ spamassassin/trunk/masses/Makefile Wed Nov 22 21:06:21 2006
@@ -18,8 +18,8 @@
perceptron.o: tmp/rules.pl tmp/tests.h tmp/scores.h
$(CC) $(CFLAGS) -c -o perceptron.o perceptron.c
-tmp/rules.pl: tmp/.created parse-rules-for-masses
- perl parse-rules-for-masses -d $(RULES) -s $(SCORESET)
+tmp/rules.pl: tmp/.created ../build/parse-rules-for-masses
+ perl ../build/parse-rules-for-masses -d $(RULES) -s $(SCORESET)
tmp/tests.h: tmp/.created tmp/ranges.data logs-to-c
perl logs-to-c --cffile=$(RULES) --scoreset=$(SCORESET)
Modified: spamassassin/trunk/masses/find-extremes
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/find-extremes?view=diff&rev=478466&r1=478465&r2=478466
==============================================================================
--- spamassassin/trunk/masses/find-extremes (original)
+++ spamassassin/trunk/masses/find-extremes Wed Nov 22 21:06:21 2006
@@ -348,7 +348,7 @@
sub readscores {
- system ("./parse-rules-for-masses") and
+ system ("../build/parse-rules-for-masses") and
die "Couldn't do parse-rules-for-masses: $?; stopped";
require "./tmp/rules.pl";
}
Modified: spamassassin/trunk/masses/generate-translation
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/generate-translation?view=diff&rev=478466&r1=478465&r2=478466
==============================================================================
--- spamassassin/trunk/masses/generate-translation (original)
+++ spamassassin/trunk/masses/generate-translation Wed Nov 22 21:06:21 2006
@@ -82,7 +82,7 @@
sub read_rules {
my ($cffile) = @_;
- system("$FindBin::Bin/parse-rules-for-masses -d \"$cffile\"")
+ system("$FindBin::Bin/../build/parse-rules-for-masses -d \"$cffile\"")
and die "unable to parse rules\n";
require "$FindBin::Bin/tmp/rules.pl"
or die "unable to read tmp/rules.pl\n";
Modified: spamassassin/trunk/masses/hit-frequencies
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/hit-frequencies?view=diff&rev=478466&r1=478465&r2=478466
==============================================================================
--- spamassassin/trunk/masses/hit-frequencies (original)
+++ spamassassin/trunk/masses/hit-frequencies Wed Nov 22 21:06:21 2006
@@ -786,7 +786,7 @@
sub readscores {
my($cffile) = @_;
- if (system ("$FindBin::Bin/parse-rules-for-masses -d \"$cffile\" -s $opt_s")) {
+ if (system ("$FindBin::Bin/../build/parse-rules-for-masses -d \"$cffile\" -s $opt_s")) {
warn "parse-rules-for-masses failed!";
}
eval {
Modified: spamassassin/trunk/masses/logs-to-c
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/logs-to-c?view=diff&rev=478466&r1=478465&r2=478466
==============================================================================
--- spamassassin/trunk/masses/logs-to-c (original)
+++ spamassassin/trunk/masses/logs-to-c Wed Nov 22 21:06:21 2006
@@ -200,7 +200,7 @@
sub readscores {
print "Reading scores from \"$opt_cffile\"...\n";
- system ("./parse-rules-for-masses -d \"$opt_cffile\" -s $opt_scoreset") and die;
+ system ("../build/parse-rules-for-masses -d \"$opt_cffile\" -s $opt_scoreset") and die;
require "./tmp/rules.pl";
%allrules = %rules; # ensure it stays global
}
Modified: spamassassin/trunk/masses/mass-check
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/mass-check?view=diff&rev=478466&r1=478465&r2=478466
==============================================================================
--- spamassassin/trunk/masses/mass-check (original)
+++ spamassassin/trunk/masses/mass-check Wed Nov 22 21:06:21 2006
@@ -185,7 +185,7 @@
# some people specify paths relatively, whereas this needs an absolute path,
# so "do the right thing"(tm).
my $abs_opt_c = File::Spec->rel2abs($opt_c);
- system("cd $FindBin::Bin; perl parse-rules-for-masses -d $abs_opt_c");
+ system("cd $FindBin::Bin; perl ../build/parse-rules-for-masses -d $abs_opt_c");
}
require $rules_path;
Modified: spamassassin/trunk/masses/mk-roc-graphs
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/mk-roc-graphs?view=diff&rev=478466&r1=478465&r2=478466
==============================================================================
--- spamassassin/trunk/masses/mk-roc-graphs (original)
+++ spamassassin/trunk/masses/mk-roc-graphs Wed Nov 22 21:06:21 2006
@@ -122,7 +122,7 @@
sub readscores {
warn "Reading scores from \"$opt_cffile\"...\n";
- system ("./parse-rules-for-masses -d \"$opt_cffile\" -s $opt_scoreset") and die;
+ system ("../build/parse-rules-for-masses -d \"$opt_cffile\" -s $opt_scoreset") and die;
require "./tmp/rules.pl";
%allrules = %rules; # ensure it stays global
}
Modified: spamassassin/trunk/masses/rewrite-cf-with-new-scores
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/rewrite-cf-with-new-scores?view=diff&rev=478466&r1=478465&r2=478466
==============================================================================
--- spamassassin/trunk/masses/rewrite-cf-with-new-scores (original)
+++ spamassassin/trunk/masses/rewrite-cf-with-new-scores Wed Nov 22 21:06:21 2006
@@ -81,7 +81,7 @@
sub read_rules {
- system ("./parse-rules-for-masses -s $scoreset") and die;
+ system ("../build/parse-rules-for-masses -s $scoreset") and die;
if (-e "tmp/rules.pl") {
# note: the spaces need to stay in front of the require to work around
# a RPM 4.1 problem
Modified: spamassassin/trunk/masses/score-ranges-from-freqs
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/score-ranges-from-freqs?view=diff&rev=478466&r1=478465&r2=478466
==============================================================================
--- spamassassin/trunk/masses/score-ranges-from-freqs (original)
+++ spamassassin/trunk/masses/score-ranges-from-freqs Wed Nov 22 21:06:21 2006
@@ -67,7 +67,7 @@
my %is_nice = ();
if (!defined $argcffile) { $argcffile = "../rules"; }
-system ("./parse-rules-for-masses -d \"$argcffile\" -s $scoreset") and die;
+system ("../build/parse-rules-for-masses -d \"$argcffile\" -s $scoreset") and die;
if (-e "tmp/rules.pl") {
# Note, the spaces need to stay in front of the require to work around a RPM 4.1 problem
require "./tmp/rules.pl";