[htdocs/maintainer-scripts PATCH] Patches required to enable i18n

[Paolo Bonzini <bonzini at gnu dot org>]

Here are the two patches that are needed to enable i18n for libcpp. 
Joseph told me that I can go ahead and commit PO files even before the 
TP acknowledges the new domain, so here they are.

The libcpp-i18n.patch has a simple Makefile tweak to enable building gmo 
files, and more important a change to gcc_release so that it moves the 
gmo files to the source directory.  How can I have these used by the 
gccadmin user?  Should I have somebody else commit them for me and do 
the required dance?

Paolo

libcpp/ChangeLog:

2004-06-02  Paolo Bonzini  <bonzini@gnu.org>

	* Makefile.am (all-local): Build PO files.
	* Makefile.in: Regenerate.

maintainer-scripts/ChangeLog:
2004-06-02  Paolo Bonzini  <bonzini@gnu.org>

	* gcc_release: Move libcpp message catalogs to source directory.

htdocs/ChangeLog:
2004-06-02  Paolo Bonzini  <bonzini@gnu.org>

	* branching.htm: Mention libcpp's PO files.
	* translation.htm: Mention libcpp's PO files.
	* releasing.htm: Mention libcpp's PO files.

diff -ru gcc-save/libcpp/Makefile.am gcc/libcpp/Makefile.am
--- gcc-save/libcpp/Makefile.am	2004-05-25 10:00:37.000000000 +0200
+++ gcc/libcpp/Makefile.am	2004-05-29 09:29:46.000000000 +0200
@@ -18,6 +18,8 @@
 MSGMERGE = msgmerge
 CATALOGS = @CATALOGS@
 
+all-local: build-po
+
 if ENABLE_NLS
 build-po: $(CATALOGS)
 update-po: $(CATALOGS:.gmo=.pox)
diff -ru gcc-save/maintainer-scripts/gcc_release gcc/maintainer-scripts/gcc_release
--- gcc-save/maintainer-scripts/gcc_release	2004-05-24 10:40:38.000000000 +0200
+++ gcc/maintainer-scripts/gcc_release	2004-05-29 09:29:08.000000000 +0200
@@ -248,6 +248,7 @@
 
   # Move message catalogs to source directory.
   mv ../objdir/gcc/po/*.gmo gcc/po/
+  mv ../objdir/libcpp/po/*.gmo libcpp/po/
 
   # Create a "MD5SUMS" file to use for checking the validity of the release.
   find . -type f |sed -e 's:^\./::' -e '/MD5SUMS/d' |sort |xargs md5sum >MD5SUMS

diff -ru aaa/branching.html bbb/branching.html
--- aaa/branching.html	2004-06-02 12:43:42.000000000 +0200
+++ bbb/branching.html	2004-06-02 12:33:54.000000000 +0200
@@ -95,8 +95,7 @@
 actually called from cron.)</li>
 
 <li><a href="http://gcc.gnu.org/translation.html#regen";>Regenerate
-<code>gcc.pot</code></a> and <a href="http://gcc.gnu.org/translation.html#submit";>send it
+<code>gcc.pot</code></a> and <code>cpplib.pot</code>.
+<a href="http://gcc.gnu.org/translation.html#submit";>Send them
 to the translation project</a>.</li>
 
 <li>Update the file <code>gcc/configure.in</code> so that
@@ -156,7 +155,7 @@
 permitted in any medium, provided this notice is preserved.</p>
 
 <table width="100%" border="0"><tbody><tr><td>
-  <!-- IGNORE DIFF -->Last modified 2004-01-22
+  <!-- IGNORE DIFF -->Last modified 2004-06-02
 </td><td align="right" valign="bottom">
   <a href="http://validator.w3.org/check/referer";>
       <img src="branching_files/valid-xhtml10.png" alt="Valid XHTML 1.0" border="0" width="88" height="31">
diff -ru aaa/releasing.html bbb/releasing.html
--- aaa/releasing.html	2004-06-02 12:43:34.000000000 +0200
+++ bbb/releasing.html	2004-06-02 12:33:56.000000000 +0200
@@ -68,7 +68,7 @@
 <li><a href="http://gcc.gnu.org/translation.html#collect";>Check for new message
 translations</a> and commit them to the release branch (and to
 mainline if it is the most recent release branch).  <a href="http://gcc.gnu.org/translation.html#regen";>Regenerate
-<code>gcc.pot</code></a>.</li>
+<code>gcc.pot</code></a> and <code>cpplib.pot</code>.</li>
 </ol>
 
 
@@ -201,7 +201,7 @@
 permitted in any medium, provided this notice is preserved.</p>
 
 <table width="100%" border="0"><tbody><tr><td>
-  <!-- IGNORE DIFF -->Last modified 2004-04-22
+  <!-- IGNORE DIFF -->Last modified 2004-06-02
 </td><td align="right" valign="bottom">
   <a href="http://validator.w3.org/check/referer";>
       <img src="releasing_files/valid-xhtml10.png" alt="Valid XHTML 1.0" border="0" width="88" height="31">
diff -ru aaa/translation.html bbb/translation.html
--- aaa/translation.html	2004-06-02 12:43:26.000000000 +0200
+++ bbb/translation.html	2004-06-02 12:33:48.000000000 +0200
@@ -53,27 +53,15 @@
 <p>This page documents how GCC development interacts with the <a href="http://www.iro.umontreal.ca/contrib/po/HTML/";>Translation
 Project</a>.</p>
 
-<h2 id="regen"><code>gcc.pot</code> regeneration</h2>
+<h2 id="regen"><code>gcc.pot</code> and <code>cpplib.pot</code> regeneration</h2>
 
-<p><code>gcc/po/gcc.pot</code> (a template file containing all the
-messages translators need to translate) is currently regenerated
-manually.  This is done by <code>make gcc.pot</code> in
-<code><i>objdir</i>/gcc/</code>, then moving
-<code><i>objdir</i>/gcc/po/gcc.pot</code> to
-<code><i>srcdir</i>/gcc/po/</code>.  This is done at the following
-times on mainline and active release branches:</p>
+<p><code>gcc/po/gcc.pot</code> and <code>libcpp/po/cpplib.pot</code> (the
+template files containing all the messages translators need to translate) are currently
+regenerated manually.  Note that <code>cpplib</code> is internationalized separately
+starting from GCC 3.5 only: previous versions only require regenerating
+<code>gcc/po/gcc.pot</code>.</p>
+
+<p>To regenerate <code>gcc.pot</code>:
+<ul>
+<li><code>make gcc.pot</code> in <code><i>objdir</i>/gcc/</code>;</li>
+<li>move <code><i>objdir</i>/gcc/po/gcc.pot</code> to <code><i>srcdir</i>/gcc/po/</code>.</li>
+</ul>
+
+<p>Similarly, to regenerate <code>cpplib.pot</code>:
+<ul>
+<li><code>make cpplib.pot</code> in <code><i>objdir</i>/libcpp/</code>;</li>
+<li>move <code><i>objdir</i>/libcpp/po/cpplib.pot</code> to <code><i>srcdir</i>/libcpp/po/</code>.</li>
+</ul>
+
+This is done at the following times on mainline and active release branches:</p>
 
 <ol>
 <li>Just before each release (so the file is current in releases).</li>
@@ -94,8 +82,8 @@
 whose subject is "gcc-<i>version</i>-b<i>date</i>.pot" (the "b" format
 gets it ordered correctly before the release proper) and whose body
 contains the URL of the snapshot <code>.tar.bz2</code> file.  You need
-to regenerate gcc.pot on the branch, then wait for a new snapshot to
-be run containing it (or run one manually, using the command in the
+to regenerate the <code>pot</code> files on the branch, then wait for a new
+snapshot to be run containing it (or run one manually, using the command in the
 crontab, if you have access to the <code>gccadmin</code> account),
 before submitting the snapshot.</p>
 
@@ -111,10 +99,8 @@
 <code>.po</code> files that haven't been committed already and the
 most recent <code>.po</code> file for each language should be
 committed to mainline and branch.  The current <code>.po</code> files
-may be found <a href="http://www2.iro.umontreal.ca/%7Epinard/po/registry.cgi?domain=gcc";>at
-the Translation Project site</a>.</p>
+for GCC may be found <a href="http://www2.iro.umontreal.ca/%7Epinard/po/registry.cgi?domain=gcc";>at
+the Translation Project site</a>.  cpplib <code>.po</code> files
+may also be found <a href="http://www2.iro.umontreal.ca/%7Epinard/po/registry.cgi?domain=cpplib";>there</a>
+(at least, they will by the time GCC 3.5 branches).</p>
 
 <h2 id="maintain"><code>.po</code> file maintenance</h2>
 
@@ -154,7 +140,7 @@
 permitted in any medium, provided this notice is preserved.</p>
 
 <table width="100%" border="0"><tbody><tr><td>
-  <!-- IGNORE DIFF -->Last modified 2003-08-28
+  <!-- IGNORE DIFF -->Last modified 2004-06-02
 </td><td align="right" valign="bottom">
   <a href="http://validator.w3.org/check/referer";>
       <img src="translation_files/valid-xhtml10.png" alt="Valid XHTML 1.0" border="0" width="88" height="31">