perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pgollu...@apache.org
Subject svn commit: r327877 - in /perl/modperl/trunk: Makefile.PL RELEASE build/make_rpm_spec
Date Sun, 23 Oct 2005 23:21:46 GMT
Author: pgollucci
Date: Sun Oct 23 16:21:40 2005
New Revision: 327877

URL: http://svn.apache.org/viewcvs?rev=327877&view=rev
Log:
make rolling release candiates slightly easier.
-dev can now be replaced with -rc\d+ in the ./Changes file as needed


Modified:
    perl/modperl/trunk/Makefile.PL
    perl/modperl/trunk/RELEASE
    perl/modperl/trunk/build/make_rpm_spec

Modified: perl/modperl/trunk/Makefile.PL
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/Makefile.PL?rev=327877&r1=327876&r2=327877&view=diff
==============================================================================
--- perl/modperl/trunk/Makefile.PL (original)
+++ perl/modperl/trunk/Makefile.PL Sun Oct 23 16:21:40 2005
@@ -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/;

Modified: perl/modperl/trunk/RELEASE
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/RELEASE?rev=327877&r1=327876&r2=327877&view=diff
==============================================================================
--- perl/modperl/trunk/RELEASE (original)
+++ perl/modperl/trunk/RELEASE Sun Oct 23 16:21:40 2005
@@ -21,18 +21,19 @@
    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
-   name.  i.e. (2.0.3-dev to 2.0.3)
 
-  a. nuke any preinstalled mod_perl libs and run 'make test'
+  a. edit ./Changes 
+     - change -dev to -rc\d+  starting with -rc1
 
-  b. test that you can 'make install' and then run 'make test' again
+  b. nuke any preinstalled mod_perl libs and run 'make test'
 
-  c. test whether we still 100% OK on systems with no LWP:
+  c. test that you can 'make install' and then run 'make test' again
+
+  d. test whether we still 100% OK on systems with no LWP:
 
      % APACHE_TEST_PRETEND_NO_LWP=1 make test
 
-  d. build and test as root. double check that you have started from a
+  e. build and test as root. double check that you have started from a
      fresh source, without having any stale dirs from the previous
      build laying around.
 
@@ -47,7 +48,7 @@
    package to be released
 
   a. edit ./Changes:
-     - remove '-dev' 
+     - remove -rc\d+
      - add release date
 
   b. check ./README and ./Makefile.PL

Modified: perl/modperl/trunk/build/make_rpm_spec
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/build/make_rpm_spec?rev=327877&r1=327876&r2=327877&view=diff
==============================================================================
--- perl/modperl/trunk/build/make_rpm_spec (original)
+++ perl/modperl/trunk/build/make_rpm_spec Sun Oct 23 16:21:40 2005
@@ -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/;



Mime
View raw message