Hi,
I'd like to propose the following change to make rolling release candidates
slightly easier.
Instead of removing the -dev in ./Changes, we could change it to rc1, rc2....,
etc.
The version would then be 'mod_perl-2.0.x-rcn' and the tarball would be
mod_perl-2.0.x-rcn.tar.gz which untars into mod_perl-2.0.x-rcn/.
As this would apply to both A-T and mod_perl2, I've generated suggested diffs
for each (see below).
A-T diff:
----------
/home/pgollucci/dev/repos/asf/perl/Apache-Test/trunk rv=0 165 >svn diff
Index: RELEASE
===================================================================
--- RELEASE (revision 327074)
+++ RELEASE (working copy)
@@ -3,7 +3,7 @@
1. 'make dist' - to make sure nothing is missing from the manifest,
etc. Now test this generated package (not svn) with as many
configurations as possible on as many platforms as possible.
- Note, in step 3a, removing the "-dev" line changes the package version
+ Note, in step 3a, changing the "-dev" line changes the package version
name. i.e. (1.28-dev to 1.28)
a. nuke any preinstalled Apache-Test libs and run 'make test'
@@ -32,7 +32,7 @@
package to be released
a. edit ./Changes:
- - remove '-dev'
+ - change -dev to -rc\d+ start with -rc1
- add release date
b. rerun:
Index: Makefile.PL
===================================================================
--- Makefile.PL (revision 327069)
+++ Makefile.PL (working copy)
@@ -124,8 +124,8 @@
my $fh = Symbol::gensym();
open $fh, 'Changes' or die "Can't open Changes: $!";
while (<$fh>) {
- if(/^=item.*-dev/) {
- $VERSION .= '-dev';
+ if(/^=item.*-(dev|rc\d+)/) {
+ $VERSION .= "-$1";
last;
}
last if /^=item/;
mp2 diff:
----------
/home/pgollucci/dev/repos/asf/perl/modperl/trunk rv=0 178 >svn diff
Index: RELEASE
===================================================================
--- RELEASE (revision 327806)
+++ RELEASE (working copy)
@@ -21,7 +21,7 @@
the current build) with as many
configurations as possible on as many platforms as possible,
unpacking the package each time afresh.
- Note, in step 3a, removing the "-dev" line changes the package version
+ Note, in step 3a, changing the "-dev" line changes the package version
name. i.e. (2.0.3-dev to 2.0.3)
a. nuke any preinstalled mod_perl libs and run 'make test'
@@ -47,7 +47,7 @@
package to be released
a. edit ./Changes:
- - remove '-dev'
+ - change -dev to -rc\d+ start with -rc1
- add release date
b. check ./README and ./Makefile.PL
Index: Makefile.PL
===================================================================
--- Makefile.PL (revision 327611)
+++ Makefile.PL (working copy)
@@ -480,8 +480,8 @@
open my $fh, 'Changes';
while (<$fh>) {
- if (/^=item.*-dev/) {
- $VERSION .= '-dev';
+ if (/^=item.*-(dev|rc\d+)/) {
+ $VERSION .= "-$1";
last;
}
last if /^=item/;
Index: build/make_rpm_spec
===================================================================
--- build/make_rpm_spec (revision 327611)
+++ build/make_rpm_spec (working copy)
@@ -6,7 +6,7 @@
my $dev_build = is_dev_build();
my $release = $dev_build ? svn_release() : 1;
my $version = $mod_perl2::VERSION_TRIPLET;
-my $path = $dev_build ? "mod_perl-$version-dev" : "mod_perl-$version";
+my $path = $dev_build ? "mod_perl-$version-$dev_build" :
"mod_perl-$version";
my $tarname = "$path.tar.gz";
my $httpd_ver = min_httpd_ver();
@@ -135,8 +135,8 @@
my $dev;
open my $fh, 'Changes';
while (<$fh>) {
- if (/^=item.*-dev/) {
- $dev = 1;
+ if (/^=item.*-(dev|rc\d+)/) {
+ $dev = $1;
last;
}
last if /^=item/;
--
END
------------------------------------------------------------
What doesn't kill us can only make us stronger.
Nothing is impossible.
Philip M. Gollucci ([EMAIL PROTECTED]) 301.254.5198
Consultant / http://p6m7g8.net/Resume/
Senior Developer / Liquidity Services, Inc.
http://www.liquidityservicesinc.com
http://www.liquidation.com
http://www.uksurplus.com
http://www.govliquidation.com
http://www.gowholesale.com
