+2007-03-27 Bruno Haible <bruno@clisp.org>
+
+ * javadoc1/**: Remove files.
+ * Makefile.am (JAVADOC1, JAVADOC1_FILES): Remove variables.
+ (all-javadoc1, javadoc1/tree.html, install-javadoc1,
+ installdirs-javadoc1, uninstall-javadoc1): Remove rules.
+
2006-11-27 Bruno Haible <bruno@clisp.org>
* gettext-0.16.1 released.
## Makefile for the gettext-runtime/intl-java subdirectory of GNU gettext
-## Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
+## Copyright (C) 2001-2003, 2006-2007 Free Software Foundation, Inc.
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
JAR = @JAR@
JAVACOMP = $(SHELL) ../javacomp.sh
-JAVADOC1 = test ! -d /usr/lib/jdk1.1.8 || env PATH=/usr/lib/jdk1.1.8/bin:$$PATH javadoc
JAVADOC2 = test ! -d /usr/lib/jdk1.3.1 || env PATH=/usr/lib/jdk1.3.1/bin:$$PATH javadoc
-all-local: all-classes all-javadoc1 all-javadoc2
-install-data-local: install-classes install-javadoc1 install-javadoc2
-installdirs-local: installdirs-classes installdirs-javadoc1 installdirs-javadoc2
-uninstall-local: uninstall-classes uninstall-javadoc1 uninstall-javadoc2
+all-local: all-classes all-javadoc2
+install-data-local: install-classes install-javadoc2
+installdirs-local: installdirs-classes installdirs-javadoc2
+uninstall-local: uninstall-classes uninstall-javadoc2
# Special rules for Java compilation.
$(RM) $(DESTDIR)$(jardir)/libintl.jar
-# Special rules for Javadoc (JDK 1.1) documentation.
-
-all-javadoc1: $(srcdir)/javadoc1/tree.html
-
-$(srcdir)/javadoc1/tree.html: $(srcdir)/gnu/gettext/GettextResource.java
- cd $(srcdir) && $(JAVADOC1) -d javadoc1 gnu/gettext/*.java
-
-JAVADOC1_FILES = \
- javadoc1/packages.html javadoc1/tree.html javadoc1/AllNames.html \
- javadoc1/gnu.gettext.GettextResource.html \
- javadoc1/images/blue-ball-small.gif javadoc1/images/blue-ball.gif \
- javadoc1/images/class-index.gif \
- javadoc1/images/constructor-index.gif \
- javadoc1/images/constructors.gif \
- javadoc1/images/cyan-ball-small.gif javadoc1/images/cyan-ball.gif \
- javadoc1/images/error-index.gif \
- javadoc1/images/exception-index.gif \
- javadoc1/images/green-ball-small.gif javadoc1/images/green-ball.gif \
- javadoc1/images/interface-index.gif \
- javadoc1/images/magenta-ball-small.gif javadoc1/images/magenta-ball.gif \
- javadoc1/images/method-index.gif \
- javadoc1/images/methods.gif \
- javadoc1/images/package-index.gif \
- javadoc1/images/red-ball-small.gif javadoc1/images/red-ball.gif \
- javadoc1/images/variable-index.gif \
- javadoc1/images/variables.gif \
- javadoc1/images/yellow-ball-small.gif javadoc1/images/yellow-ball.gif
-
-EXTRA_DIST += $(JAVADOC1_FILES)
-
-install-javadoc1: all-javadoc1
- $(mkdir_p) $(DESTDIR)$(htmldir)/javadoc1
- $(mkdir_p) $(DESTDIR)$(htmldir)/javadoc1/images
- @for f in $(JAVADOC1_FILES); do \
- echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f"; \
- $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f; \
- done
-
-installdirs-javadoc1:
- $(mkdir_p) $(DESTDIR)$(htmldir)/javadoc1
- $(mkdir_p) $(DESTDIR)$(htmldir)/javadoc1/images
-
-uninstall-javadoc1:
- @for f in $(JAVADOC1_FILES); do \
- echo "$(RM) $(DESTDIR)$(htmldir)/$$f"; \
- $(RM) $(DESTDIR)$(htmldir)/$$f; \
- done
-
-
# Special rules for Javadoc (JDK 1.2) documentation.
all-javadoc2: $(srcdir)/javadoc2/index.html
+++ /dev/null
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<!--NewPage-->
-<html>
-<head>
-<!-- Generated by javadoc on Sat Nov 03 18:12:01 CET 2001 -->
-<title>
- Index of all Fields and Methods
-</title>
-</head>
-<body>
-<a name="_top_"></a>
-<pre><a href="packages.html">All Packages</a> <a href="tree.html">Class Hierarchy</a></pre><hr>
-<a href="#Thumb-A">A</a>
-<a href="#Thumb-B">B</a>
-<a href="#Thumb-C">C</a>
-<a href="#Thumb-D">D</a>
-<a href="#Thumb-E">E</a>
-<a href="#Thumb-F">F</a>
-<a href="#Thumb-G">G</a>
-<a href="#Thumb-H">H</a>
-<a href="#Thumb-I">I</a>
-<a href="#Thumb-J">J</a>
-<a href="#Thumb-K">K</a>
-<a href="#Thumb-L">L</a>
-<a href="#Thumb-M">M</a>
-<a href="#Thumb-N">N</a>
-<a href="#Thumb-O">O</a>
-<a href="#Thumb-P">P</a>
-<a href="#Thumb-Q">Q</a>
-<a href="#Thumb-R">R</a>
-<a href="#Thumb-S">S</a>
-<a href="#Thumb-T">T</a>
-<a href="#Thumb-U">U</a>
-<a href="#Thumb-V">V</a>
-<a href="#Thumb-W">W</a>
-<a href="#Thumb-X">X</a>
-<a href="#Thumb-Y">Y</a>
-<a href="#Thumb-Z">Z</a>
-
-<hr>
-<h1>
- Index of all Fields and Methods
-</h1>
-<a name="Thumb-A"></a>
-<a name="Thumb-B"></a>
-<a name="Thumb-C"></a>
-<a name="Thumb-D"></a>
-<a name="Thumb-E"></a>
-<a name="Thumb-F"></a>
-<a name="Thumb-G"></a>
-<h2>
-<a name="Thumb-G"><b> G </b></a>
-</h2>
-<dl>
- <dt> <a href="gnu.gettext.GettextResource.html#gettext(java.util.ResourceBundle, java.lang.String)"><b>gettext</b></a>(ResourceBundle, String).
-Static method in class gnu.gettext.<a href="gnu.gettext.GettextResource.html#_top_">GettextResource</a>
- <dd> Returns the translation of <VAR>msgid</VAR>.
- <dt> <a href="gnu.gettext.GettextResource.html#GettextResource()"><b>GettextResource</b></a>().
-Constructor for class gnu.gettext.<a href="gnu.gettext.GettextResource.html#_top_">GettextResource</a>
- <dd>
-</dl>
-<a name="Thumb-H"></a>
-<a name="Thumb-I"></a>
-<a name="Thumb-J"></a>
-<a name="Thumb-K"></a>
-<a name="Thumb-L"></a>
-<a name="Thumb-M"></a>
-<a name="Thumb-N"></a>
-<hr>
-<h2>
-<a name="Thumb-N"><b> N </b></a>
-</h2>
-<dl>
- <dt> <a href="gnu.gettext.GettextResource.html#ngettext(java.util.ResourceBundle, java.lang.String, java.lang.String, long)"><b>ngettext</b></a>(ResourceBundle, String, String, long).
-Static method in class gnu.gettext.<a href="gnu.gettext.GettextResource.html#_top_">GettextResource</a>
- <dd> Returns the plural form for <VAR>n</VAR> of the translation of
- <VAR>msgid</VAR>.
-</dl>
-<a name="Thumb-O"></a>
-<a name="Thumb-P"></a>
-<a name="Thumb-Q"></a>
-<a name="Thumb-R"></a>
-<a name="Thumb-S"></a>
-<a name="Thumb-T"></a>
-<a name="Thumb-U"></a>
-<a name="Thumb-V"></a>
-<hr>
-<h2>
-<a name="Thumb-V"><b> V </b></a>
-</h2>
-<dl>
- <dt> <a href="gnu.gettext.GettextResource.html#verbose"><b>verbose</b></a>.
-Static variable in class gnu.gettext.<a href="gnu.gettext.GettextResource.html#_top_">GettextResource</a>
- <dd>
-</dl>
-<a name="Thumb-W"></a>
-<a name="Thumb-X"></a>
-<a name="Thumb-Y"></a>
-<a name="Thumb-Z"></a>
-</body>
-</html>
+++ /dev/null
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<!--NewPage-->
-<html>
-<head>
-<!-- Generated by javadoc on Sat Nov 03 18:12:01 CET 2001 -->
-<title>
- Class gnu.gettext.GettextResource
-</title>
-</head>
-<body>
-<a name="_top_"></a>
-<pre>
-<a href="packages.html">All Packages</a> <a href="tree.html">Class Hierarchy</a> <a href="Package-gnu.gettext.html">This Package</a> <a href="Package-gnu.gettext.html">Previous</a> <a href="Package-gnu.gettext.html">Next</a> <a href="AllNames.html">Index</a></pre>
-<hr>
-<h1>
- Class gnu.gettext.GettextResource
-</h1>
-<pre>
-java.lang.Object
- |
- +----java.util.ResourceBundle
- |
- +----gnu.gettext.GettextResource
-</pre>
-<hr>
-<dl>
- <dt> public abstract class <b>GettextResource</b>
- <dt> extends ResourceBundle
-</dl>
-This class implements the main GNU libintl functions in Java.
- <P>
- Using the GNU gettext approach, compiled message catalogs are normal
- Java ResourceBundle classes and are thus interoperable with standard
- ResourceBundle based code.
- <P>
- The main differences between the Sun ResourceBundle approach and the
- GNU gettext approach are:
- <UL>
- <LI>In the Sun approach, the keys are abstract textual shortcuts.
- In the GNU gettext approach, the keys are the English/ASCII version
- of the messages.
- <LI>In the Sun approach, the translation files are called
- "<VAR>Resource</VAR>_<VAR>locale</VAR>.properties" and have non-ASCII
- characters encoded in the Java
- <CODE>\</CODE><CODE>u<VAR>nnnn</VAR></CODE> syntax. Very few editors
- can natively display international characters in this format. In the
- GNU gettext approach, the translation files are called
- "<VAR>Resource</VAR>.<VAR>locale</VAR>.po"
- and are in the encoding the translator has chosen. Many editors
- can be used. There are at least three GUI translating tools
- (Emacs PO mode, KDE KBabel, GNOME gtranslator).
- <LI>In the Sun approach, the function
- <CODE>ResourceBundle.getString</CODE> throws a
- <CODE>MissingResourceException</CODE> when no translation is found.
- In the GNU gettext approach, the <CODE>gettext</CODE> function
- returns the (English) message key in that case.
- <LI>In the Sun approach, there is no support for plural handling.
- Even the most elaborate MessageFormat strings cannot provide decent
- plural handling. In the GNU gettext approach, we have the
- <CODE>ngettext</CODE> function.
- </UL>
- <P>
- To compile GNU gettext message catalogs into Java ResourceBundle classes,
- the <CODE>msgfmt</CODE> program can be used.
-<p>
-<hr>
-<a name="index"></a>
-<h2>
- <img src="images/variable-index.gif" width=207 height=38 alt="Variable Index">
-</h2>
-<dl>
- <dt> <img src="images/blue-ball-small.gif" width=6 height=6 alt=" o ">
- <a href="#verbose"><b>verbose</b></a>
- <dd>
-</dl>
-<h2>
- <img src="images/constructor-index.gif" width=275 height=38 alt="Constructor Index">
-</h2>
-<dl>
- <dt> <img src="images/yellow-ball-small.gif" width=6 height=6 alt=" o ">
- <a href="#GettextResource()"><b>GettextResource</b></a>()
- <dd>
-</dl>
-<h2>
- <img src="images/method-index.gif" width=207 height=38 alt="Method Index">
-</h2>
-<dl>
- <dt> <img src="images/green-ball-small.gif" width=6 height=6 alt=" o ">
- <a href="#gettext(java.util.ResourceBundle, java.lang.String)"><b>gettext</b></a>(ResourceBundle, String)
- <dd> Returns the translation of <VAR>msgid</VAR>.
- <dt> <img src="images/green-ball-small.gif" width=6 height=6 alt=" o ">
- <a href="#ngettext(java.util.ResourceBundle, java.lang.String, java.lang.String, long)"><b>ngettext</b></a>(ResourceBundle, String, String, long)
- <dd> Returns the plural form for <VAR>n</VAR> of the translation of
- <VAR>msgid</VAR>.
-</dl>
-<a name="variables"></a>
-<h2>
- <img src="images/variables.gif" width=153 height=38 alt="Variables">
-</h2>
-<a name="verbose"><img src="images/blue-ball.gif" width=12 height=12 alt=" o "></a>
-<b>verbose</b>
-<pre>
- public static boolean verbose
-</pre>
-<a name="constructors"></a>
-<h2>
- <img src="images/constructors.gif" width=231 height=38 alt="Constructors">
-</h2>
-<a name="GettextResource"></a>
-<a name="GettextResource()"><img src="images/yellow-ball.gif" width=12 height=12 alt=" o "></a>
-<b>GettextResource</b>
-<pre>
- public GettextResource()
-</pre>
-<a name="methods"></a>
-<h2>
- <img src="images/methods.gif" width=151 height=38 alt="Methods">
-</h2>
-<a name="gettext(java.util.ResourceBundle, java.lang.String)"><img src="images/green-ball.gif" width=12 height=12 alt=" o "></a>
-<a name="gettext"><b>gettext</b></a>
-<pre>
- public static String gettext(ResourceBundle catalog,
- String msgid)
-</pre>
-<dl>
- <dd> Returns the translation of <VAR>msgid</VAR>.
-<p>
- <dd><dl>
- <dt> <b>Parameters:</b>
- <dd> catalog - a ResourceBundle
- <dd> msgid - the key string to be translated, an ASCII string
- <dt> <b>Returns:</b>
- <dd> the translation of <VAR>msgid</VAR>, or <VAR>msgid</VAR> if
- none is found
- </dl></dd>
-</dl>
-<a name="ngettext(java.util.ResourceBundle, java.lang.String, java.lang.String, long)"><img src="images/green-ball.gif" width=12 height=12 alt=" o "></a>
-<a name="ngettext"><b>ngettext</b></a>
-<pre>
- public static String ngettext(ResourceBundle catalog,
- String msgid,
- String msgid_plural,
- long n)
-</pre>
-<dl>
- <dd> Returns the plural form for <VAR>n</VAR> of the translation of
- <VAR>msgid</VAR>.
-<p>
- <dd><dl>
- <dt> <b>Parameters:</b>
- <dd> catalog - a ResourceBundle
- <dd> msgid - the key string to be translated, an ASCII string
- <dd> msgid_plural - its English plural form
- <dt> <b>Returns:</b>
- <dd> the translation of <VAR>msgid</VAR> depending on <VAR>n</VAR>,
- or <VAR>msgid</VAR> or <VAR>msgid_plural</VAR> if none is found
- </dl></dd>
-</dl>
-<hr>
-<pre>
-<a href="packages.html">All Packages</a> <a href="tree.html">Class Hierarchy</a> <a href="Package-gnu.gettext.html">This Package</a> <a href="Package-gnu.gettext.html">Previous</a> <a href="Package-gnu.gettext.html">Next</a> <a href="AllNames.html">Index</a></pre>
-</body>
-</html>
+++ /dev/null
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<!--NewPage-->
-<html>
-<head>
-<!-- Generated by javadoc on Sat Nov 03 18:12:01 CET 2001 -->
-<title>
- Package Index
-</title>
-</head>
-<body>
-<a name="_top_"></a>
-<pre><a href="API_users_guide.html">API User's Guide</a> <a href="tree.html">Class Hierarchy</a> <a href="AllNames.html">Index</a></pre><hr>
-<h1>
-<img src="images/package-index.gif" width=238 height=37 alt="Package Index">
-</h1>
-</body>
-</html>
+++ /dev/null
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<!--NewPage-->
-<html>
-<head>
-<!-- Generated by javadoc on Sat Nov 03 18:12:01 CET 2001 -->
-<title>
- Class Hierarchy
-</title>
-</head>
-<body>
-<a name="_top_"></a>
-<pre><a href="packages.html">All Packages</a> <a href="AllNames.html">Index</a></pre><hr>
-<h1>
- Class Hierarchy
-</h1>
-<ul>
- <li> class java.lang.Object
- <ul>
- <li> class java.util.ResourceBundle
- <ul>
- <li> class gnu.gettext.<a href="gnu.gettext.GettextResource.html#_top_">GettextResource</a>
- </ul>
- </ul>
-</ul>
-</body>
-</html>