httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-devsite how-to-release.html
Date Wed, 20 Dec 2000 16:16:25 GMT
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 @@
        <br>
        <code><b>$ cvs checkout -d htdocs httpd-docs-1.3/htdocs</b></code>
     <P>
  - <LI> cd into the <CODE>apache-1.<EM>X</EM></CODE> CVS tree.<BR>
  -     <CODE><B>$ cd apache-1.<EM>X</EM></B></CODE>
  +     For Apache 2.0:<BR>
  +     <CODE><B>$ cvs checkout -P httpd-2.<EM>X</EM></B></CODE>
  +     <br>
  +     <code><b>$ cd httpd-2.<i>X</i>/srclib</b></code>
  +     <br>
  +     <code><b>$ cvs checkout apr apr-util</b></code>
  +  <P>
  + <LI> cd into the <CODE>apache</CODE> CVS tree.<BR>
  +     <CODE><B>$ cd apache-1.<EM>X</EM></B></CODE><BR>
  +     or<BR>
  +     <CODE><B>$ cd httpd-2.<EM>X</EM></B></CODE>
     <P><b>[ Adjusting Announcement to taste ]</b><br>
    <LI>
     <p>
  @@ -82,7 +91,8 @@
     <HR>
     <B>[ Only for final releases, not for internal pre-releases ]</B><BR>
     <P>
  - <LI> Change <CODE>SERVER_VERSION</CODE> in <TT>src/include/httpd.h</TT>
  + <LI> For Apache 1.3<BR>
  +      Change <CODE>SERVER_VERSION</CODE> in <TT>src/include/httpd.h</TT>
   	 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
  @@ -93,6 +103,12 @@
        <CODE><B>$ vi src/include/httpd.h</B></CODE><BR>
        <CODE><B>$ cvs commit src/include/httpd.h</B></CODE>
     <P>
  +     For Apache 2.0:<BR>
  +     Change <CODE>SERVER_BASEREVISION</CODE> in <TT>include/httpd.h</TT>
  +     from ``<CODE>2.<EM>X</EM>-dev</CODE>'' to ``<CODE>2.<EM>X</EM></CODE>''.
  +     Then also change <CODE>APACHE_RELEASE</CODE> in the same file from
  +     ``<CODE>2<EM>XXYY0</EM>00</CODE>'' to ``<CODE>2<EM>XXYY1</EM>00</CODE>''.
  +  <P>
    <LI> Make sure your PGP keys are already present in the <CODE>KEYS</CODE>
        file. If they are not, extract your public key using the
        ``<CODE>pgp&nbsp;-kxa</CODE>'' command, add them to the
  @@ -100,20 +116,22 @@
     <P>
    <LI> Tag the sources for this release:<BR>
        (<EM>note: be sure to tag the whole thing, not just <CODE>src</CODE></EM>!)<BR>
  -     <CODE><B>$ cvs tag APACHE_1_<EM>X_Y</EM></B></CODE>
  +     <CODE><B>$ cvs tag APACHE_1_<EM>X_Y</EM></B></CODE><BR>
  +     For Apache 2.0:<BR>
  +     <CODE><B>$ cvs tag APACHE_2_<EM>X_Y</EM></B></CODE>
     <P>
     <HR>
     <B>[ For all releases ]</B><BR>
     <P>
    <LI> Make an export version of the distribution: (this creates a second
  -     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>
  +     subdirectory <CODE>apache-Z.<EM>X.Y</EM></CODE> for the exported
version
  +     beside the existing CVS tree in <CODE>apache-Z.<EM>X</EM></CODE>)<BR>
  +     For Apache 1.3:<BR>
        <CODE><B>$ cd ..</B></CODE><BR>
        <CODE><B>$ umask 022</B></CODE><BR>
        <CODE><B>$ cvs export -r APACHE_1_<EM>X_Y</EM> -d apache_1.<EM>X.Y</EM>
apache-1.<EM>X</EM></B></CODE><BR>
        <CODE><B>$ cd apache_1.<EM>X.Y</EM></B></CODE><BR>
        <code><b>$ cvs export -r APACHE_1_<i>X_Y</i> -d htdocs httpd-docs-1.3/htdocs</code>
  -     
     <UL>
        
   	<LI><FONT COLOR="red">Note:</FONT> There is a known problem
  @@ -126,6 +144,27 @@
        <code><b>$ cvs checkout -r APACHE_1<i>X_Y</i> -d htdocs httpd-docs-1.3/htdocs</b></code>
        
     </UL>
  +
  +     <P>
  +     For Apache 2.0:<BR>
  +     <CODE><B>$ cd ..</B></CODE><BR>
  +     <CODE><B>$ umask 022</B></CODE><BR>
  +     <CODE><B>$ cvs export -r APACHE_2_<EM>X_Y</EM> -d apache_2.<EM>X.Y</EM>
httpd-2.<EM>X</EM></B></CODE><BR>
  +     <CODE><B>$ cd apache_2.<EM>X.Y</EM>/srclib</B></CODE><BR>
  +     <code><b>$ cvs export -r APACHE_2_<i>X_Y</i> apr apr-util</code>
  +
  +  <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><B>$ umask 022</B></CODE><BR>
  +     <CODE><B>$ cvs checkout -r APACHE_2_<EM>X_Y</EM> -d apache_2.<EM>X.Y</EM>
httpd-2.<EM>X</EM></B></CODE><BR>
  +     <CODE><B>$ cd apache_2.<EM>X.Y</EM>/srclib</B></CODE><BR>
  +     <code><b>$ cvs checkout -r APACHE_2<i>X_Y</i> apr apr-util</b></code>
  +     
  +  </UL>
     <P>
    <LI> Make sure the master site's FAQ is up-to-date:<br>
        <code><b>$ (cd /www/www.apache.org/docs/misc ; cvs update)</b></code>
  @@ -134,17 +173,29 @@
        <code><b>$ lynx -source http://www.apache.org/docs/misc/FAQ.html
        &gt; htdocs/manual/misc/FAQ.html</b></code>
     <p>
  - <LI> Create <CODE>src/Configuration</CODE> file: (1.3.x only)<BR>
  +
  + <LI> For Apache 1.3:<BR>
  +      Create <CODE>src/Configuration</CODE> file: (1.3.x only)<BR>
        <CODE><B>$ cp src/Configuration.tmpl src/Configuration</B></CODE>
     <P>
  +      For Apache 2.0:<BR>
  +      Create <CODE>./configure</CODE> file, and remove all symlinks<BR>
  +     <CODE><B>$ ./buildconf</B></CODE><BR>
  +     <CODE><B>$ rm -f ltconfig ltmain.sh config.sub config.guess</B></CODE><BR>
  +     <CODE><B>$ cp /usr/local/share/libtool/ltconfig .</B></CODE><BR>
  +     <CODE><B>$ cp /usr/local/share/libtool/ltmain.sh .</B></CODE><BR>
  +     <CODE><B>$ cp /usr/local/share/libtool/config.sub .</B></CODE><BR>
  +     <CODE><B>$ cp /usr/local/share/libtool/config.guess .</B></CODE><BR>
  +  <P>
    <LI> Remove <CODE>STATUS</CODE>, <CODE>RULES.CVS</CODE>,

        <CODE>src/INDENT</CODE>, the multi-part FAQ, various
        <CODE>.cvsignore</CODE> and
  -     the developer's test subdirectories:<BR>
  +     the developer's test subdirectories.  Depending on which version you
  +     are releasing, not all of these files will be in the repository:<BR>
        <CODE><B>$ rm STATUS RULES.CVS src/INDENT
         htdocs/manual/misc/FAQ-*.html</B></CODE><BR>
        <CODE><B>$ find . -name ".cvsignore" -exec rm {} \;</B></CODE><BR>
  -     <CODE><B>$ rm -rf src/test src/modules/test</B></CODE>
  +     <CODE><B>$ find . -type d -name "test" -exec rm -Rf {} \;</B></CODE>
   
     <UL>
   
  @@ -162,21 +213,21 @@
        <CODE><B>$ cd ../../..</B></CODE>
     <P>
    <LI> Roll the distribution tarball:<BR>
  -     <CODE><B>$ tar cvf apache_1.<EM>X.Y</EM>.tar apache_1.<EM>X.Y</EM></B></CODE><BR>
  +     <CODE><B>$ tar cvf apache_<EM>Z.X.Y</EM>.tar apache_<EM>Z.X.Y</EM></B></CODE><BR>
     <P>
    <LI> Make the final packed distribution files:<BR>
  -     <CODE><B>$ cp -p apache_1.<EM>X.Y</EM>.tar xapache_1.<EM>X.Y</EM>.tar</B></CODE><BR>
  -     <CODE><B>$ gzip -9 apache_1.<EM>X.Y</EM>.tar</B></CODE><BR>
  -     <CODE><B>$ mv xapache_1.<EM>X.Y</EM>.tar apache_1.<EM>X.Y</EM>.tar</B></CODE><BR>
  -     <CODE><B>$ compress apache_1.<EM>X.Y</EM>.tar</B></CODE><BR>
  +     <CODE><B>$ cp -p apache_<EM>Z.X.Y</EM>.tar xapache_<EM>Z.X.Y</EM>.tar</B></CODE><BR>
  +     <CODE><B>$ gzip -9 apache_<EM>Z.X.Y</EM>.tar</B></CODE><BR>
  +     <CODE><B>$ mv xapache_<EM>Z.X.Y</EM>.tar apache_<EM>Z.X.Y</EM>.tar</B></CODE><BR>
  +     <CODE><B>$ compress apache_<EM>Z.X.Y</EM>.tar</B></CODE><BR>
     <P>
    <LI> Test the packed tar files and check for errors:<BR>
  -     <CODE><B>$ gunzip -c apache_1.<EM>X.Y</EM>.tar.gz | tar tvf
-</B></CODE><BR>
  -     <CODE><B>$ zcat apache_1.<EM>X.Y</EM>.tar.Z | tar tvf -</B></CODE><BR>
  +     <CODE><B>$ gunzip -c apache_<EM>Z.X.Y</EM>.tar.gz | tar tvf
-</B></CODE><BR>
  +     <CODE><B>$ zcat apache_<EM>Z.X.Y</EM>.tar.Z | tar tvf -</B></CODE><BR>
     <P>
    <LI> Sign the distribution files:<BR>
  -     <CODE><B>$ pgp -sba apache_1.<EM>X.Y</EM>.tar.gz</B></CODE><BR>
  -     <CODE><B>$ pgp -sba apache_1.<EM>X.Y</EM>.tar.Z</B></CODE><BR>
  +     <CODE><B>$ pgp -sba apache_<EM>Z.X.Y</EM>.tar.gz</B></CODE><BR>
  +     <CODE><B>$ pgp -sba apache_<EM>Z.X.Y</EM>.tar.Z</B></CODE><BR>
        
     <UL>
   	 
  @@ -186,25 +237,25 @@
     </UL>
     <P>
    <LI> Test the tarball signatures:<BR>
  -     <CODE><B>$ pgp apache_1.<EM>X.Y</EM>.tar.gz.asc apache_1.<EM>X.Y</EM>.tar.gz</B></CODE><BR>
  -     <CODE><B>$ pgp apache_1.<EM>X.Y</EM>.tar.Z.asc apache_1.<EM>X.Y</EM>.tar.Z</B></CODE><BR>
  +     <CODE><B>$ pgp apache_<EM>Z.X.Y</EM>.tar.gz.asc apache_<EM>Z.X.Y</EM>.tar.gz</B></CODE><BR>
  +     <CODE><B>$ pgp apache_<EM>Z.X.Y</EM>.tar.Z.asc apache_<EM>Z.X.Y</EM>.tar.Z</B></CODE><BR>
     <P>
    <LI> Remember the CHANGES file:<BR>
  -     <CODE><B>$ cp apache_1.<EM>X.Y</EM>/src/CHANGES .</B></CODE>
  +     <CODE><B>$ cp apache_<EM>Z.X.Y</EM>/src/CHANGES .</B></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><B>$ rm -fr apache_1.<EM>X.Y</EM></B></CODE>
  +     <CODE><B>$ rm -fr apache_<EM>Z.X.Y</EM></B></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><B>$ chmod 664 CHANGES apache_1.<EM>X.Y</EM>.tar.*</B></CODE><BR>
  -     <CODE><B>$ cp apache_1.<EM>X.Y</EM>.tar.gz /www/dev.apache.org/dist/</B></CODE><BR>
  -     <CODE><B>$ cp apache_1.<EM>X.Y</EM>.tar.gz.asc /www/dev.apache.org/dist/</B></CODE><BR>
  -     <CODE><B>$ cp apache_1.<EM>X.Y</EM>.tar.Z /www/dev.apache.org/dist/</B></CODE><BR>
  -     <CODE><B>$ cp apache_1.<EM>X.Y</EM>.tar.Z.asc /www/dev.apache.org/dist/</B></CODE><BR>
  -     <CODE><B>$ chmod g+w /www/dev.apache.org/dist/apache_1.<EM>X.Y</EM>.tar.*</B></CODE><BR>
  +     <CODE><B>$ chmod 664 CHANGES apache_<EM>Z.X.Y</EM>.tar.*</B></CODE><BR>
  +     <CODE><B>$ cp apache_<EM>Z.X.Y</EM>.tar.gz /www/dev.apache.org/dist/</B></CODE><BR>
  +     <CODE><B>$ cp apache_<EM>Z.X.Y</EM>.tar.gz.asc /www/dev.apache.org/dist/</B></CODE><BR>
  +     <CODE><B>$ cp apache_<EM>Z.X.Y</EM>.tar.Z /www/dev.apache.org/dist/</B></CODE><BR>
  +     <CODE><B>$ cp apache_<EM>Z.X.Y</EM>.tar.Z.asc /www/dev.apache.org/dist/</B></CODE><BR>
  +     <CODE><B>$ chmod g+w /www/dev.apache.org/dist/apache_<EM>Z.X.Y</EM>.tar.*</B></CODE><BR>
        
     <UL>
        
  @@ -219,9 +270,10 @@
     <B>[ Only for final releases, not for internal pre-releases ]</B><BR>
     <P>
    <LI> cd back into the CVS tree location.<BR>
  -     <CODE><B>$ cd apache-1.<EM>X</EM></B></CODE>
  +     <CODE><B>$ cd apache-<EM>Z.X</EM></B></CODE>
     <P>
  - <LI> Change <CODE>SERVER_VERSION</CODE> in <CODE>src/include/httpd.h</CODE>
  + <LI> For Apache 1.3:<BR>
  +      Change <CODE>SERVER_VERSION</CODE> in <CODE>src/include/httpd.h</CODE>
   	 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>000</CODE>.<BR>
  @@ -242,11 +294,26 @@
   	     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;src/CHANGES</B></CODE><BR>
        <CODE><B>$ cd ..</B></CODE><BR>
     <P>
  +     For Apache 2.0:<BR>
  +     Change <CODE>SERVER_BASEREVERSION</CODE> in <CODE>include/httpd.h</CODE>
  +	 from ``<CODE>2.<EM>X.Y</EM></CODE>'' to
  +	 ``<CODE>2.<EM>X.(Y+1)</EM>-dev</CODE>'' and change
  +	 <CODE>APACHE_RELEASE</CODE> to <CODE>1<EM>XX(YY+1)</EM>000</CODE>.<BR>
  +     Finally, add a new line
  +         ``<CODE>Changes with Apache 1.<EM>X.(Y+1)</EM>:</CODE>''
to the
  +	 head of the <SAMP>CHANGES</SAMP> file for the
  +	 forthcoming fixes in the new version.<BR>
  +     <CODE><B>$ vi include/httpd.h \<BR>
  +	     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;src/CHANGES</B></CODE><BR>
  +     <CODE><B>$ cvs commit include/httpd.h \<BR>
  +	     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CHANGES</B></CODE><BR>
  +     <CODE><B>$ cd ..</B></CODE><BR>
  +  <P>
     <HR>
    <LI> Cleanup:<BR>
        (delete the CVS tree, after verification that it does not
        contain any uncommitted changes)<BR>
  -     <CODE><B>$ cvs release -d apache-1.<EM>X</EM></B></CODE>
  +     <CODE><B>$ cvs release -d apache-<EM>Z.X</EM></B></CODE>
     <P>
   <B>[ Now wait for the group to test and approve the tarball ]</B>
     <HR>
  @@ -258,12 +325,13 @@
   
     <P>
    <LI> Make the distribution available
  -     (in <A HREF="http://www.apache.org/dist/">http://www.apache.org/dist/</A>):<BR>
  -     <CODE><B>$ cp CHANGES /www/www.apache.org/dist/CHANGES_1.<EM>X</EM></B></CODE><BR>
  -     <CODE><B>$ cp apache_1.<EM>X.Y</EM>.tar.gz /www/www.apache.org/dist</B></CODE><BR>
  -     <CODE><B>$ cp apache_1.<EM>X.Y</EM>.tar.gz.asc /www/www.apache.org/dist</B></CODE><BR>
  -     <CODE><B>$ cp apache_1.<EM>X.Y</EM>.tar.Z /www/www.apache.org/dist</B></CODE><BR>
  -     <CODE><B>$ cp apache_1.<EM>X.Y</EM>.tar.Z.asc /www/www.apache.org/dist</B></CODE><BR>
  +     (in <A HREF="http://www.apache.org/dist/">http://www.apache.org/dist/</A>)
  +     Z is either 1 or 2:<BR>
  +     <CODE><B>$ cp CHANGES /www/www.apache.org/dist/CHANGES_<EM>Z.X</EM></B></CODE><BR>
  +     <CODE><B>$ cp apache_<EM>Z.X.Y</EM>.tar.gz /www/www.apache.org/dist</B></CODE><BR>
  +     <CODE><B>$ cp apache_<EM>Z.X.Y</EM>.tar.gz.asc /www/www.apache.org/dist</B></CODE><BR>
  +     <CODE><B>$ cp apache_<EM>Z.X.Y</EM>.tar.Z /www/www.apache.org/dist</B></CODE><BR>
  +     <CODE><B>$ cp apache_<EM>Z.X.Y</EM>.tar.Z.asc /www/www.apache.org/dist</B></CODE><BR>
        
     <UL>
        
  @@ -292,7 +360,8 @@
        from the <CODE>apache-site</CODE> CVS tree
        as required (all in the
        <A HREF="http://www.apache.org/dist/"><CODE>./dist</CODE></A>
  -     subdirectory). The <CODE>Announcement.*</CODE> files should be based on
the <CODE>Announcement</CODE> file in the tagged CVS tree:<BR>
  +     subdirectory). The <CODE>Announcement.*</CODE> files should be based on
the <CODE>Announcement</CODE> file in the tagged CVS tree.  For Apache 2.0,
  + <CODE>Announcement</CODE> should be replaced with <CODE>Announcement2</CODE>:<BR>
      
        <CODE><B>$ vi dist/README.html \<BR>
        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;dist/HEADER.html \<BR>
  
  
  

Mime
View raw message