cvs commit: httpd-2.0/build httpd_roll_release

[gr...@apache.org]

gregames    01/12/11 11:28:38

  Modified:    build    httpd_roll_release
  Log:
  revert back to using a "links" downloaded version of our FAQ with an
  up-to-date URL.  The FAQ included in httpd-2_0_28 isn't very pretty
  because it wasn't parsed by mod_include as part of the roll script.
  Add a comment explaining why this is necessary.
  
  with this change, there's no reason to run expand.pl twice.
  
  Revision  Changes    Path
  1.7       +5 -4      httpd-2.0/build/httpd_roll_release
  
  Index: httpd_roll_release
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/httpd_roll_release,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- httpd_roll_release	2001/11/10 01:34:13	1.6
  +++ httpd_roll_release	2001/12/11 19:28:38	1.7
  @@ -37,9 +37,11 @@
   echo "Updating the site's FAQ"
   (cd /www/httpd.apache.org/docs-2.0/faq/; cvs update)
   
  -# Now update the FAQ in the tarball
  +# Now update the FAQ in the tarball via a download from the master site.
  +# The FAQ contains SSI tags too complex for the expand.pl script to handle.
   rm -f docs/manual/faq/*.html
  -cp /www/httpd.apache.org/docs-2.0/faq/*.html docs/manual/faq/
  +links -source http://httpd.apache.org/docs-2.0/faq/index.html?ONEPAGE \
  +              > docs/manual/faq/index.html
   
   # Create the configure scripts
   echo "Creating the configure script"
  @@ -62,8 +64,7 @@
   
   echo >> $LOG_NAME
   echo "Making sure people can read the manual (expanding SSI's)" >> $LOG_NAME
  -# run expand.pl twice to handle the two levels of includes in docs/manual/
  -( cd docs/manual ; chmod +x expand.pl ; ./expand.pl ; ./expand.pl ; rm ./expand.pl ) >> $LOG_NAME
  +( cd docs/manual ; chmod +x expand.pl ; ./expand.pl ; rm ./expand.pl ) >> $LOG_NAME
   
   # Time to roll the tarball
   echo "Rolling the tarballs"