Patchwork Fix update_web_docs_svn for Ada manual

login
register
mail settings
Submitter Joseph S. Myers
Date June 24, 2010, 3:54 p.m.
Message ID <Pine.LNX.4.64.1006241552460.4402@digraph.polyomino.org.uk>
Download mbox | patch
Permalink /patch/56807/
State New
Headers show

Comments

Joseph S. Myers - June 24, 2010, 3:54 p.m.
A recent Ada change broke the nightly update_web_docs_svn run because the 
generated gnat_ugn_unw.texi was including a file projects.texi from the 
source directory and that script wasn't using appropriate -I options for 
this file to be found.  I've applied this patch to fix this.

Patch

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 161314)
+++ ChangeLog	(working copy)
@@ -1,3 +1,8 @@ 
+2010-06-24  Joseph Myers  <joseph@codesourcery.com>
+
+	* update_web_docs_svn: Also pass -I option pointing to ada/ source
+	directory for Ada manual.
+
 2010-04-16  Joseph Myers  <joseph@codesourcery.com>
 
 	* crontab: Enable 4.6 snapshots.
Index: update_web_docs_svn
===================================================================
--- update_web_docs_svn	(revision 161314)
+++ update_web_docs_svn	(working copy)
@@ -153,10 +153,14 @@ 
 for file in $MANUALS; do
   filename=`find . -name ${file}.texi`
   if [ "${filename}" ]; then
-    makeinfo --html -I ${includedir} -I `dirname ${filename}` -o ${file} ${filename}
+    includes="-I ${includedir} -I `dirname ${filename}`"
+    if [ "$file" = "gnat_ugn_unw" ]; then
+      includes="$includes -I gcc/gcc/ada"
+    fi
+    makeinfo --html $includes -o ${file} ${filename}
     tar cf ${file}-html.tar ${file}/*.html
-    texi2dvi -I ${includedir} -o ${file}.dvi ${filename} </dev/null >/dev/null && dvips -o ${file}.ps ${file}.dvi
-    texi2pdf -I ${includedir} -o ${file}.pdf ${filename} </dev/null
+    texi2dvi $includes -o ${file}.dvi ${filename} </dev/null >/dev/null && dvips -o ${file}.ps ${file}.dvi
+    texi2pdf $includes -o ${file}.pdf ${filename} </dev/null
     mkdir -p $DOCSDIR/$file
   fi
 done