You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2010/03/12 23:07:46 UTC
svn commit: r922437 - in /httpd/site/trunk/xdocs/dev: how-to-release.xml
release.xml
Author: wrowe
Date: Fri Mar 12 22:07:46 2010
New Revision: 922437
URL: http://svn.apache.org/viewvc?rev=922437&view=rev
Log:
Changes for https://dist.apache.org/, the site docs still need major surgery
Modified:
httpd/site/trunk/xdocs/dev/how-to-release.xml
httpd/site/trunk/xdocs/dev/release.xml
Modified: httpd/site/trunk/xdocs/dev/how-to-release.xml
URL: http://svn.apache.org/viewvc/httpd/site/trunk/xdocs/dev/how-to-release.xml?rev=922437&r1=922436&r2=922437&view=diff
==============================================================================
--- httpd/site/trunk/xdocs/dev/how-to-release.xml [utf-8] (original)
+++ httpd/site/trunk/xdocs/dev/how-to-release.xml [utf-8] Fri Mar 12 22:07:46 2010
@@ -16,8 +16,8 @@ Martin Kraemer <martin@apache.org>
</p>
<p><b><font color="red">This document has been obsoleted in httpd-2.0 by the
-dist/tools/release.sh script.</font></b> It does everything for you. At
-some point, we may come back and update this document. So, in the
+httpd/site/trunk/tools/release.sh script.</font></b> It does everything for
+you. At some point, we may come back and update this document. So, in the
meantime, ignore this and use that script for Apache 2.0 rolls.</p>
<p>This document describes the typical release cycle the release manager has
@@ -248,22 +248,9 @@ tarball and release.</p>
<code><b>$ rm -fr apache_<em>Z.X.Y</em></b></code>
</li>
<li>Make the tarball available for testing purposes
- (in <a href="http://httpd.apache.org/dev/dist/">http://httpd.apache.org/dev/dist/</a>):<br />
- <code><b>$ chmod 664 CHANGES_<em>Z.X</em> apache_<em>Z.X.Y</em>.tar.*</b></code><br />
- <code><b>$ cp -pv apache_<em>Z.X.Y</em>.tar.gz /www/httpd.apache.org/dev/dist/</b></code><br />
- <code><b>$ cp -pv apache_<em>Z.X.Y</em>.tar.gz.asc /www/httpd.apache.org/dev/dist/</b></code><br />
- <code><b>$ cp -pv apache_<em>Z.X.Y</em>.tar.Z /www/httpd.apache.org/dev/dist/</b></code><br />
- <code><b>$ cp -pv apache_<em>Z.X.Y</em>.tar.Z.asc /www/httpd.apache.org/dev/dist/</b></code><br />
- <code><b>$ chmod g+w /www/httpd.apache.org/dev/dist/apache_<em>Z.X.Y</em>.tar.*</b></code><br />
-
- <ul>
- <li><font color="red">Note:</font> If rolling the tarball
- remotely, you should use <code>scp</code> to place them
- in <code>httpd.apache.org</code> in the
- <code>/www/httpd.apache.org/dev/dist/</code>
- directory.
- </li>
- </ul>
+ (in <a href="http://httpd.apache.org/dev/dist/">http://httpd.apache.org/dev/dist/</a>)
+ by committing the generated release tarballs and signatures to the
+ https://dist.apache.org/repos/dist/dev/httpd/ repository.
</li>
<li>Bump the version number to the next version and indicate we are
in development.<br />
@@ -331,24 +318,13 @@ these instructions until the group reall
<ol>
<li>Make the distribution available
- (in <a href="http://www.apache.org/dist/httpd/">http://www.apache.org/dist/httpd/</a>)
- Z is either 1 or 2:<br />
- <code><b>$ cp CHANGES_<em>Z.X</em> /www/www.apache.org/dist/httpd/CHANGES_<em>Z.X</em></b></code><br />
- <code><b>$ cp apache_<em>Z.X.Y</em>.tar.gz /www/www.apache.org/dist/httpd/</b></code><br />
- <code><b>$ cp apache_<em>Z.X.Y</em>.tar.gz.asc /www/www.apache.org/dist/httpd/</b></code><br />
- <code><b>$ cp apache_<em>Z.X.Y</em>.tar.Z /www/www.apache.org/dist/httpd/</b></code><br />
- <code><b>$ cp apache_<em>Z.X.Y</em>.tar.Z.asc /www/www.apache.org/dist/httpd/</b></code><br />
- <ul>
- <li><font color="red">Note:</font> If rolling the tarball
- remotely, you should use <code>scp</code> to place them
- in <code>www.apache.org</code> in the
- <code>/www/www.apache.org/dist/httpd/</code> directory.
- </li>
- </ul>
- <p>If the Win32 binary is already built and tested at this point,
- you can add it to the dist directory as well as to the
- <code>binaries/win32/</code> directory.
- </p>
+ (in <a href="http://www.apache.org/dist/httpd/">http://www.apache.org/dist/httpd/</a>) by
+ svn mv'ing the files from https://dist.apache.org/repos/dist/dev/httpd/
+ to the https://dist.apache.org/repos/dist/release/httpd/ repository.
+ </li>
+ <li>If binary builds are already built and tested at this point,
+ you can add them in svn under the distribution tree branches
+ https://dist.apache.org/repos/dist/release/httpd/binaries/{OS}/.
</li>
<li>Checkout the
<a href="http://www.apache.org/dist/httpd/">httpd-dist site</a>,
Modified: httpd/site/trunk/xdocs/dev/release.xml
URL: http://svn.apache.org/viewvc/httpd/site/trunk/xdocs/dev/release.xml?rev=922437&r1=922436&r2=922437&view=diff
==============================================================================
--- httpd/site/trunk/xdocs/dev/release.xml [utf-8] (original)
+++ httpd/site/trunk/xdocs/dev/release.xml [utf-8] Fri Mar 12 22:07:46 2010
@@ -8,8 +8,8 @@
<section><title>Introduction</title>
<p>This document describes the general release policies used by the
-Apache HTTP Server Project to create releases of httpd-2.0 (the current
-Apache 2.0 branch). As described herein, this policy is not set in stone
+Apache HTTP Server Project to create releases of httpd-2.2 (the current
+Apache 2.2 branch). As described herein, this policy is not set in stone
and may be adjusted by the Release Manager.</p>
<p>With the introduction of Apache 2.1, the Apache httpd project has
@@ -119,22 +119,22 @@ parties, they should "roll" a candidate
<p>Key points:</p>
<ol>
-<li>Execute <code>./build.sh all</code> in case of the 2.0.x documentation and
+<li>Execute <code>./build.sh all</code> in case of the 2.2.x documentation and
<code>./build.sh all convmap</code> in case of the 2.2.x documentation to
ensure that the documentation transformations are up to date.</li>
<li>Ensure that the RM's PGP/GPG key is in the httpd-dist/KEYS file.</li>
<li>Set <code>AP_SERVER_DEVBUILD_BOOLEAN</code> to <code>0</code> in
<code>include/ap_release.h</code> in case of 2.2.x and set
-<code>AP_SERVER_ADD_STRING</code> to <code>""</code> in case of 2.0.x.</li>
+<code>AP_SERVER_ADD_STRING</code> to <code>""</code> in case of 2.2.x.</li>
<li>Create an official X.Y.Z tag based on the candidate tree.</li>
<li>Revert the changes done to <code>include/ap_release.h</code> and bump
<code>AP_SERVER_PATCHLEVEL_NUMBER</code>.</li>
<li>Bump <code>ENTITY httpd.patch</code> in
<code>docs/manual/style/version.ent</code>.</li>
<li>Note the tag date in the STATUS file.</li>
-<li>Run the httpd/site/trunk/dist/tools/release.sh script.</li>
-<li>Copy the generated release tarballs and signatures to
-people.apache.org:/www/httpd.apache.org/dev/dist.</li>
+<li>Run the httpd/site/trunk/tools/release.sh script.</li>
+<li>Commit the generated release tarballs and signatures to the subversion
+https://dist.apache.org/repos/dist/dev/httpd/ repository.</li>
<li>Email dev@httpd.apache.org with a [VOTE] Release X.Y.Z to call
for testing and votes on this candidate.</li>
</ol>
@@ -200,7 +200,13 @@ applicable patches MUST be made availabl
<section><title>How do we make it public?</title>
<p>Once the release has reached the highest-available designation (as deemed
by the RM), the release can be moved to the httpd distribution directory
-on apache.org. It should be ensured that the release is also added to
+on apache.org. The release tarballs and signatures can be svn mv'ed from
+the https://dist.apache.org/repos/dist/dev/httpd/ repository across to the
+https://dist.apache.org/repos/dist/release/httpd/ repository. In that
+release tree are also the patches/, subproject/ and binaries/ distribution
+trees.</p>
+
+<p>It should be ensured that the release is also added to
Bugzilla by sending a mail to dev@httpd.apache.org requesting the same. The
request is picked up there by one of the project members with Bugzilla
administrator permissions and the release is added to Bugzilla. Also do