You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by km...@apache.org on 2018/09/06 13:02:56 UTC
svn commit: r1840219 - in /spamassassin/branches/3.4: Makefile.PL
build/README
Author: kmcgrail
Date: Thu Sep 6 13:02:56 2018
New Revision: 1840219
URL: http://svn.apache.org/viewvc?rev=1840219&view=rev
Log:
more cleanup of branding and build process
Modified:
spamassassin/branches/3.4/Makefile.PL
spamassassin/branches/3.4/build/README
Modified: spamassassin/branches/3.4/Makefile.PL
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/Makefile.PL?rev=1840219&r1=1840218&r2=1840219&view=diff
==============================================================================
--- spamassassin/branches/3.4/Makefile.PL (original)
+++ spamassassin/branches/3.4/Makefile.PL Thu Sep 6 13:02:56 2018
@@ -12,7 +12,7 @@ my $mm_version = eval $ExtUtils::MakeMak
# raising the version of makemaker to 6.46 per bug 6598 & 6131
if ($mm_version < 6.46) {
- die "SpamAssassin Makefile.PL requires at least ExtUtils::MakeMaker v6.46";
+ die "Apache SpamAssassin Makefile.PL requires at least ExtUtils::MakeMaker v6.46";
}
use constant RUNNING_ON_WINDOWS => ($^O =~ /^(mswin|dos|os2)/oi);
@@ -26,7 +26,7 @@ my @ATT_KEYS = (
# 'vendor' to choose one explicitly (the default is 'site'). They have the
# following meaning:
# * PERL: Only essential modules shipped with Perl should be installed
- # there. Don't put SpamAssassin there.
+ # there. Don't put Apache SpamAssassin there.
# * SITE: The default. Normal installations via CPAN or from the sources
# should use these dirs.
# * VENDOR: A special set of paths for packaged (RPM, deb, portage, ...)
Modified: spamassassin/branches/3.4/build/README
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/build/README?rev=1840219&r1=1840218&r2=1840219&view=diff
==============================================================================
--- spamassassin/branches/3.4/build/README (original)
+++ spamassassin/branches/3.4/build/README Thu Sep 6 13:02:56 2018
@@ -54,10 +54,9 @@ APACHE SPAMASSASSIN RELEASE PROCEDURE
The output should be blank or look like this:
- ? rulesrc
- ? rules/SIQ.pm
- ? rules/sandbox-hstern.pm
- ? rules/sandbox-felicity.pm
+ ? rules
+ ? rulesrc
+ ? t.rules
(ie., no "M" or "C" files; any files marked "M" have been locally
modified, and should be "svn revert"ed before you continue.)
@@ -110,7 +109,7 @@ APACHE SPAMASSASSIN RELEASE PROCEDURE
$IS_DEVEL_BUILD is 0 even with rc and pre versions because rc and pre
numbers are never reused. Just increment higher each time.
- Full releases: no @EXTRA_VERSION is needed and IS_DEVEL_BUILD is 0.
+ Full releases: @EXTRA_VERSION is blank and IS_DEVEL_BUILD is 0.
- Ensure the new version number takes hold:
@@ -129,6 +128,10 @@ APACHE SPAMASSASSIN RELEASE PROCEDURE
- create the Changes file.
+ NOTE: If you do not use a fresh checkout, you may miss recent entries if
+ you also did development on the same checkout. Use a fresh checkout
+ when making your builds to avoid this issue.
+
MAKE CERTAIN THIS IS RUN IN THE ROOT OF YOUR CHECKOUT!
There are two options here: