X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=maintainer-scripts%2Fupdate_web_docs;h=998885c6935aca3a969842e13467b1eb7cbbcfdf;hb=0ad895fb32c2c5c5f2d8c146834d5ddee545839b;hp=c9f8b6ee2ae99bd727f58309cbffe9d560301c2e;hpb=e25206651894d7f9009e82de603fd05cbd7d0dde;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/maintainer-scripts/update_web_docs b/maintainer-scripts/update_web_docs
index c9f8b6ee2ae..998885c6935 100755
--- a/maintainer-scripts/update_web_docs
+++ b/maintainer-scripts/update_web_docs
@@ -1,5 +1,8 @@
 #!/bin/sh -x
 
+# Generate HTML documentation from GCC Texinfo docs.
+# This version is for GCC 3.1 and later versions.
+
 # Run this from /tmp.
 CVSROOT=/cvs/gcc
 export CVSROOT
@@ -8,7 +11,7 @@ PATH=/usr/local/bin:$PATH
 
 WWWBASE=/www/gcc/htdocs
 WWWBASE_PREFORMATTED=/www/gcc/htdocs-preformatted
-PREPROCESS=/www/gcc/bin/preprocess
+WWWPREPROCESS='/www/gcc/bin/preprocess -r'
 
 # Process options -rrelease and -ddirectory
 RELEASE=""
@@ -71,9 +74,6 @@ fi
 
 if [ -z "$RELEASE" ]; then
   RELEASE=HEAD
-  DO_THANKS_HTML=y
-else
-  DO_THANKS_HTML=n
 fi
 
 WORKDIR=/tmp/gcc-doc-update.$$
@@ -87,23 +87,31 @@ cd $WORKDIR
 find $CVSROOT/gcc -name \*.texi,v -print | fgrep -v -f/home/gccadmin/scripts/doc_exclude | sed -e s#$CVSROOT/##g -e s#,v##g -e s#Attic/##g > FILES
 
 
-# Checkout all the texi files and get them into a single directory.
-# If we ever have texi files with the same name we'll have to do this
-# differently.
-cvs -Q co -r$RELEASE `cat FILES` gcc/gcc/doc/install.texi2html gcc/gcc/texinfo.tex gcc/gcc/doc/texinfo.tex
-mv `find . -name \*.texi -print` .
-mv `find . -name \*.tex -print` .
+# Checkout all the texi files.
+cvs -Q export -r$RELEASE `cat FILES` gcc/gcc/doc/install.texi2html gcc/gcc/doc/include/texinfo.tex
+
+# Build a tarball of the sources.
+tar cf docs-sources.tar gcc
+
+# The directory to pass to -I; this is the one with texinfo.tex
+# and fdl.texi.
+includedir=gcc/gcc/doc/include
+
+MANUALS="cpp cppinternals fastjar gcc gccint gcj g77 gnat_ug_unx gnat_ug_vms gnat_ug_vxw gnat_ug_wnt gnat-style gnat_rm libiberty porting"
 
 # Now convert the relevant files from texi to HTML and PostScript.
-for file in cpp chill cppinternals gcc gcj g77 objc-features porting; do
-  if [ -e ${file}.texi ]; then
-    /usr/local/bin/texi2html -glossary -menu -split_chapter ${file}.texi
-    texi2dvi ${file}.texi </dev/null && dvips -o ${file}.ps ${file}.dvi
+for file in $MANUALS; do
+  filename=`find . -name ${file}.texi`
+  if [ "${filename}" ]; then
+    makeinfo --html -I ${includedir} -I `dirname ${filename}` ${filename}
+    tar cf ${file}-html.tar ${file}/*.html
+    texi2dvi -I ${includedir} ${filename} </dev/null && dvips -o ${file}.ps ${file}.dvi
+    mkdir -p $DOCSDIR/$file
   fi
 done
 
-# Then build a gzipped copy of each of the resulting .html and .ps files
-for file in *.html *.ps; do
+# Then build a gzipped copy of each of the resulting .html, .ps and .tar files
+for file in */*.html *.ps *.tar; do
   cat $file | gzip --best > $file.gz
 done
 
@@ -112,60 +120,40 @@ done
 today=`date +%d`
 if test $today = 15; then
   find $DOCSDIR -type f -maxdepth 1 -print | grep -v index.html | xargs rm
+  for m in $MANUALS; do
+    rm $DOCSDIR/$m/*.html
+  done
 fi
 
-# And copy the resulting html files to the web server
-for file in *.html *.ps; do
+# And copy the resulting files to the web server
+for file in */*.html *.ps *.tar; do
   cat $DOCSDIR/$file | 
-    sed -e '/^<!-- Created on/d' \
-        -e '/^by <I>GCC Administrator<\/I> on/d' \
+    sed -e '/^<meta name=generator/d' \
         -e '/^%DVIPSSource:/d' > file1
   cat $file |
-    sed -e '/^<!-- Created on/d' \
-        -e '/^by <I>GCC Administrator<\/I> on/d' \
+    sed -e '/^<meta name=generator/d' \
         -e '/^%DVIPSSource:/d' > file2
   if cmp -s file1 file2; then
     :
   else
-    cp $file ${file}.gz $DOCSDIR
+    cp $file $DOCSDIR/$file
+    cp $file.gz $DOCSDIR/$file.gz
   fi
 done
 
-news_file=`grep "News About GNU Fortran" $DOCSDIR/g77_toc.html | sed -e '/HREF=.*[^.]/  s#^.*HREF="##g' | sed -e 's%#SEC.*%%g'`
-bugs_file=`grep "Known Causes of Trouble with GNU Fortran" $DOCSDIR/g77_toc.html | sed -e '/HREF=.*[^.]/  s#^.*HREF="##g' | sed -e 's%#SEC.*%%g'`
-contrib_file=`grep "Contributors to GCC" $DOCSDIR/gcc_toc.html | sed -e '/HREF=.*[^.]/  s#^.*HREF="##g' | sed -e 's%#SEC.*%%g'`
-
 cd $DOCSDIR
 
-rm -f g77_news.html
-rm -f g77_bugs.html
-rm -f g77_news.html.gz
-rm -f g77_bugs.html.gz
-ln $news_file g77_news.html
-ln $bugs_file g77_bugs.html
-ln ${news_file}.gz g77_news.html.gz
-ln ${bugs_file}.gz g77_bugs.html.gz
-
-if [ "$DO_THANKS_HTML" = y ]; then
-  cd $WWWBASE
-  rm -f thanks.html
-  rm -f thanks.html.gz
-  ln onlinedocs/$contrib_file thanks.html
-  ln onlinedocs/${contrib_file}.gz thanks.html.gz
-fi
-
 # Finally, generate the installation documentation (but only for CVS HEAD).
 if [ "$RELEASE" = "HEAD" ]; then
-  SOURCEDIR=$WORKDIR
+  SOURCEDIR=$WORKDIR/gcc/gcc/doc
   DESTDIR=$WWWBASE_PREFORMATTED/install
   export SOURCEDIR
   export DESTDIR
   $WORKDIR/gcc/gcc/doc/install.texi2html
 
-  for file in `ls $DESTDIR`
-  do
-    $PREPROCESS install/$file
-  done 
+  # Preprocess the entire web site, not just the install docs!
+  echo "Invoking $WWWPREPROCESS"
+  $WWWPREPROCESS |grep -v '^  Warning: Keeping'
 fi
 
 # Clean up behind us.