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 2004/01/17 23:30:08 UTC
svn commit: rev 6187 - in incubator/spamassassin/branches/b2_6_0: build lib/Mail
Author: felicity
Date: Sat Jan 17 14:30:07 2004
New Revision: 6187
Modified:
incubator/spamassassin/branches/b2_6_0/build/README
incubator/spamassassin/branches/b2_6_0/lib/Mail/SpamAssassin.pm
Log:
prep for 2.62 release
Modified: incubator/spamassassin/branches/b2_6_0/build/README
==============================================================================
--- incubator/spamassassin/branches/b2_6_0/build/README (original)
+++ incubator/spamassassin/branches/b2_6_0/build/README Sat Jan 17 14:30:07 2004
@@ -21,20 +21,12 @@
- edit lib/Mail/SpamAssassin.pm and comment the $IS_DEVEL_BUILD
line.
-- cvs commit -m "ready to release"
+- create the Changes file
-- run cvs2cl to generate the Changes file, like so. For maint branches:
+ TZ=UTC svn log --non-interactive --stop-on-copy
- TZ=UTC ./build/cvs2cl-branch -f Changes -l "-d'>2002-06-18'" --branch b2_5_0
-
- for HEAD:
-
- TZ=UTC ./build/cvs2cl-branch -f Changes -l "-d'>2002-06-18'" --branch HEAD
-
- Note that this requires 'cvs2cl-branch' in the 'build' subdir, since
- there are bugs in std cvs2cl.pl that otherwise result in revisions
- on HEAD appearing in branches, if those revisions are in files created
- after the branch was created. (I hate cvs -- jm)
+ This will output all of the changes since the .0 release in the current
+ branch.
- run "make disttest" to ensure all tests pass once the distribution
is fully packaged.
@@ -49,21 +41,30 @@
- test the tar.gz and zip files! redo until they work!! ;)
-- CVS commit the release files, including 'Changes':
+- SVN commit the release files, including 'Changes':
- cvs commit -m "X.YZ RELEASED"
+ svn commit -m "X.YZ RELEASED"
-- CVS tag the release files:
+- SVN tag the release files. This is done using "svn copy", ie:
- cvs tag spamassassin_release_X_Y_Z
+ svn copy https://svn.apache.org/repos/asf/incubator/spamassassin/branches/b2_6_0 \
+ https://svn.apache.org/repos/asf/incubator/spamassassin/tags/spamassassin_release_2_6_1
- (where X_Y_Z == 2_4_0 or whatever version you're working on.)
+ This will do a completely server-side tagging (which is the same as
+ a branch really) of whatever the latest branch revision to be the new
+ base of the tag release.
- Now, start the new development codebase. For minor updates of a 2.x
tree (e.g. 2.x1, 2.x2), you don't need to branch; for major updates
(2.x0) you should use a new development branch, off HEAD.
- [todo: command to do this]
+ svn copy https://svn.apache.org/repos/asf/incubator/spamassassin/trunk \
+ https://svn.apache.org/repos/asf/incubator/spamassassin/branches/b2_6_0
+
+ "trunk" is SVN's concept of head. Typically, our branches are named
+ for their minor version number. In the example above, b2_6_0 is the
+ branch for the stable 2.6x releases. b3_0_0 would be the branch for
+ the stable 3.0.x releases, etc.
- In the new development codeline, edit lib/Mail/SpamAssassin.pm, bump the
$VERSION line to the correct version, and uncomment the $IS_DEVEL_BUILD
@@ -71,7 +72,7 @@
- then, commit the new version number to the new branch:
- cvs commit -m "X.YN devel cycle started"
+ svn commit -m "X.YN devel cycle started"
(where X.YN is the new version number)
@@ -111,6 +112,6 @@
- Approve the posting to SpamAssassin-Announce (the list admins
will get a mail indicating how to do this.)
-lastmod: Aug 28 2003 jm
+lastmod: Jan 17 2004 tvd
// vim:tw=74:
Modified: incubator/spamassassin/branches/b2_6_0/lib/Mail/SpamAssassin.pm
==============================================================================
--- incubator/spamassassin/branches/b2_6_0/lib/Mail/SpamAssassin.pm (original)
+++ incubator/spamassassin/branches/b2_6_0/lib/Mail/SpamAssassin.pm Sat Jan 17 14:30:07 2004
@@ -91,14 +91,13 @@
@ISA = qw();
# SUB_VERSION is now <revision>-<yyyy>-<mm>-<dd>-<state>
-$SUB_VERSION = lc(join('-', (split(/\s+/, '$Id$'))[2, 3], 'svn'));
+$SUB_VERSION = (split(/\s+/,'$LastChangedDate: 2004-01-11 14:21:28 -0500 (Sun, 11 Jan 2004) $ updated by SVN'))[1];
# If you hacked up your SA, add a token to identify it here. Eg.: I use
# "mss<number>", <number> increasing with every hack.
@EXTRA_VERSION = qw();
-
if (defined $IS_DEVEL_BUILD && $IS_DEVEL_BUILD) {
- push(@EXTRA_VERSION, 'cvs');
+ push(@EXTRA_VERSION, ( 'r' . qw{$LastChangedRevision: 6141 $ updated by SVN}[1] ));
}
sub Version { join('-', $VERSION, @EXTRA_VERSION) }
Re: svn commit: rev 6187 - in incubator/spamassassin/branches/b2_6_0: build lib/Mail
Posted by Theo Van Dinter <fe...@kluge.net>.
On Sun, Jan 18, 2004 at 05:20:58PM +0100, Malte S. Stretz wrote:
> This is what caused bug 2938. I think the best idea is to revert this part
> of the commit and replace 2.62 with a version 2.62-56 or something. I don't
> think it's worth releasing a 2.63 just for this small fix, but we need to
> keep the 5.006 compat.
Yeah, it was my bad. We'd want to release a 2.63 for it though.
We're not setup for a 2.62.1 release number. I don't think it needs to
be released immediately, but should be soon. I think there's another
bug that got reported about 2.62 for UnixLocker, so ...
--
Randomly Generated Tagline:
"I couldn't give him advice in business and he couldn't give me advice
in technology."
- Linus Torvalds, about why he wouldn't be interested
in meeting Bill Gates.
Re: svn commit: rev 6187 - in incubator/spamassassin/branches/b2_6_0: build lib/Mail
Posted by "Malte S. Stretz" <ms...@gmx.net>.
On Saturday 17 January 2004 23:30 CET felicity@apache.org wrote:
> Log:
> prep for 2.62 release
>[...]
> Modified: incubator/spamassassin/branches/b2_6_0/lib/Mail/SpamAssassin.pm
> =========================================================================
>
>--- incubator/spamassassin/branches/b2_6_0/lib/Mail/SpamAssassin.pm
> +++ incubator/spamassassin/branches/b2_6_0/lib/Mail/SpamAssassin.pm
> @@ -91,14 +91,13 @@
> @ISA = qw();
>> # SUB_VERSION is now <revision>-<yyyy>-<mm>-<dd>-<state>
> -$SUB_VERSION = lc(join('-', (split(/\s+/, '$Id$'))[2, 3], 'svn'));
> +$SUB_VERSION = (split(/\s+/,'$LastChangedDate: 2004-01-11 14:21:28 -0500
> (Sun, 11 Jan 2004) $ updated by SVN'))[1];
>
> # If you hacked up your SA, add a token to identify it here. Eg.: I use
> # "mss<number>", <number> increasing with every hack.
> @EXTRA_VERSION = qw();
> -
> if (defined $IS_DEVEL_BUILD && $IS_DEVEL_BUILD) {
> - push(@EXTRA_VERSION, 'cvs');
> + push(@EXTRA_VERSION, ( 'r' . qw{$LastChangedRevision: 6141 $ updated
> by SVN}[1] )); }
>
> sub Version { join('-', $VERSION, @EXTRA_VERSION) }
This is what caused bug 2938. I think the best idea is to revert this part
of the commit and replace 2.62 with a version 2.62-56 or something. I don't
think it's worth releasing a 2.63 just for this small fix, but we need to
keep the 5.006 compat.
FYI, if you use and $Variables$ with Subversion, you have to explicitly set
the svn:keywords property on the files where those vars should be expanded.
See the SVNbook or compare the output of 'svn proplist -v SpamAssassin.pm'
in HEAD and the branch.
Cheers,
Malte
--
[SGT] Simon G. Tatham: "How to Report Bugs Effectively"
<http://www.chiark.greenend.org.uk/~sgtatham/bugs.html>
[ESR] Eric S. Raymond: "How To Ask Questions The Smart Way"
<http://www.catb.org/~esr/faqs/smart-questions.html>