You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by ms...@apache.org on 2004/10/02 16:57:35 UTC

svn commit: rev 51801 - spamassassin/trunk

Author: mss
Date: Sat Oct  2 07:57:34 2004
New Revision: 51801

Modified:
   spamassassin/trunk/MANIFEST
   spamassassin/trunk/MANIFEST.SKIP
   spamassassin/trunk/Makefile.PL
Log:
Finally figured out the whole MANIFEST* issue:

 - If you added, removed or moved a file, run 'make manifest'.  That will
   update the MANIFEST (and sort it alphabetically, case-insensitive)
   
 - MANIFEST.SKIP consists of a list of REs which are matched against each
   filename.  If a RE matches, the file is not included in the MANIFEST
   (and thus the distfile).
   
 - The REs in MANIFEST.SKIP are matched against substrings so watch out
   that you don't accidently exclude some files you didn't intend to.  To
   do this, please follow these guidelines:

   * If you want to match against a specific file, enclose the name in start
     and end markers ie. "^foo$".
   * If you want to match a specific file with each and every extension,
     please use an explicit RE a la "^foo.*$" (instead of just "^foo").
     Watch out if you want to exclude compiled binaries that you don't
     exclude the sources, too!
   * If you want to exclude a whole directory, please end the RE with a
     slash, ie "^foo/"
   * If you want to exclude some specific file in any directory, please
     start the RE with a word boundary and end with an end marker,
     ie "\bfoo$".
   * If you want to exclude some extension, please start the RE with an
     escaped dot, ie "\.foo$".

 - After you added anything to MANIFEST.SKIP, please run 'make manifest_skip'
   to keep that file sorted, too.

I tried my best to clean up both MANIFESTs and 'make disttest' ran
successfully.  If I accidently excluded some file, please fix the pattern
in MANIFEST.SKIP, do NOT edit the MANIFEST directly.
 


Modified: spamassassin/trunk/MANIFEST
==============================================================================
--- spamassassin/trunk/MANIFEST	(original)
+++ spamassassin/trunk/MANIFEST	Sat Oct  2 07:57:34 2004
@@ -1,35 +1,24 @@
 BUGS
-CREDITS
-Changes
-INSTALL
-INSTALL.VMS
-LICENSE
-MANIFEST
-MANIFEST.SKIP
-Makefile.PL
-NOTICE
-PACKAGING
-README
-STATUS
-TRADEMARK
-UPGRADE
-USAGE
-build/README
 build/cf_to_html
 build/convert_pods_to_doc
 build/find_meta_missing_dependencies
 build/get_version
 build/md5sum.pl
 build/preprocessor
+build/README
 build/sha1sum.pl
 build/tag_nightly_mc
 build/tag_weekly_mc
 build/update_devel
 build/update_stable
 build/update_website_docs
+Changes
 contrib/mbox-to-check
 contrib/run-corpora
 contrib/run-masses
+CREDITS
+INSTALL
+INSTALL.VMS
 ldap/README
 ldap/README.testing
 ldap/sa_test.ldif
@@ -77,23 +66,25 @@
 lib/Mail/SpamAssassin/TextCat.pm
 lib/Mail/SpamAssassin/Util.pm
 lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm
-masses/CORPUS_POLICY
-masses/CORPUS_SUBMIT
-masses/CORPUS_SUBMIT_NIGHTLY
-masses/Makefile
-masses/README
-masses/README.perceptron
+LICENSE
+Makefile.PL
+MANIFEST
+MANIFEST.SKIP
 masses/compare-models
+masses/config
 masses/config.set0
 masses/config.set1
 masses/config.set2
 masses/config.set3
-masses/corpora/README
 masses/corpora/fuzzy-hash-maildir
 masses/corpora/mass-find-nonspam
+masses/corpora/README
 masses/corpora/remove-tests-from-logs
 masses/corpora/uniq-mailbox
 masses/corpora/uniq-maildirs
+masses/CORPUS_POLICY
+masses/CORPUS_SUBMIT
+masses/CORPUS_SUBMIT_NIGHTLY
 masses/cpucount
 masses/extract-message-from-mbox
 masses/extract-results
@@ -117,26 +108,30 @@
 masses/parse-rules-for-masses
 masses/perceptron.c
 masses/post-ga-analysis.pl
+masses/README
+masses/README.perceptron
 masses/rewrite-cf-with-new-scores
 masses/rule-dev/maildir-scan-headers
-masses/rule-qa/README.nightly
 masses/rule-qa/corpus-hourly
 masses/rule-qa/corpus-nightly
 masses/rule-qa/corpus-tagtime
 masses/rule-qa/corpus.example
 masses/rule-qa/markup-rules-file-with-freqs
 masses/rule-qa/post-bugs-for-retired-tests
+masses/rule-qa/README.nightly
 masses/runGA
 masses/score-ranges-from-freqs
 masses/tenpass/10pass-compute-tcr
 masses/tenpass/10pass-run
-masses/tenpass/README
 masses/tenpass/compute-current-tcr
+masses/tenpass/README
 masses/tenpass/split-log-into-buckets
 masses/tenpass/split-log-into-buckets-random
-masses/uniq-scores
 masses/validate-model
+NOTICE
+PACKAGING
 procmailrc.example
+README
 rules/10_misc.cf
 rules/20_anti_ratware.cf
 rules/20_body_tests.cf
@@ -164,15 +159,14 @@
 rules/30_text_pl.cf
 rules/50_scores.cf
 rules/60_whitelist.cf
-rules/STATISTICS-set1.txt
-rules/STATISTICS-set2.txt
-rules/STATISTICS-set3.txt
-rules/STATISTICS.txt
 rules/init.pre
 rules/languages
 rules/local.cf
 rules/name-triplets.txt
-rules/regression_tests.cf
+rules/STATISTICS-set1.txt
+rules/STATISTICS-set2.txt
+rules/STATISTICS-set3.txt
+rules/STATISTICS.txt
 rules/triplets.txt
 rules/user_prefs.template
 sa-learn.raw
@@ -180,10 +174,6 @@
 sample-spam.txt
 spamassassin.raw
 spamassassin.spec
-spamc/Makefile.in
-spamc/Makefile.win
-spamc/README.qmail
-spamc/README.win
 spamc/acconfig.h
 spamc/config.h.in
 spamc/config.h.win
@@ -192,38 +182,40 @@
 spamc/configure.pl
 spamc/libspamc.c
 spamc/libspamc.h
+spamc/Makefile.in
+spamc/Makefile.win
 spamc/qmail-spamc.c
-spamc/replace/README.getopt
+spamc/README.qmail
+spamc/README.win
 spamc/replace/getopt.c
 spamc/replace/getopt.h
+spamc/replace/README.getopt
 spamc/spamc.c
 spamc/spamc.pod
 spamc/utils.c
 spamc/utils.h
 spamc/version.h.in
 spamc/version.h.pl
+spamd/netbsd-rc-script.sh
 spamd/PROTOCOL
 spamd/README
 spamd/README.SuSE
 spamd/README.vpopmail
-spamd/netbsd-rc-script.sh
 spamd/redhat-rc-script.sh
 spamd/slackware-rc-script.sh
 spamd/solaris-rc-script.sh
 spamd/spamd.raw
 spamd/suse-ancient-rc-script.sh
-sql/README
-sql/README.awl
-sql/README.bayes
 sql/awl_mysql.sql
 sql/awl_pg.sql
 sql/bayes_mysql.sql
 sql/bayes_pg.sql
+sql/README
+sql/README.awl
+sql/README.bayes
 sql/userpref_mysql.sql
 sql/userpref_pg.sql
-t/README
-t/SATest.pl
-t/SATest.pm
+STATUS
 t/basic_lint.t
 t/bayesdbm.t
 t/bayesdbm_flock.t
@@ -283,27 +275,6 @@
 t/data/spam/dnsbl.eml
 t/data/spam/gtube.eml
 t/data/testplugin.pm
-t/data/whitelists/action.eff.org
-t/data/whitelists/amazon_co_uk_ship
-t/data/whitelists/amazon_com_ship
-t/data/whitelists/cert.org
-t/data/whitelists/debian_bts_reassign
-t/data/whitelists/linuxplanet
-t/data/whitelists/lp.org
-t/data/whitelists/media_unspun
-t/data/whitelists/mlist_mailman_message
-t/data/whitelists/mlist_yahoo_groups_message
-t/data/whitelists/mypoints
-t/data/whitelists/neat_net_tricks
-t/data/whitelists/netcenter-direct_de
-t/data/whitelists/oracle_net_techblast
-t/data/whitelists/orbitz.com
-t/data/whitelists/paypal.com
-t/data/whitelists/register.com_password
-t/data/whitelists/ryanairmail.com
-t/data/whitelists/sf.net
-t/data/whitelists/winxpnews.com
-t/data/whitelists/yahoo-inc.com
 t/db_awl_path.t
 t/db_based_whitelist.t
 t/db_based_whitelist_ips.t
@@ -322,21 +293,23 @@
 t/prefs_include.t
 t/razor2.t
 t/rcvd_parser.t
+t/README
 t/recips.t
 t/relative_scores.t
 t/report_safe.t
 t/reportheader.t
 t/reportheader_8bit.t
 t/rule_names.t
-t/rule_tests.t
 t/rule_types.t
+t/SATest.pl
+t/SATest.pm
 t/sha1.t
 t/spam.t
 t/spamc.t
 t/spamc_B.t
-t/spamc_E.t
 t/spamc_c.t
 t/spamc_c_stdout_closed.t
+t/spamc_E.t
 t/spamc_l.t
 t/spamd.t
 t/spamd_allow_user_rules.t
@@ -366,15 +339,18 @@
 t/whitelist_from.t
 t/whitelist_to.t
 t/zz_cleanup.t
-tools/README.speedtest
 tools/bayes_dump_to_trusted_networks
 tools/check_whitelist
 tools/convert_awl_dbm_to_sql
 tools/desc_length.pl
 tools/mboxsplit
+tools/README.speedtest
 tools/sa-stats.pl
 tools/speedtest
 tools/split_corpora
 tools/sysreport
 tools/test_extract
 tools/triplets.pl
+TRADEMARK
+UPGRADE
+USAGE

Modified: spamassassin/trunk/MANIFEST.SKIP
==============================================================================
--- spamassassin/trunk/MANIFEST.SKIP	(original)
+++ spamassassin/trunk/MANIFEST.SKIP	Sat Oct  2 07:57:34 2004
@@ -1,92 +1,84 @@
-.*.swp
-.*/\.#.*
-Changes
-Changes.bak
-Mail-SpamAssassin-.*
-Makefile
-Makefile.old
-^[Oo][Uu][Tt]$
-\.exists
-\.svn
-build/3\.\d\.\d_change_summary
-data/.*
-masses/config
-spamc/version.h
-blib
-build/replace_license_blocks
-core
-debian/.*
-doc/.*
-lm/.*
-made-doc-stamp
-.*.log
-masses/OLD
-masses/RUNME
-masses/analysis
-masses/badrules
-masses/bayes-testing/.*
-masses/commands.sh
-masses/cont_evolve.pid
-masses/copy-logs-to-deimos
-masses/download-trapped-spam
-masses/dprof.nonspam
-masses/dprof.spam
-masses/evolve
-masses/evolve.o
-masses/freqs
-masses/galib245
-masses/goodresults
-masses/jm-mass-check-rules/.*
-masses/local-scripts-.*
-masses/logs
-masses/mass-check-for-jm
-masses/nonspam.dogma
-masses/nonspam.local
-masses/nonspam.tst
-masses/nonspam\..*
-masses/old-random-search
-masses/overnight.*
-masses/perceptron
-masses/perceptron.o
-masses/pgapack
-masses/result..*
-masses/results..*
-masses/spam.dogma
-masses/spam.local
-masses/spam.tst
-masses/spam\..*
-masses/spamtrap
-masses/start_evolving.sh
-masses/stop_evolving.sh
-masses/tmon.nonspam
-masses/tmon.spam
-masses/tmp
-masses/uniq-scores
-old.cf$
-pm_to_blib
-pod2html?-?.*
-presentation
-results.evolved
-rules/70_.*.cf
-rules/regression_tests.cf
-sa-learn(\.exe)?
-sa_with_mail_audit
-spamassassin(\.exe)?
-spamc/.*\.(so|o|obj)
-spamc/Makefile
-spamc/config\.(h|status|log)
-spamc/spamc(\.exe)?
-spamc/sslspamc(\.exe)?
-spamd/spamd(\.exe)?
-stuff/.*
-t/bayessql.cf
-t/data/nice/cjk/.*
-t/data/whitelists/.*
-t/log/.*
-t/rule_tests.t
-t/sql_based_whitelist.cf
-tasks/.*
-testmails
-tmon.out
-todo$
-wordfreqs/.*
+\.bak$
+\.exe$
+\.exists$
+\.log$
+\.o$
+\.obj$
+\.old$
+\.pid$
+\.so$
+\.svn\b
+\.swp$
+\.tst$
+\bcore$
+\bMakefile$
+\bold.cf$
+\btmon.out$
+\b[Oo][Ll][Dd]$
+\b[Oo][Uu][Tt]$
+^blibdirs$
+^blib\b
+^build/3\.\d\.\d_change_summary$
+^build/replace_license_blocks$
+^debian/
+^doc/
+^lm/
+^made-doc-stamp$
+^Mail-SpamAssassin-.*$
+^masses/analysis$
+^masses/badrules$
+^masses/bayes-testing/
+^masses/commands.sh$
+^masses/copy-logs-to-deimos$
+^masses/download-trapped-spam$
+^masses/dprof.nonspam$
+^masses/dprof.spam$
+^masses/evolve$
+^masses/freqs$
+^masses/galib245$
+^masses/goodresults$
+^masses/local-scripts-.*$
+^masses/logs$
+^masses/nonspam.dogma$
+^masses/nonspam.local$
+^masses/nonspam\..*$
+^masses/old-random-search$
+^masses/overnight.*$
+^masses/perceptron$
+^masses/pgapack$
+^masses/results?\..*$
+^masses/RUNME$
+^masses/spam.dogma$
+^masses/spam.local$
+^masses/spamtrap$
+^masses/spam\..*$
+^masses/start_evolving.sh$
+^masses/stop_evolving.sh$
+^masses/tmon.nonspam$
+^masses/tmon.spam$
+^masses/uniq-scores$
+^pm_to_blib$
+^pod2html?-?.*$
+^presentation$
+^rules/70_.*.cf$
+^rules/regression_tests.cf$
+^sa-learn$
+^sa_with_mail_audit$
+^spamassassin$
+^spamc/config\.(h|status|log)$
+^spamc/spamc$
+^spamc/sslspamc$
+^spamc/version.h$
+^spamd/spamd$
+^stuff/
+^t/bayessql.cf$
+^t/data/nice/cjk/
+^t/data/whitelists/
+^t/log/
+^t/rule_tests.t$
+^t/sql_based_whitelist.cf$
+^tasks/
+^testmails.*$
+^todo$
+^wordfreqs/
+~$

Modified: spamassassin/trunk/Makefile.PL
==============================================================================
--- spamassassin/trunk/Makefile.PL	(original)
+++ spamassassin/trunk/Makefile.PL	Sat Oct  2 07:57:34 2004
@@ -1152,8 +1152,13 @@
 	$(PERL) -e 'print "CPAN_VERSION=$(VERSION)\n"' >> $@
 
 
+manifest_skip:
+	sort -f < MANIFEST.SKIP > MANIFEST.SKIP.tmp
+	mv MANIFEST.SKIP.tmp MANIFEST.SKIP
+
+
 sysreport:
-	$(NOECHO) $(PERL) build/sysreport CC=$(CC) PERL=$(PERL) PERL_BIN=$(PERL_BIN) PERL_VERSION=$(PERL_VERSION)
+	$(NOECHO) $(PERL) tools/sysreport CC=$(CC) PERL=$(PERL) PERL_BIN=$(PERL_BIN) PERL_VERSION=$(PERL_VERSION)
 
   EOD