Add makefile target to update HTML files in source tree

Also remove the creation of the html/ext sub-directory, which has been
unused since revision r245258.

Backport from mainline
2019-10-08  Jonathan Wakely  <jwakely@redhat.com>

	* doc/Makefile.am (doc-html-docbook-regenerate): New target.
	(${docbook_outdir}/html): Do not create unused 'html/ext' directory.
	* doc/Makefile.in: Regenerate.
	* doc/xml/manual/documentation_hacking.xml: Document new target.
	* doc/html/*: Regenerate.

From-SVN: r277413

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f10755a510ecfcfa4727b0b9d29f6674ea3d073a..b51beb4c28eb442105d3af560f7edcb2d0c8837c 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,14 @@
 2019-10-24  Jonathan Wakely  <jwakely@redhat.com>
 
+       Backport from mainline
+       2019-10-08  Jonathan Wakely  <jwakely@redhat.com>
+
+       * doc/Makefile.am (doc-html-docbook-regenerate): New target.
+       (${docbook_outdir}/html): Do not create unused 'html/ext' directory.
+       * doc/Makefile.in: Regenerate.
+       * doc/xml/manual/documentation_hacking.xml: Document new target.
+       * doc/html/*: Regenerate.
+
        * doc/xml/manual/allocator.xml: Use archived copy of CUJ article.
 
        Backport from mainline

diff --git a/libstdc++-v3/doc/Makefile.am b/libstdc++-v3/doc/Makefile.am
index 7d0c52d96b5b1d24e8614d1d6b46dcf193896ae9..702d887b74b7d905de470b95c957ef849630980c 100644 (file)
--- a/libstdc++-v3/doc/Makefile.am
+++ b/libstdc++-v3/doc/Makefile.am
@@ -477,7 +477,6 @@ ${docbook_outdir}/fo:
 
 ${docbook_outdir}/html:
        mkdir -p ${docbook_outdir}/html
-       mkdir -p ${docbook_outdir}/html/ext
        mkdir -p ${docbook_outdir}/html/images
        mkdir -p ${docbook_outdir}/html/manual
 
@@ -546,6 +545,12 @@ stamp-html-docbook: $(xml_sources) ${docbook_outdir}/html
 
 doc-html-docbook: stamp-html-docbook-data
 
+# Generate the HTML pages and copy them back to the source tree.
+doc-html-docbook-regenerate: doc-html-docbook
+       $(INSTALL_DATA) ${docbook_outdir}/html/*.html ${top_srcdir}/doc/html
+       $(INSTALL_DATA) ${docbook_outdir}/html/images/* ${top_srcdir}/doc/html/images
+       $(INSTALL_DATA) ${docbook_outdir}/html/manual/*.html ${top_srcdir}/doc/html/manual
+
 # HTML, all one page
 # NB: Have to generate customization XSL for UTF-8 output.
 manual_html = ${docbook_outdir}/html/libstdc++-manual-single.html

diff --git a/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in
index c4991e92916a25919203db0a62f5cdfdf3461744..c98c42fce98f8b05596a4e4c39043efcf30b72c6 100644 (file)
--- a/libstdc++-v3/doc/Makefile.in
+++ b/libstdc++-v3/doc/Makefile.in
@@ -926,7 +926,6 @@ ${docbook_outdir}/fo:
 
 ${docbook_outdir}/html:
        mkdir -p ${docbook_outdir}/html
-       mkdir -p ${docbook_outdir}/html/ext
        mkdir -p ${docbook_outdir}/html/images
        mkdir -p ${docbook_outdir}/html/manual
 
@@ -978,6 +977,12 @@ stamp-html-docbook: $(xml_sources) ${docbook_outdir}/html
        $(STAMP) stamp-html-docbook
 
 doc-html-docbook: stamp-html-docbook-data
+
+# Generate the HTML pages and copy them back to the source tree.
+doc-html-docbook-regenerate: doc-html-docbook
+       $(INSTALL_DATA) ${docbook_outdir}/html/*.html ${top_srcdir}/doc/html
+       $(INSTALL_DATA) ${docbook_outdir}/html/images/* ${top_srcdir}/doc/html/images
+       $(INSTALL_DATA) ${docbook_outdir}/html/manual/*.html ${top_srcdir}/doc/html/manual
 stamp-html-single-docbook: $(xml_sources) ${docbook_outdir}/html
        @echo "Generating html single file..."
        $(XSLTPROC) $(XSLT_PARAM) $(XSLT_FLAGS) -o ${manual_html} \

diff --git a/libstdc++-v3/doc/html/manual/documentation_hacking.html b/libstdc++-v3/doc/html/manual/documentation_hacking.html
index 274cdaca908ef012a805afe39e43a24609a1af62..d96e7fe091557bd782aed97e85c9b5dfce6e20bc 100644 (file)
--- a/libstdc++-v3/doc/html/manual/documentation_hacking.html
+++ b/libstdc++-v3/doc/html/manual/documentation_hacking.html
@@ -381,10 +381,15 @@
       </p><p>
       </p><pre class="screen"><strong class="userinput"><code>make doc-xml-single-docbook</code></strong></pre><p>
       </p><p>
-       Generated files are output into separate sub directores of
+       Generated files are output into separate sub-directores of
        <code class="filename">doc/docbook/</code> in the
        build directory, based on the output format. For instance, the
        HTML docs will be in <code class="filename">doc/docbook/html</code>.
+      </p><p>
+       The </p><pre class="screen">doc-html-docbook-regenerate</pre><p> target will generate
+       the HTML files and copy them back to the libstdc++ source tree.
+       This can be used to update the HTML files that are checked in to
+       version control.
       </p><p>
        If the Docbook stylesheets are installed in a custom location,
        one can use the variable <code class="literal">XSL_STYLE_DIR</code> to

diff --git a/libstdc++-v3/doc/html/manual/memory.html b/libstdc++-v3/doc/html/manual/memory.html
index b7c9480603196a602d351236fe4ac4acdc409c28..72e73c6b5faab28960bc4f5852910796987ca53d 100644 (file)
--- a/libstdc++-v3/doc/html/manual/memory.html
+++ b/libstdc++-v3/doc/html/manual/memory.html
@@ -314,13 +314,13 @@
     </em>. </span>
       isoc++_1998
     <span class="pagenums">20.4 Memory. </span></p></div><div class="biblioentry"><a id="id-1.3.4.4.4.3.9.3"></a><p><span class="title"><em>
-       <a class="link" href="http://www.drdobbs.com/the-standard-librarian-what-are-allocato/184403759" target="_top">
+      <a class="link" href="https://web.archive.org/web/20190622154249/http://www.drdobbs.com/the-standard-librarian-what-are-allocato/184403759" target="_top">
       The Standard Librarian: What Are Allocators Good For?
-       </a>
-      </em>. </span><span class="author"><span class="firstname">Matt</span> <span class="surname">Austern</span>. </span><span class="publisher"><span class="publishername">
+      </a>
+    </em>. </span><span class="author"><span class="firstname">Matt</span> <span class="surname">Austern</span>. </span><span class="publisher"><span class="publishername">
        C/C++ Users Journal
-      . </span></span></p></div><div class="biblioentry"><a id="id-1.3.4.4.4.3.9.4"></a><p><span class="title"><em>
-       <a class="link" href="http://www.hoard.org/" target="_top">
+      . </span></span><span class="pubdate">2000-12. </span></p></div><div class="biblioentry"><a id="id-1.3.4.4.4.3.9.4"></a><p><span class="title"><em>
+       <a class="link" href="http://hoard.org" target="_top">
       The Hoard Memory Allocator
        </a>
       </em>. </span><span class="author"><span class="firstname">Emery</span> <span class="surname">Berger</span>. </span></p></div><div class="biblioentry"><a id="id-1.3.4.4.4.3.9.5"></a><p><span class="title"><em>

diff --git a/libstdc++-v3/doc/xml/manual/documentation_hacking.xml b/libstdc++-v3/doc/xml/manual/documentation_hacking.xml
index 8ab9e870542cc05c472a433bf1973c912fa3de04..9991976d4354bbc5446e3c65582fc57ca6acfaf6 100644 (file)
--- a/libstdc++-v3/doc/xml/manual/documentation_hacking.xml
+++ b/libstdc++-v3/doc/xml/manual/documentation_hacking.xml
@@ -805,13 +805,20 @@
       </para>
 
       <para>
-       Generated files are output into separate sub directores of
+       Generated files are output into separate sub-directores of
        <filename class="directory">doc/docbook/</filename> in the
        build directory, based on the output format. For instance, the
        HTML docs will be in <filename
        class="directory">doc/docbook/html</filename>.
       </para>
 
+      <para>
+       The <screen>doc-html-docbook-regenerate</screen> target will generate
+       the HTML files and copy them back to the libstdc++ source tree.
+       This can be used to update the HTML files that are checked in to
+       version control.
+      </para>
+
       <para>
        If the Docbook stylesheets are installed in a custom location,
        one can use the variable <literal>XSL_STYLE_DIR</literal> to