You are viewing a plain text version of this content. The canonical link for it is here.
Posted to apreq-cvs@httpd.apache.org by is...@apache.org on 2010/12/03 13:31:58 UTC
svn commit: r1041786 - in /httpd/apreq/trunk/build: RELEASE update_version.pl
Author: issac
Date: Fri Dec 3 12:31:58 2010
New Revision: 1041786
URL: http://svn.apache.org/viewvc?rev=1041786&view=rev
Log:
update_version will now handle RELEASE + WEBSITE + itself.
Modified:
httpd/apreq/trunk/build/RELEASE
httpd/apreq/trunk/build/update_version.pl
Modified: httpd/apreq/trunk/build/RELEASE
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/build/RELEASE?rev=1041786&r1=1041785&r2=1041786&view=diff
==============================================================================
--- httpd/apreq/trunk/build/RELEASE (original)
+++ httpd/apreq/trunk/build/RELEASE Fri Dec 3 12:31:58 2010
@@ -5,7 +5,7 @@ FreeBSD/Solaris note: use gmake!
1. Create a realease branch:
svn cp https://svn.apache.org/repos/asf/httpd/apreq/trunk \
- https://svn.apache.org/repos/asf/httpd/apreq/branches/v2_12
+ https://svn.apache.org/repos/asf/httpd/apreq/branches/v2.14
2. On the BRANCH
@@ -13,13 +13,13 @@ FreeBSD/Solaris note: use gmake!
/** @page STATUS
- 2.12 released on <one week from today's date>.
+ 2.14 released on <one week from today's date>.
Also add the release date to the top @section in CHANGES:
/** @page CHANGES
- @section v2_12 Changes with libapreq2-2.12 (released ...).
+ @section v2.14 Changes with libapreq2-2.12 (released ...).
And #undef the APREQ_VERSION_IS_DEV macro definition
in include/apreq_version.h:
@@ -28,21 +28,21 @@ FreeBSD/Solaris note: use gmake!
*/
#undef APREQ_IS_DEV_VERSION
- % svn commit -m "2.12 release started" STATUS CHANGES include/apreq_version.h
+ % svn commit -m "2.14 release started" STATUS CHANGES include/apreq_version.h
3. On TRUNK:
Update CHANGES and STATUS to reflect the start of a new develoment cycle,
and run this to update the package version numbers throughout the tree:
- % build/update_version.pl 2.13
+ % build/update_version.pl 2.14
- % svn commit -m "2.13 cycle"
+ % svn commit -m "2.14 cycle"
4. Prep the package for CPAN by running:
% make release
- This will generate a libapreq2-2.12.tar.gz candidate in the
+ This will generate a libapreq2-2.14.tar.gz candidate in the
current directory. You should keep this source tree
intact to tag the final release.
@@ -55,11 +55,11 @@ FreeBSD/Solaris note: use gmake!
6. Sign it via gpg:
- % gpg --detach-sign --armor libapreq2-2.12.tar.gz
+ % gpg --detach-sign --armor libapreq2-2.14.tar.gz
or pgp:
- % pgp -sba libapreq2-2.12.tar.gz
+ % pgp -sba libapreq2-2.14.tar.gz
7. Upload the release candidate to people.apache.org/~username
and post a candidate announcement to apreq-dev@. Also, it is
@@ -67,7 +67,7 @@ FreeBSD/Solaris note: use gmake!
announcement to the modperl@ list, to solicit feedback
from a much larger audience.
- Subject: [RELEASE CANDIDATE] libapreq2 2.12 RC\d+
+ Subject: [RELEASE CANDIDATE] libapreq2 2.14 RC\d+
8. Give the mailing list participants 48-72 hours to comment and
vote on the candidate. If there is a "majority consensus"
@@ -77,19 +77,19 @@ FreeBSD/Solaris note: use gmake!
9. Tag the Release -- from the BRANCH
- svn mv https://svn.apache.org/repos/asf/httpd/apreq/branches/v2_12 \
- https://svn.apache.org/repos/asf/httpd/apreq/tags/v2_12
+ svn mv https://svn.apache.org/repos/asf/httpd/apreq/branches/v2.14 \
+ https://svn.apache.org/repos/asf/httpd/apreq/tags/v2.14
10. Upload (scp) the package and signature to www.apache.org
for distribution:
- % scp libapreq2-2.12.tar.gz* \
+ % scp libapreq2-2.14.tar.gz* \
$USER@people.apache.org:/www/www.apache.org/dist/httpd/libapreq/
Ask another developer to confirm the uploaded signature is ok.
- % gpg --verify libapreq2-2.12.tar.gz.asc
- % pgp libapreq2-2.12.tar.gz.asc
+ % gpg --verify libapreq2-2.14.tar.gz.asc
+ % pgp libapreq2-2.14.tar.gz.asc
Check that your public key is among those listed in the
/www/www.apache.org/dist/httpd/KEYS file. If not, you
Modified: httpd/apreq/trunk/build/update_version.pl
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/build/update_version.pl?rev=1041786&r1=1041785&r2=1041786&view=diff
==============================================================================
--- httpd/apreq/trunk/build/update_version.pl (original)
+++ httpd/apreq/trunk/build/update_version.pl Fri Dec 3 12:31:58 2010
@@ -45,3 +45,9 @@ system "perl -i -ple 's/$pattern1/$versi
my $pattern3 = qr/my \$VERSION = "2.14"/;
my $replace = "my \\\$VERSION = \"$version\"";
system "perl -i -ple 's/$pattern3/$replace/' win32/Configure.pl";
+
+# RELEASE/WEBSITE/this script
+system "perl -i -ple 's/2.14/$version/' build/RELEASE";
+system "perl -i -ple 's/2.14/$version/' build/WEBSITE";
+system "perl -i -ple 's/2.14/$version/' build/update_version.pl";
+