httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pgollu...@apache.org
Subject svn commit: r442670 - in /httpd/apreq/trunk: STATUS build/RELEASE
Date Tue, 12 Sep 2006 18:39:37 GMT
Author: pgollucci
Date: Tue Sep 12 11:39:36 2006
New Revision: 442670

URL: http://svn.apache.org/viewvc?view=rev&rev=442670
Log:
new release process alowing testers to vote on the actual final tarball.
Completes the last release showstopper for 2.09


Modified:
    httpd/apreq/trunk/STATUS
    httpd/apreq/trunk/build/RELEASE

Modified: httpd/apreq/trunk/STATUS
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/STATUS?view=diff&rev=442670&r1=442669&r2=442670
==============================================================================
--- httpd/apreq/trunk/STATUS (original)
+++ httpd/apreq/trunk/STATUS Tue Sep 12 11:39:36 2006
@@ -12,9 +12,6 @@
 
 RELEASE SHOWSTOPPERS:
 
-    - Clean up, formalize, and standarize the release process so that
-      testers actually vote on the final tarball.
-
 
 CURRENT VOTES:
 

Modified: httpd/apreq/trunk/build/RELEASE
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/build/RELEASE?view=diff&rev=442670&r1=442669&r2=442670
==============================================================================
--- httpd/apreq/trunk/build/RELEASE (original)
+++ httpd/apreq/trunk/build/RELEASE Tue Sep 12 11:39:36 2006
@@ -2,7 +2,47 @@
 
 FreeBSD note: use gmake!
 
-1. Prep the package for CPAN by running:
+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_09
+
+
+2. On the BRANCH
+    Edit STATUS, marking the release date
+
+       /** @page STATUS
+
+       2.09 released on <today's date>.
+
+   Also add the release date to the top @section in CHANGES:
+
+       /** @page CHANGES
+
+       @section v2_09 Changes with libapreq2-2.09 (released ...).
+
+   And #undef the APREQ_VERSION_IS_DEV macro definition
+   in include/apreq_version.h:
+
+       *  This symbol will be #undef'd for releases. 
+       */
+       #undef APREQ_IS_DEV_VERSION
+
+       % svn commit -m "2.09 release started" STATUS CHANGES include/apreq_version.h
+
+    NOTE the revision that you committed.
+    Call it $rS.
+
+    If you make any ADDITIONAL  changes to this branch you'll need to merge them back to
the trunk
+    Either now, or when the release cycle is complete (See step 15)
+
+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.10
+
+4. Prep the package for CPAN by running:
 
         % make release
 
@@ -11,55 +51,35 @@
    intact to tag the final release.
 
 
-2. Test the generated file with
+5. Test the generated file with
 
         % make release_test
 
    Make sure all perl tests pass.
 
 
-3. Upload the release candidate to people.apache.org/~username
+6. Upload the release candidate to people.apache.org/~username
    and post a candidate announcement to apreq-dev@. Also, it is 
    strongly recommended that the RM crosspost the candidate 
    announcement to the modperl@ list, to solicit feedback
    from a much larger audience.
 
 
-4. Give the mailing list participants 48-72 hours to comment and
+7. Give the mailing list participants 48-72 hours to comment and
    vote on the candidate.  If there is a "majority consensus" 
    (three +1 and more +1s than -1s) among the httpd pmc members, the RM 
    may proceed with the release.
 
 
-5. Edit STATUS, marking the release date
-
-       /** @page STATUS
-
-       2.09 released on <today's date>.
-
-
-   Also add the release date to the top @section in CHANGES:
-
-       /** @page CHANGES
-
-       @section v2_09 Changes with libapreq2-2.09 (released ...).
-
-   And #undef the APREQ_VERSION_IS_DEV macro definition
-   in include/apreq_version.h:
-
-       *  This symbol will be #undef'd for releases. 
-       */
-       #undef APREQ_IS_DEV_VERSION
-
+8. Tag the Release -- from the BRANCH
 
-   Now commit the changes and tag the tree (tr/0-9a-zA-Z/_/c in the
-   version number)
+    svn cp https://svn.apache.org/repos/asf/httpd/apreq/branches/v2_09 \
+           https://svn.apache.org/repos/asf/httpd/apreq/tags/v2_09
 
-       % svn commit -m "2.09 released." STATUS CHANGES include/apreq_version.h
-       % svn cp https://svn.apache.org/repos/asf/httpd/apreq/trunk \
-                https://svn.apache.org/repos/asf/httpd/apreq/tags/v2_09
+    NOTE the Revision that is copied.  Call it $rE.
+    It will be in the commit e-mail.
 
-6. Regenerate the release 
+9. Regenerate the release 
 
         % make release && make release_test
 
@@ -72,7 +92,7 @@
         % pgp -sba libapreq2-2.09.tar.gz
 
 
-7. Upload (scp) the package and signature to www.apache.org
+10. Upload (scp) the package and signature to www.apache.org
    for distribution:
 
         % scp libapreq2-2.09.tar.gz* \
@@ -89,40 +109,42 @@
    Then update the website's copy using "cvs co KEYS" in the 
    /www/www.apache.org/dist/httpd/ directory.
 
-8a. Verify or get soeone to Verify that you have CPAN karma.
+11. Verify or get soeone to Verify that you have CPAN karma.
     Note, discuss getting a group kind of like AMPL in mod_perl land.
-    (Currently, joes is active and has karma)
+    (Currently, joes@ is active and has karma)
 
-8b. Upload the package to CPAN. Doublecheck that the md5 checksum
+12. Upload the package to CPAN. Doublecheck that the md5 checksum
    received from PAUSE is correct.
 
-9. Wait ~12-24 hours for the ASF mirrors to pick up the new package, then
+13. Wait ~12-24 hours for the ASF mirrors to pick up the new package, then
    update the apreq homepage to list the new release in the News section
    Be sure to update the libapreq2 documentation. For instructions on updating 
    the httpd website, see build/WEBSITE.  IMPORTANT: YOU MUST UPDATE
    download.html TO POINT AT THE NEW RELEASE PACKAGE!
 
-
-10. Mail the announcement from your people.apache.org account by piping the 
+14. Mail the announcement from your people.apache.org account by piping the 
     "CPAN Upload" email acknowledgement (from PAUSE) through build/announcement.pl:
 
     % build/announcement.pl $USER@apache.org < CPAN_ack | ssh $USER@people.apache.org
"sendmail -oi -t -odq"
 
+15. Once you are SURE, you've merged any ADDITIONAL changes on the BRANCH back to TRUNK,
+    delete the branch:
 
-11. 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.10
-
-12. 
-   And #define the APREQ_VERSION_IS_DEV macro definition
-   in include/apreq_version.h:
+    [NOTE, $rS and $rE are the values you noted above]
 
-      /**
-        *  This symbol is defined for internal, "development" copies of libapreq.
-        *  This symbol will be \#undef'd for releases.
-        */
-      #define APREQ_IS_DEV_VERSION
+    % svn help merge | head -4
+      merge: Apply the differences between two sources to a working copy path.
+      usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]
+             2. merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]
+             3. merge -r N:M SOURCE[@REV] [WCPATH]
+
+    svn co https://svn.apache.org/repos/asf/httpd/apreq/trunk 
+    cd trunk
+
+    svn merge https://svn.apache.org/repos/asf/httpd/apreq/branches/v2_09@$rS \
+              https://svn.apache.org/repos/asf/httpd/apreq/branches/v2_09@$rE
+  
+    svn del https://svn.apache.org/repos/asf/httpd/apreq/branches/v2_09
 
-13. COMMIT the changes in steps 11 and 12.
+16. Drink Beer!
 



Mime
View raw message