Return-Path: Delivered-To: apmail-apache-cvs-archive@apache.org Received: (qmail 68597 invoked by uid 500); 20 Dec 2000 16:16:32 -0000 Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm Precedence: bulk Reply-To: new-httpd@apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list apache-cvs@apache.org Received: (qmail 68581 invoked by uid 500); 20 Dec 2000 16:16:27 -0000 Delivered-To: apmail-apache-devsite-cvs@apache.org Date: 20 Dec 2000 16:16:25 -0000 Message-ID: <20001220161625.68572.qmail@locus.apache.org> From: rbb@locus.apache.org To: apache-devsite-cvs@apache.org Subject: cvs commit: apache-devsite how-to-release.html rbb 00/12/20 08:16:24 Modified: . how-to-release.html Log: Update the "How to release" page for Apache 2.0. These instructions will be tested later today, and any problems will be fixed at that time. Revision Changes Path 1.64 +108 -39 apache-devsite/how-to-release.html Index: how-to-release.html =================================================================== RCS file: /home/cvs/apache-devsite/how-to-release.html,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- how-to-release.html 2000/07/15 15:20:53 1.63 +++ how-to-release.html 2000/12/20 16:16:22 1.64 @@ -60,8 +60,17 @@
$ cvs checkout -d htdocs httpd-docs-1.3/htdocs

cd into the apache-1.X CVS tree.
- $ cd apache-1.X + For Apache 2.0:
+ $ cvs checkout -P httpd-2.X +
+ $ cd httpd-2.X/srclib +
+ $ cvs checkout apr apr-util +

cd into the apache CVS tree.
+ $ cd apache-1.X
+ or
+ $ cd httpd-2.X

[ Adjusting Announcement to taste ]

@@ -82,7 +91,8 @@

[ Only for final releases, not for internal pre-releases ]

Change SERVER_VERSION in src/include/httpd.h +

For Apache 1.3
+ Change SERVER_VERSION in src/include/httpd.h from ``Apache/1.X.Y-dev'' to ``Apache/1.X.Y''. Then also change APACHE_RELEASE in the same file from @@ -93,6 +103,12 @@ $ vi src/include/httpd.h
$ cvs commit src/include/httpd.h

+ For Apache 2.0:
+ Change SERVER_BASEREVISION in include/httpd.h + from ``2.X-dev'' to ``2.X''. + Then also change APACHE_RELEASE in the same file from + ``2XXYY000'' to ``2XXYY100''. +

Make sure your PGP keys are already present in the KEYS file. If they are not, extract your public key using the ``pgp -kxa'' command, add them to the @@ -100,20 +116,22 @@

Tag the sources for this release:
(note: be sure to tag the whole thing, not just src!)
- $ cvs tag APACHE_1_X_Y + $ cvs tag APACHE_1_X_Y
+ For Apache 2.0:
+ $ cvs tag APACHE_2_X_Y

[ For all releases ]

Make an export version of the distribution: (this creates a second - subdirectory apache-1.X.Y for the exported version - beside the existing CVS tree in apache-1.X)
+ subdirectory apache-Z.X.Y for the exported version + beside the existing CVS tree in apache-Z.X)
+ For Apache 1.3:
$ cd ..
$ umask 022
$ cvs export -r APACHE_1_X_Y -d apache_1.X.Y apache-1.X
$ cd apache_1.X.Y
$ cvs export -r APACHE_1_X_Y -d htdocs httpd-docs-1.3/htdocs -

Note: There is a known problem @@ -126,6 +144,27 @@ $ cvs checkout -r APACHE_1X_Y -d htdocs httpd-docs-1.3/htdocs
+ +
+ For Apache 2.0:
+ $ cd ..
+ $ umask 022
+ $ cvs export -r APACHE_2_X_Y -d apache_2.X.Y httpd-2.X
+ $ cd apache_2.X.Y/srclib
+ $ cvs export -r APACHE_2_X_Y apr apr-util + +
+ +
Note: There is a known problem + using cvs export remotely with cvs-1.9 + and later. If this affects you, you will need to do a checkout + instead:
+ $ umask 022
+ $ cvs checkout -r APACHE_2_X_Y -d apache_2.X.Y httpd-2.X
+ $ cd apache_2.X.Y/srclib
+ $ cvs checkout -r APACHE_2X_Y apr apr-util + +

Make sure the master site's FAQ is up-to-date:
$ (cd /www/www.apache.org/docs/misc ; cvs update) @@ -134,17 +173,29 @@ $ lynx -source http://www.apache.org/docs/misc/FAQ.html > htdocs/manual/misc/FAQ.html
-

Create src/Configuration file: (1.3.x only)
+ +

For Apache 1.3:
+ Create src/Configuration file: (1.3.x only)
$ cp src/Configuration.tmpl src/Configuration
+ For Apache 2.0:
+ Create ./configure file, and remove all symlinks
+ $ ./buildconf
+ $ rm -f ltconfig ltmain.sh config.sub config.guess
+ $ cp /usr/local/share/libtool/ltconfig .
+ $ cp /usr/local/share/libtool/ltmain.sh .
+ $ cp /usr/local/share/libtool/config.sub .
+ $ cp /usr/local/share/libtool/config.guess .
+

Remove STATUS, RULES.CVS, src/INDENT, the multi-part FAQ, various .cvsignore and - the developer's test subdirectories:
+ the developer's test subdirectories. Depending on which version you + are releasing, not all of these files will be in the repository:
$ rm STATUS RULES.CVS src/INDENT htdocs/manual/misc/FAQ-*.html
$ find . -name ".cvsignore" -exec rm {} \;
- $ rm -rf src/test src/modules/test + $ find . -type d -name "test" -exec rm -Rf {} \;
@@ -162,21 +213,21 @@ $ cd ../../..

Roll the distribution tarball:
- $ tar cvf apache_1.X.Y.tar apache_1.X.Y
+ $ tar cvf apache_Z.X.Y.tar apache_Z.X.Y

Make the final packed distribution files:
- $ cp -p apache_1.X.Y.tar xapache_1.X.Y.tar
- $ gzip -9 apache_1.X.Y.tar
- $ mv xapache_1.X.Y.tar apache_1.X.Y.tar
- $ compress apache_1.X.Y.tar
+ $ cp -p apache_Z.X.Y.tar xapache_Z.X.Y.tar
+ $ gzip -9 apache_Z.X.Y.tar
+ $ mv xapache_Z.X.Y.tar apache_Z.X.Y.tar
+ $ compress apache_Z.X.Y.tar

Test the packed tar files and check for errors:
- $ gunzip -c apache_1.X.Y.tar.gz | tar tvf -
- $ zcat apache_1.X.Y.tar.Z | tar tvf -
+ $ gunzip -c apache_Z.X.Y.tar.gz | tar tvf -
+ $ zcat apache_Z.X.Y.tar.Z | tar tvf -

Sign the distribution files:
- $ pgp -sba apache_1.X.Y.tar.gz
- $ pgp -sba apache_1.X.Y.tar.Z
+ $ pgp -sba apache_Z.X.Y.tar.gz
+ $ pgp -sba apache_Z.X.Y.tar.Z

@@ -186,25 +237,25 @@

Test the tarball signatures:
- $ pgp apache_1.X.Y.tar.gz.asc apache_1.X.Y.tar.gz
- $ pgp apache_1.X.Y.tar.Z.asc apache_1.X.Y.tar.Z
+ $ pgp apache_Z.X.Y.tar.gz.asc apache_Z.X.Y.tar.gz
+ $ pgp apache_Z.X.Y.tar.Z.asc apache_Z.X.Y.tar.Z

Remember the CHANGES file:
- $ cp apache_1.X.Y/src/CHANGES . + $ cp apache_Z.X.Y/src/CHANGES .

Cleanup:
(this deletes the export tree: it is now no longer required. We still need the CVS tree, see below)
- $ rm -fr apache_1.X.Y + $ rm -fr apache_Z.X.Y

Make the tarball available for testing purposes (in http://dev.apache.org/dist/):
- $ chmod 664 CHANGES apache_1.X.Y.tar.*
- $ cp apache_1.X.Y.tar.gz /www/dev.apache.org/dist/
- $ cp apache_1.X.Y.tar.gz.asc /www/dev.apache.org/dist/
- $ cp apache_1.X.Y.tar.Z /www/dev.apache.org/dist/
- $ cp apache_1.X.Y.tar.Z.asc /www/dev.apache.org/dist/
- $ chmod g+w /www/dev.apache.org/dist/apache_1.X.Y.tar.*
+ $ chmod 664 CHANGES apache_Z.X.Y.tar.*
+ $ cp apache_Z.X.Y.tar.gz /www/dev.apache.org/dist/
+ $ cp apache_Z.X.Y.tar.gz.asc /www/dev.apache.org/dist/
+ $ cp apache_Z.X.Y.tar.Z /www/dev.apache.org/dist/
+ $ cp apache_Z.X.Y.tar.Z.asc /www/dev.apache.org/dist/
+ $ chmod g+w /www/dev.apache.org/dist/apache_Z.X.Y.tar.*

@@ -219,9 +270,10 @@ [ Only for final releases, not for internal pre-releases ]

cd back into the CVS tree location.
- $ cd apache-1.X + $ cd apache-Z.X
-
Change SERVER_VERSION in src/include/httpd.h +
For Apache 1.3:
+ Change SERVER_VERSION in src/include/httpd.h from ``Apache/1.X.Y'' to ``Apache/1.X.(Y+1)-dev'' and change APACHE_RELEASE to 1XX(YY+1)000.
@@ -242,11 +294,26 @@      src/CHANGES
$ cd ..

+ For Apache 2.0:
+ Change SERVER_BASEREVERSION in include/httpd.h + from ``2.X.Y'' to + ``2.X.(Y+1)-dev'' and change + APACHE_RELEASE to 1XX(YY+1)000.
+ Finally, add a new line + ``Changes with Apache 1.X.(Y+1):'' to the + head of the CHANGES file for the + forthcoming fixes in the new version.
+ $ vi include/httpd.h \ +      src/CHANGES
+ $ cvs commit include/httpd.h \ +      CHANGES
+ $ cd ..
+

Cleanup:
(delete the CVS tree, after verification that it does not contain any uncommitted changes)
- $ cvs release -d apache-1.X + $ cvs release -d apache-Z.X
[ Now wait for the group to test and approve the tarball ]
@@ -258,12 +325,13 @@

Make the distribution available - (in http://www.apache.org/dist/):
- $ cp CHANGES /www/www.apache.org/dist/CHANGES_1.X
- $ cp apache_1.X.Y.tar.gz /www/www.apache.org/dist
- $ cp apache_1.X.Y.tar.gz.asc /www/www.apache.org/dist
- $ cp apache_1.X.Y.tar.Z /www/www.apache.org/dist
- $ cp apache_1.X.Y.tar.Z.asc /www/www.apache.org/dist
+ (in http://www.apache.org/dist/) + Z is either 1 or 2:
+ $ cp CHANGES /www/www.apache.org/dist/CHANGES_Z.X
+ $ cp apache_Z.X.Y.tar.gz /www/www.apache.org/dist
+ $ cp apache_Z.X.Y.tar.gz.asc /www/www.apache.org/dist
+ $ cp apache_Z.X.Y.tar.Z /www/www.apache.org/dist
+ $ cp apache_Z.X.Y.tar.Z.asc /www/www.apache.org/dist

@@ -292,7 +360,8 @@ from the apache-site CVS tree as required (all in the ./dist - subdirectory). The Announcement.* files should be based on the Announcement file in the tagged CVS tree:
+ subdirectory). The Announcement.* files should be based on the Announcement file in the tagged CVS tree. For Apache 2.0, + Announcement should be replaced with Announcement2:
$ vi dist/README.html \      dist/HEADER.html \