martin 98/10/07 05:23:51
Modified: . how-to-release.html Log: Add my observations: * increase the version triple in Configure _after_, not _before_ tagging. * chmod g+w to be sure the group can write the files in dev/dist/ Put X.Y version numbers in EM tags Revision Changes Path 1.50 +73 -68 apache-devsite/how-to-release.html Index: how-to-release.html =================================================================== RCS file: /export/home/cvs/apache-devsite/how-to-release.html,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- how-to-release.html 1998/10/06 20:36:48 1.49 +++ how-to-release.html 1998/10/07 12:23:50 1.50 @@ -55,12 +55,12 @@ release. For example, the Release Version should reflect what is actually being announced. Also, the key enhancements of the Release should be noted.<BR> - <CODE><STRONG>$ cvs checkout apache-1.X/Announcement</STRONG></CODE><BR> - <CODE><STRONG>$ cd apache-1.X</STRONG></CODE><BR> + <CODE><STRONG>$ cvs checkout apache-1.<EM>X</EM>/Announcement</STRONG></CODE><BR> + <CODE><STRONG>$ cd apache-1.<EM>X</EM></STRONG></CODE><BR> <CODE><STRONG>$ vi Announcement</STRONG></CODE><BR> <CODE><STRONG>$ cvs commit Announcement</STRONG></CODE><BR> <CODE><STRONG>$ cd ..</STRONG></CODE><BR> - <CODE><STRONG>$ cvs release -d apache-1.X</STRONG></CODE> + <CODE><STRONG>$ cvs release -d apache-1.<EM>X</EM></STRONG></CODE> <P> <STRONG>Note:</STRONG> This document is also present in the <CODE>apache-site/dist/</CODE> directory, both in HTML and plain @@ -124,34 +124,29 @@ <OL> <HR> <LI> Checkout the Apache source if needed into a scratch directory:<BR> - <CODE><STRONG>$ cvs checkout apache-1.X</STRONG></CODE> + <CODE><STRONG>$ cvs checkout apache-1.<EM>X</EM></STRONG></CODE> <P> -<LI> cd into the <CODE>apache-1.X</CODE> CVS tree.<BR> - <CODE><STRONG>$ cd apache-1.X</STRONG></CODE> +<LI> cd into the <CODE>apache-1.<EM>X</EM></CODE> CVS tree.<BR> + <CODE><STRONG>$ cd apache-1.<EM>X</EM></STRONG></CODE> <P> <HR> <STRONG>[ Only for final releases, not for internal pre-releases ]</STRONG><BR> <P> <LI> Change <CODE>SERVER_VERSION</CODE> in <TT>src/include/httpd.h</TT> - from ``<CODE>Apache/1.X.Y-dev</CODE>'' to - ``<CODE>Apache/1.X.Y</CODE>''. Then also change + from ``<CODE>Apache/1.<EM>X.Y</EM>-dev</CODE>'' to + ``<CODE>Apache/1.<EM>X.Y</EM></CODE>''. Then also change <CODE>APACHE_RELEASE</CODE> in the same file from - ``<CODE>1XXYYZZ</CODE>'' to ``<CODE>1XXYY<STRONG>99</STRONG></CODE>''. + ``<CODE>1<EM>XXYYZZ</EM></CODE>'' to ``<CODE>1<EM>XXYY</EM><STRONG>99</STRONG></CODE>''. The format is something like <CODE>printf("%d%02d%02d%02d", major, minor, bugfix, betaseq)</CODE>. <BR> Also update the Windows registry key: edit <SAMP>src/os/win32/registry.c</SAMP> and change the - <CODE>VERSION</CODE> from <CODE>"1.X.Y dev"</CODE> to the - string <CODE>"1.X.Y"</CODE>.<BR> Additionally make sure the - Configure script's version knowledge for the - <CODE>SHARED_CORE</CODE> reflects the correct - version.revision.patchlevel triple. Look for the line ``<CODE>V=1 R=3 - P=2</CODE>'' inside <CODE>src/Configure</CODE> and adjust it accordingly. + <CODE>VERSION</CODE> from <CODE>"1.<EM>X.Y</EM> dev"</CODE> to the + string <CODE>"1.<EM>X.Y</EM>"</CODE>. <BR> <CODE><STRONG>$ vi src/include/httpd.h</STRONG></CODE><BR> <CODE><STRONG>$ vi src/os/win32/registry.c</STRONG></CODE><BR> - <CODE><STRONG>$ vi src/Configure</STRONG></CODE><BR> <CODE><STRONG>$ cvs commit src/include/httpd.h src/os/win32/registry.c src/Configure</STRONG></CODE> <P> <LI> Make sure your PGP keys are already present in the <CODE>KEYS</CODE> @@ -167,20 +162,20 @@ <STRONG>[ For all releases ]</STRONG><BR> <P> <LI> Make an export version of the distribution: (this creates a second - subdirectory <CODE>apache-1.X.Y</CODE> for the exported version - beside the existing CVS tree in <CODE>apache-1.X</CODE>)<BR> + subdirectory <CODE>apache-1.<EM>X.Y</EM></CODE> for the exported version + beside the existing CVS tree in <CODE>apache-1.<EM>X</EM></CODE>)<BR> <CODE><STRONG>$ cd ..</STRONG></CODE><BR> <CODE><STRONG>$ umask 022</STRONG></CODE><BR> - <CODE><STRONG>$ cvs export -r APACHE_1_X_Y -d apache_1.X.Y apache-1.X</STRONG></CODE><BR> - <CODE><STRONG>$ cd apache_1.X.Y</STRONG></CODE><BR> + <CODE><STRONG>$ cvs export -r APACHE_1_X_Y -d apache_1.<EM>X.Y</EM> apache-1.<EM>X</EM></STRONG></CODE><BR> + <CODE><STRONG>$ cd apache_1.<EM>X.Y</EM></STRONG></CODE><BR> <UL> <LI><FONT COLOR="red">Note:</FONT> There is a known problem using <CODE>cvs export</CODE> remotely with <CODE>cvs-1.9</CODE> and later. If this affects you, you will need to do a checkout instead:<BR> <CODE><STRONG>$ umask 022</STRONG></CODE><BR> - <CODE><STRONG>$ cvs checkout -r APACHE_1_X_Y -d apache_1.X.Y apache-1.X</STRONG></CODE><BR> - <CODE><STRONG>$ cd apache_1.X.Y</STRONG></CODE><BR> + <CODE><STRONG>$ cvs checkout -r APACHE_1_X_Y -d apache_1.<EM>X.Y</EM> apache-1.<EM>X</EM></STRONG></CODE><BR> + <CODE><STRONG>$ cd apache_1.<EM>X.Y</EM></STRONG></CODE><BR> </UL> <P> <LI> Create <CODE>src/Configuration</CODE> file:<BR> @@ -191,8 +186,7 @@ the developer's test subdirectories:<BR> <CODE><STRONG>$ rm STATUS RULES.CVS src/INDENT</STRONG></CODE><BR> <CODE><STRONG>$ find . -name ".cvsignore" -exec rm {} \;</STRONG></CODE><BR> - <CODE><STRONG>$ rm -rf src/test</STRONG></CODE><BR> - <CODE><STRONG>$ rm -rf src/modules/test</STRONG></CODE> + <CODE><STRONG>$ rm -rf src/test src/modules/test</STRONG></CODE> <UL> <LI><FONT COLOR="red">Note:</FONT> If you needed to do a <CODE>checkout</CODE> instead of a <CODE>export</CODE>, you @@ -207,44 +201,45 @@ <CODE><STRONG>$ cd ../../..</STRONG></CODE> <P> <LI> Roll the distribution tarball:<BR> - <CODE><STRONG>$ tar cvf apache_1.X.Y.tar apache_1.X.Y</STRONG></CODE><BR> + <CODE><STRONG>$ tar cvf apache_1.<EM>X.Y</EM>.tar apache_1.<EM>X.Y</EM></STRONG></CODE><BR> <P> <LI> Make the final packed distribution files:<BR> - <CODE><STRONG>$ cp -p apache_1.X.Y.tar xapache_1.X.Y.tar</STRONG></CODE><BR> - <CODE><STRONG>$ gzip -9 apache_1.X.Y.tar</STRONG></CODE><BR> - <CODE><STRONG>$ mv xapache_1.X.Y.tar apache_1.X.Y.tar</STRONG></CODE><BR> - <CODE><STRONG>$ compress apache_1.X.Y.tar</STRONG></CODE><BR> + <CODE><STRONG>$ cp -p apache_1.<EM>X.Y</EM>.tar xapache_1.<EM>X.Y</EM>.tar</STRONG></CODE><BR> + <CODE><STRONG>$ gzip -9 apache_1.<EM>X.Y</EM>.tar</STRONG></CODE><BR> + <CODE><STRONG>$ mv xapache_1.<EM>X.Y</EM>.tar apache_1.<EM>X.Y</EM>.tar</STRONG></CODE><BR> + <CODE><STRONG>$ compress apache_1.<EM>X.Y</EM>.tar</STRONG></CODE><BR> <P> <LI> Test the packed tar files and check for errors:<BR> - <CODE><STRONG>$ gunzip -c apache_1.X.Y.tar.gz | tar tvf -</STRONG></CODE><BR> - <CODE><STRONG>$ zcat apache_1.X.Y.tar.Z | tar tvf -</STRONG></CODE><BR> + <CODE><STRONG>$ gunzip -c apache_1.<EM>X.Y</EM>.tar.gz | tar tvf -</STRONG></CODE><BR> + <CODE><STRONG>$ zcat apache_1.<EM>X.Y</EM>.tar.Z | tar tvf -</STRONG></CODE><BR> <P> <LI> Sign the distribution files:<BR> - <CODE><STRONG>$ pgp -sba apache_1.X.Y.tar.gz</STRONG></CODE><BR> - <CODE><STRONG>$ pgp -sba apache_1.X.Y.tar.Z</STRONG></CODE><BR> + <CODE><STRONG>$ pgp -sba apache_1.<EM>X.Y</EM>.tar.gz</STRONG></CODE><BR> + <CODE><STRONG>$ pgp -sba apache_1.<EM>X.Y</EM>.tar.Z</STRONG></CODE><BR> <UL> <LI><FONT COLOR="red">Note:</FONT> Be sure your PGP key is already in the <CODE>KEYS</CODE> file!<BR> </UL> <P> <LI> Test the tarball signatures:<BR> - <CODE><STRONG>$ pgp apache_1.X.Y.tar.gz.asc apache_1.X.Y.tar.gz</STRONG></CODE><BR> - <CODE><STRONG>$ pgp apache_1.X.Y.tar.Z.asc apache_1.X.Y.tar.Z</STRONG></CODE><BR> + <CODE><STRONG>$ pgp apache_1.<EM>X.Y</EM>.tar.gz.asc apache_1.<EM>X.Y</EM>.tar.gz</STRONG></CODE><BR> + <CODE><STRONG>$ pgp apache_1.<EM>X.Y</EM>.tar.Z.asc apache_1.<EM>X.Y</EM>.tar.Z</STRONG></CODE><BR> <P> <LI> Remember the CHANGES file:<BR> - <CODE><STRONG>$ cp apache_1.X.Y/src/CHANGES .</STRONG></CODE> + <CODE><STRONG>$ cp apache_1.<EM>X.Y</EM>/src/CHANGES .</STRONG></CODE> <P> <LI> Cleanup:<BR>(this deletes the export tree: it is now no longer required. We still need the CVS tree, see below)<BR> - <CODE><STRONG>$ rm -fr apache_1.X.Y</STRONG></CODE> + <CODE><STRONG>$ rm -fr apache_1.<EM>X.Y</EM></STRONG></CODE> <P> <LI> Make the tarball available for testing purposes (in <A HREF="http://dev.apache.org/dist/">http://dev.apache.org/dist/</A>):<BR> - <CODE><STRONG>$ chmod 664 CHANGES apache_1.X.Y.tar.*</STRONG></CODE><BR> - <CODE><STRONG>$ cp apache_1.X.Y.tar.gz /pub/httpd/dist</STRONG></CODE><BR> - <CODE><STRONG>$ cp apache_1.X.Y.tar.gz.asc /pub/httpd/dist</STRONG></CODE><BR> - <CODE><STRONG>$ cp apache_1.X.Y.tar.Z /pub/httpd/dist</STRONG></CODE><BR> - <CODE><STRONG>$ cp apache_1.X.Y.tar.Z.asc /pub/httpd/dist</STRONG></CODE><BR> + <CODE><STRONG>$ chmod 664 CHANGES apache_1.<EM>X.Y</EM>.tar.*</STRONG></CODE><BR> + <CODE><STRONG>$ cp apache_1.<EM>X.Y</EM>.tar.gz /pub/httpd/dist/</STRONG></CODE><BR> + <CODE><STRONG>$ cp apache_1.<EM>X.Y</EM>.tar.gz.asc /pub/httpd/dist/</STRONG></CODE><BR> + <CODE><STRONG>$ cp apache_1.<EM>X.Y</EM>.tar.Z /pub/httpd/dist/</STRONG></CODE><BR> + <CODE><STRONG>$ cp apache_1.<EM>X.Y</EM>.tar.Z.asc /pub/httpd/dist/</STRONG></CODE><BR> + <CODE><STRONG>$ chmod g+w /pub/httpd/dist/apache_1.<EM>X.Y</EM>.tar.*</STRONG></CODE><BR> <UL> <LI><FONT COLOR="red">Note:</FONT> If rolling the tarball remotely, you should use <CODE>scp</CODE> to place them @@ -256,26 +251,36 @@ <STRONG>[ Only for final releases, not for internal pre-releases ]</STRONG><BR> <P> <LI> cd back into the CVS tree location.<BR> - <CODE><STRONG>$ cd apache-1.X</STRONG></CODE> + <CODE><STRONG>$ cd apache-1.<EM>X</EM></STRONG></CODE> <P> <LI> Change <CODE>SERVER_VERSION</CODE> in <CODE>src/include/httpd.h</CODE> - from ``<CODE>Apache/1.X.Y</CODE>'' to - ``<CODE>Apache/1.X.(Y+1)-dev</CODE>'' and change - <CODE>APACHE_RELEASE</CODE> to <CODE>1XX(YY+1)01</CODE>.<BR> + from ``<CODE>Apache/1.<EM>X.Y</EM></CODE>'' to + ``<CODE>Apache/1.<EM>X.(Y+1)</EM>-dev</CODE>'' and change + <CODE>APACHE_RELEASE</CODE> to <CODE>1<EM>XX(YY+1)</EM>01</CODE>.<BR> In the <CODE>VERSION</CODE> macro in <SAMP>src/os/win32/registry.c</SAMP>, increase the version number and re-insert the `` dev'' suffix (change the string - ``<CODE>1.X.Y</CODE>'' to ``<CODE>1.X.(Y+1) dev</CODE>''; note + ``<CODE>1.<EM>X.Y</EM></CODE>'' to ``<CODE>1.<EM>X.(Y+1)</EM> dev</CODE>''; note the SPACE character instead of the hyphen).<BR> - <CODE><STRONG>$ vi src/include/httpd.h src/os/win32/registry.c</STRONG></CODE><BR> - <CODE><STRONG>$ cvs commit src/include/httpd.h src/os/win32/registry.c</STRONG></CODE><BR> + <BR> Additionally make sure that the + Configure script's version knowledge for the + <CODE>SHARED_CORE</CODE> reflects the new + version.revision.patchlevel triple. + Look for the line ``<CODE>V=1 R=<EM>X</EM> P=<EM>Y</EM></CODE>'' + inside <CODE>src/Configure</CODE> and adjust it accordingly.<BR> + <CODE><STRONG>$ vi src/include/httpd.h \<BR> + src/os/win32/registry.c \<BR> + src/Configure</STRONG></CODE><BR> + <CODE><STRONG>$ cvs commit src/include/httpd.h \<BR> + src/os/win32/registry.c \<BR> + src/Configure</STRONG></CODE><BR> <CODE><STRONG>$ cd ..</STRONG></CODE><BR> <P> <HR> <LI> Cleanup:<BR> (delete the CVS tree, after verification that it does not contain any uncommitted changes)<BR> - <CODE><STRONG>$ cvs release -d apache-1.X</STRONG></CODE> + <CODE><STRONG>$ cvs release -d apache-1.<EM>X</EM></STRONG></CODE> <P> <STRONG>[ Now wait for the group to test and approve the tarball ]</STRONG> <HR> @@ -288,11 +293,11 @@ <P> <LI> Make the distribution available (in <A HREF="http://www.apache.org/dist/">http://www.apache.org/dist/</A>):<BR> - <CODE><STRONG>$ cp CHANGES /pub/apache/dist/CHANGES_1.X</STRONG></CODE><BR> - <CODE><STRONG>$ cp apache_1.X.Y.tar.gz /pub/apache/dist</STRONG></CODE><BR> - <CODE><STRONG>$ cp apache_1.X.Y.tar.gz.asc /pub/apache/dist</STRONG></CODE><BR> - <CODE><STRONG>$ cp apache_1.X.Y.tar.Z /pub/apache/dist</STRONG></CODE><BR> - <CODE><STRONG>$ cp apache_1.X.Y.tar.Z.asc /pub/apache/dist</STRONG></CODE><BR> + <CODE><STRONG>$ cp CHANGES /pub/apache/dist/CHANGES_1.<EM>X</EM></STRONG></CODE><BR> + <CODE><STRONG>$ cp apache_1.<EM>X.Y</EM>.tar.gz /pub/apache/dist</STRONG></CODE><BR> + <CODE><STRONG>$ cp apache_1.<EM>X.Y</EM>.tar.gz.asc /pub/apache/dist</STRONG></CODE><BR> + <CODE><STRONG>$ cp apache_1.<EM>X.Y</EM>.tar.Z /pub/apache/dist</STRONG></CODE><BR> + <CODE><STRONG>$ cp apache_1.<EM>X.Y</EM>.tar.Z.asc /pub/apache/dist</STRONG></CODE><BR> <UL> <LI><FONT COLOR="red">Note:</FONT> If rolling the tarball remotely, you should use <CODE>scp</CODE> to place them @@ -343,7 +348,7 @@ dist/.htaccess</STRONG></CODE> <P> <LI> Create an empty directory for future patches:<BR> - <CODE><STRONG>$ mkdir patches/apply_to_1.X.Y</STRONG></CODE> + <CODE><STRONG>$ mkdir patches/apply_to_1.<EM>X.Y</EM></STRONG></CODE> </OL> <P> @@ -370,8 +375,8 @@ \r\n) <P> <LI>Create a zipfile, using your favorite zip program, containing the - <CODE>apache_1.X.Y</CODE> directory. Name this zipfile - <CODE>apache_1.X.Y-src.zip</CODE>. + <CODE>apache_1.<EM>X.Y</EM></CODE> directory. Name this zipfile + <CODE>apache_1.<EM>X.Y</EM>-src.zip</CODE>. <P> <HR> @@ -384,31 +389,31 @@ <CODE><STRONG>> nmake /f Makefile.nt installr</STRONG></CODE> <P> <LI>Rename the directory<BR> - <CODE><STRONG>> move \Apache \Apache_1.X.Y</STRONG></CODE> + <CODE><STRONG>> move \Apache \Apache_1.<EM>X.Y</EM></STRONG></CODE> <P> <LI>Move the configuration files into the correct place<BR> <CODE><STRONG>> copy conf\access.conf-dist-win - \Apache_1.X.Y\access.conf-dist</STRONG></CODE><BR> + \Apache_1.<EM>X.Y</EM>\access.conf-dist</STRONG></CODE><BR> <CODE><STRONG>> copy conf\httpd.conf-dist-win - \Apache_1.X.Y\httpd.conf-dist</STRONG></CODE><BR> + \Apache_1.<EM>X.Y</EM>\httpd.conf-dist</STRONG></CODE><BR> <CODE><STRONG>> copy conf\srm.conf-dist-win - \Apache_1.X.Y\srm.conf-dist</STRONG></CODE><BR> + \Apache_1.<EM>X.Y</EM>\srm.conf-dist</STRONG></CODE><BR> <CODE><STRONG>> copy conf\mime.types - \Apache_1.X.Y\mime.types</STRONG></CODE><BR> + \Apache_1.<EM>X.Y</EM>\mime.types</STRONG></CODE><BR> <CODE><STRONG>> copy conf\magic - \Apache_1.X.Y\magic</STRONG></CODE> + \Apache_1.<EM>X.Y</EM>\magic</STRONG></CODE> <P> <LI>Move the HTML documents into place<BR> - <CODE><STRONG>> copy htdocs \Apache_1.X.Y\htdocs /s</STRONG></CODE> + <CODE><STRONG>> copy htdocs \Apache_1.<EM>X.Y</EM>\htdocs /s</STRONG></CODE> <P> <LI>Copy the readme file<BR> - <CODE><STRONG>> copy README.NT \Apache_1.X.Y\readme.txt</STRONG></CODE> + <CODE><STRONG>> copy README.NT \Apache_1.<EM>X.Y</EM>\readme.txt</STRONG></CODE> <P> <LI>Install the Visual C++ runtime DLLs, wherever it is they need to go (???) <P> - <LI>Create a zipfile of <CODE>\Apache_1.X.Y</CODE> named - <CODE>apache_1.X.Y-bin.zip</CODE>. + <LI>Create a zipfile of <CODE>\Apache_1.<EM>X.Y</EM></CODE> named + <CODE>apache_1.<EM>X.Y</EM>-bin.zip</CODE>. </OL>