mirror of git://gcc.gnu.org/git/gcc.git
re PR libgcj/20975 (Remove scripts/TexinfoDoclet.java)
2005-04-12 Aaron Luchko <aluchko@redhat.com> PR libgcj/20975 * scripts/TexinfoDoclet.java: Removed. * Makefile.am (texinfo): Removed. * Makefile.in: Regenerated. From-SVN: r98034
This commit is contained in:
Aaron Luchko
Bryce McKinlay
parent
82052bec13
commit
b0d9bc9b22
|
|
@ -1,3 +1,10 @@
|
||||||
|
2005-04-12 Aaron Luchko <aluchko@redhat.com>
|
||||||
|
|
||||||
|
PR libgcj/20975
|
||||||
|
* scripts/TexinfoDoclet.java: Removed.
|
||||||
|
* Makefile.am (texinfo): Removed.
|
||||||
|
* Makefile.in: Regenerated.
|
||||||
|
|
||||||
2005-04-11 Michael Koch <konqueror@gmx.de>
|
2005-04-11 Michael Koch <konqueror@gmx.de>
|
||||||
|
|
||||||
* javax/imageio/ImageIO.java (ReaderFormatFilter.filter):
|
* javax/imageio/ImageIO.java (ReaderFormatFilter.filter):
|
||||||
|
|
|
||||||
|
|
@ -3881,44 +3881,6 @@ gnu/gcj/xlib/natXUnmapEvent.cc
|
||||||
|
|
||||||
## ################################################################
|
## ################################################################
|
||||||
|
|
||||||
##
|
|
||||||
## javadoc to texinfo conversion
|
|
||||||
##
|
|
||||||
|
|
||||||
TexinfoDoclet.class: $(srcdir)/scripts/TexinfoDoclet.java
|
|
||||||
javac -d . $(srcdir)/scripts/TexinfoDoclet.java
|
|
||||||
|
|
||||||
texinfo: TexinfoDoclet.class
|
|
||||||
langsource=`ls $(srcdir)/java/lang/*.java`; \
|
|
||||||
lang=`echo $$langsource | sed -e 's/[^ ].*EcosProcess.java//g' | sed -e 's/[^ ].*PosixProcess.java//g'`; \
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-lang.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $$lang
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-lang-ref.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/lang/ref/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-lang-reflect.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/lang/reflect/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-applet.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/applet/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-awt.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-awt-color.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/color/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-awt-datatransfer.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/datatransfer/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-awt-event.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/event/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-awt-geom.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/geom/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-awt-image.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/image/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-awt-peer.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/peer/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-beans.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/beans/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-beans-beancontext.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/beans/beancontext/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-io.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/io/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-math.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/math/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-net.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/net/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-security.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/security/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-security-cert.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/security-cert/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-security-spec.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/security/spec/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-security-interfaces.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/security/spec/interfaces/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-sql.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/sql/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-text.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/text/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-util.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/util/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-util-jar.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/util/jar/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-util-zip.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/util/zip/*.java
|
|
||||||
|
|
||||||
## ################################################################
|
|
||||||
|
|
||||||
##
|
##
|
||||||
## Creating and installing sources.zip
|
## Creating and installing sources.zip
|
||||||
##
|
##
|
||||||
|
|
|
||||||
|
|
@ -23706,38 +23706,6 @@ write-entries-to-file-check:
|
||||||
@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@ >> tmp-0212; \
|
@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@ >> tmp-0212; \
|
||||||
@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@ mv tmp-0212 $(srcdir)/gnu/gcj/convert/JIS0212.h
|
@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@ mv tmp-0212 $(srcdir)/gnu/gcj/convert/JIS0212.h
|
||||||
|
|
||||||
TexinfoDoclet.class: $(srcdir)/scripts/TexinfoDoclet.java
|
|
||||||
javac -d . $(srcdir)/scripts/TexinfoDoclet.java
|
|
||||||
|
|
||||||
texinfo: TexinfoDoclet.class
|
|
||||||
langsource=`ls $(srcdir)/java/lang/*.java`; \
|
|
||||||
lang=`echo $$langsource | sed -e 's/[^ ].*EcosProcess.java//g' | sed -e 's/[^ ].*PosixProcess.java//g'`; \
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-lang.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $$lang
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-lang-ref.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/lang/ref/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-lang-reflect.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/lang/reflect/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-applet.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/applet/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-awt.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-awt-color.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/color/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-awt-datatransfer.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/datatransfer/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-awt-event.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/event/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-awt-geom.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/geom/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-awt-image.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/image/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-awt-peer.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/awt/peer/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-beans.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/beans/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-beans-beancontext.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/beans/beancontext/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-io.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/io/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-math.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/math/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-net.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/net/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-security.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/security/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-security-cert.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/security-cert/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-security-spec.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/security/spec/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-security-interfaces.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/security/spec/interfaces/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-sql.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/sql/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-text.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/text/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-util.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/util/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-util-jar.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/util/jar/*.java
|
|
||||||
javadoc -outfile $(srcdir)/doc/java-util-zip.texi -doclet TexinfoDoclet -sourcepath .'$(CLASSPATH_SEPARATOR)'$(srcdir) $(srcdir)/java/util/zip/*.java
|
|
||||||
|
|
||||||
src.zip:
|
src.zip:
|
||||||
-rm -f src.zip
|
-rm -f src.zip
|
||||||
here=`pwd`; \
|
here=`pwd`; \
|
||||||
|
|
|
||||||
|
|
@ -1,140 +0,0 @@
|
||||||
/* Copyright (C) 2001 Free Software Foundation
|
|
||||||
|
|
||||||
This file is part of libgcj.
|
|
||||||
|
|
||||||
This software is copyrighted work licensed under the terms of the
|
|
||||||
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
|
|
||||||
details. */
|
|
||||||
|
|
||||||
import java.io.*;
|
|
||||||
import com.sun.javadoc.*;
|
|
||||||
|
|
||||||
public class TexinfoDoclet
|
|
||||||
{
|
|
||||||
static PrintStream outfile;
|
|
||||||
|
|
||||||
public static int optionLength(String option)
|
|
||||||
{
|
|
||||||
if (option.equals("-outfile"))
|
|
||||||
return 2;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static String replace (String s, String text, String replacement)
|
|
||||||
{
|
|
||||||
int i = s.indexOf (text);
|
|
||||||
while (i != -1)
|
|
||||||
{
|
|
||||||
s = s.substring(0, i) + replacement + s.substring(i+text.length());
|
|
||||||
i = s.indexOf (text);
|
|
||||||
}
|
|
||||||
|
|
||||||
return s;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static String texify (String s)
|
|
||||||
{
|
|
||||||
if (s.indexOf('<') == -1)
|
|
||||||
return s;
|
|
||||||
|
|
||||||
s = replace (s, "<code>", "@code{");
|
|
||||||
s = replace (s, "</code>", "}");
|
|
||||||
s = replace (s, "<ol>", "\n@itemize @bullet\n");
|
|
||||||
s = replace (s, "</ol>", "\n@end itemize\n");
|
|
||||||
s = replace (s, "<ul>", "\n@itemize @bullet\n");
|
|
||||||
s = replace (s, "</ul>", "\n@end itemize\n");
|
|
||||||
s = replace (s, "<li>", "\n@item\n");
|
|
||||||
s = replace (s, "</li>", "\n");
|
|
||||||
s = replace (s, "<p>", "\n\n");
|
|
||||||
|
|
||||||
s = replace (s, "<CODE>", "@code{");
|
|
||||||
s = replace (s, "</CODE>", "}");
|
|
||||||
s = replace (s, "<OL>", "\n@itemize @bullet\n");
|
|
||||||
s = replace (s, "</OL>", "\n@end itemize\n");
|
|
||||||
s = replace (s, "<UL>", "\n@itemize @bullet\n");
|
|
||||||
s = replace (s, "</UL>", "\n@end itemize\n");
|
|
||||||
s = replace (s, "<LI>", "\n@item\n");
|
|
||||||
s = replace (s, "</LI>", "\n");
|
|
||||||
s = replace (s, "<P>", "\n\n");
|
|
||||||
|
|
||||||
return s;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void emitMethod (ClassDoc c, MethodDoc m)
|
|
||||||
{
|
|
||||||
outfile.print ("@deftypemethod " + c.typeName()
|
|
||||||
+ " {" + m.modifiers()
|
|
||||||
+ " " + m.returnType().typeName()
|
|
||||||
+ "} " + m.name());
|
|
||||||
|
|
||||||
outfile.print (" (");
|
|
||||||
Parameter p[] = m.parameters();
|
|
||||||
boolean first = true;
|
|
||||||
|
|
||||||
for (int i = 0; i < p.length; i++)
|
|
||||||
{
|
|
||||||
if (!first)
|
|
||||||
outfile.print (", ");
|
|
||||||
outfile.print (p[i].typeName()
|
|
||||||
+ "@w{ }@var{"
|
|
||||||
+ p[i].name()
|
|
||||||
+ "}");
|
|
||||||
first = false;
|
|
||||||
}
|
|
||||||
outfile.print (") ");
|
|
||||||
|
|
||||||
ClassDoc exceptions[] = m.thrownExceptions();
|
|
||||||
if (exceptions.length > 0)
|
|
||||||
{
|
|
||||||
outfile.print ("@*throws ");
|
|
||||||
first = true;
|
|
||||||
for (int i = 0; i < exceptions.length; i++)
|
|
||||||
{
|
|
||||||
if (!first)
|
|
||||||
outfile.print (", ");
|
|
||||||
outfile.print (exceptions[i].typeName());
|
|
||||||
first = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
outfile.println ("");
|
|
||||||
|
|
||||||
outfile.println (texify (m.commentText()));
|
|
||||||
|
|
||||||
outfile.println ("@end deftypemethod");
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void emitClass (ClassDoc c)
|
|
||||||
{
|
|
||||||
MethodDoc[] methods = c.methods();
|
|
||||||
for (int i = 0; i < methods.length; i++)
|
|
||||||
{
|
|
||||||
emitMethod (c, methods[i]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean start (RootDoc root)
|
|
||||||
{
|
|
||||||
String options[][] = root.options ();
|
|
||||||
|
|
||||||
for (int i = 0; i < options.length; i++)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if (options[i][0].equals ("-outfile"))
|
|
||||||
{
|
|
||||||
outfile = new PrintStream (new FileOutputStream (options[i][1]));
|
|
||||||
}
|
|
||||||
} catch (java.io.IOException e) {
|
|
||||||
System.err.println ("Can't write to file " + options[i][1]);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ClassDoc[] classes = root.classes();
|
|
||||||
for (int i = 0; i < classes.length; i++)
|
|
||||||
{
|
|
||||||
emitClass (classes[i]);
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue