2008-05-27 Joshua Sumali <jsumali@redhat.com>

	* configure.ac: Add support for Antlr. This is used for building gjdoc.
	Also generate tools/gjdoc wrapper with gjdoc.in.
	* doc/gjdoc.texi: New file.
	* doc/invoke.texi: New file.
	* doc/Makefile.am: Generate gjdoc documentation.
	* m4/ac_prog_antlr.m4: New file.
	* m4/ac_prog_java.m4: New file.
	* m4/ac_prog_java_works.m4: New file.
	* tools/Makefile.am: Build gjdoc as part of tools.
	* tools/com/sun/tools/javadoc/Main.java,
	* tools/gjdoc.in,
	* tools/gnu/classpath/tools/doclets/AbstractDoclet.java,
	* tools/gnu/classpath/tools/doclets/.cvsignore,
	* tools/gnu/classpath/tools/doclets/debugdoclet/.cvsignore,
	* tools/gnu/classpath/tools/doclets/debugdoclet/DebugDoclet.java,
	* tools/gnu/classpath/tools/doclets/DocletConfigurationException.java,
	* tools/gnu/classpath/tools/doclets/DocletOptionColonSeparated.java,
	* tools/gnu/classpath/tools/doclets/DocletOptionFile.java,
	* tools/gnu/classpath/tools/doclets/DocletOptionFlag.java,
	* tools/gnu/classpath/tools/doclets/DocletOption.java,
	* tools/gnu/classpath/tools/doclets/DocletOptionPackageWildcard.java,
	* tools/gnu/classpath/tools/doclets/DocletOptionString.java,
	* tools/gnu/classpath/tools/doclets/htmldoclet/CssClass.java,
	* tools/gnu/classpath/tools/doclets/htmldoclet/.cvsignore,
	* tools/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java,
	* tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java,
	* tools/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java,
	* tools/gnu/classpath/tools/doclets/htmldoclet/HtmlTagletContext.java,
	* tools/gnu/classpath/tools/doclets/InlineTagRenderer.java,
	* tools/gnu/classpath/tools/doclets/InvalidPackageWildcardException.java,
	* tools/gnu/classpath/tools/doclets/PackageGroup.java,
	* tools/gnu/classpath/tools/doclets/PackageMatcher.java,
	* tools/gnu/classpath/tools/doclets/StandardTaglet.java,
	* tools/gnu/classpath/tools/doclets/TagletPrinter.java,
	* tools/gnu/classpath/tools/doclets/xmldoclet/.cvsignore,
	* tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/.cvsignore,
	* tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.java,
	* tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java,
	* tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.java,
	* tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.java,
	* tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.java,
	* tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java,
	* tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/package.html,
	* tools/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.java,
	* tools/gnu/classpath/tools/doclets/xmldoclet/Driver.java,
	* tools/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java,
	* tools/gnu/classpath/tools/doclets/xmldoclet/TargetContext.java,
	* tools/gnu/classpath/tools/FileSystemClassLoader.java,
	* tools/gnu/classpath/tools/gjdoc/AbstractTagImpl.java,
	* tools/gnu/classpath/tools/gjdoc/ArrayCharacterIterator.java,
	* tools/gnu/classpath/tools/gjdoc/ClassDocImpl.java,
	* tools/gnu/classpath/tools/gjdoc/ClassDocProxy.java,
	* tools/gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.java,
	* tools/gnu/classpath/tools/gjdoc/ConstructorDocImpl.java,
	* tools/gnu/classpath/tools/gjdoc/.cvsignore,
	* tools/gnu/classpath/tools/gjdoc/Debug.java,
	* tools/gnu/classpath/tools/gjdoc/DirectoryTree.java,
	* tools/gnu/classpath/tools/gjdoc/DocImpl.java,
	* tools/gnu/classpath/tools/gjdoc/ErrorReporter.java,
	* tools/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java,
	* tools/gnu/classpath/tools/gjdoc/expr/AdditionExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/AndExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/BinaryBitwiseExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/BinaryComputationExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/BinaryEqualityExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/BinaryExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/BinaryLogicalExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/BinaryRelationExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/BinaryShiftExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/BitShiftRightExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/CircularExpressionException.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ConditionalExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ConstantBoolean.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ConstantByte.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ConstantChar.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ConstantDouble.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ConstantExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ConstantFloat.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ConstantInteger.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ConstantLong.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ConstantNull.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ConstantShort.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ConstantString.java,
	* tools/gnu/classpath/tools/gjdoc/expr/Context.java,
	* tools/gnu/classpath/tools/gjdoc/expr/.cvsignore,
	* tools/gnu/classpath/tools/gjdoc/expr/DivisionExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/EqualExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/EvaluatorEnvironment.java,
	* tools/gnu/classpath/tools/gjdoc/expr/Evaluator.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ExclusiveOrExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/Expression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/GreaterThanExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/GreaterThanOrEqualExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/IdentifierExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/IllegalExpressionException.java,
	* tools/gnu/classpath/tools/gjdoc/expr/InclusiveOrExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/java-expression.g,
	* tools/gnu/classpath/tools/gjdoc/expr/LessThanExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/LessThanOrEqualExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/LogicalAndExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/LogicalNotExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/LogicalOrExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ModuloExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/MultiplicationExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/NegateExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/NotEqualExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/NotExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ShiftLeftExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/ShiftRightExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/SubtractionExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/TypeCastExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/Type.java,
	* tools/gnu/classpath/tools/gjdoc/expr/UnaryExpression.java,
	* tools/gnu/classpath/tools/gjdoc/expr/UnknownIdentifierException.java,
	* tools/gnu/classpath/tools/gjdoc/FieldDocImpl.java,
	* tools/gnu/classpath/tools/gjdoc/GjdocPackageDoc.java,
	* tools/gnu/classpath/tools/gjdoc/GjdocRootDoc.java,
	* tools/gnu/classpath/tools/gjdoc/InheritDocTagImpl.java,
	* tools/gnu/classpath/tools/gjdoc/JavadocWrapper.java,
	* tools/gnu/classpath/tools/gjdoc/LinkTagImpl.java,
	* tools/gnu/classpath/tools/gjdoc/Main.java,
	* tools/gnu/classpath/tools/gjdoc/MemberDocImpl.java,
	* tools/gnu/classpath/tools/gjdoc/MethodDocImpl.java,
	* tools/gnu/classpath/tools/gjdoc/PackageDocImpl.java,
	* tools/gnu/classpath/tools/gjdoc/ParameterImpl.java,
	* tools/gnu/classpath/tools/gjdoc/ParamTagImpl.java,
	* tools/gnu/classpath/tools/gjdoc/ParseException.java,
	* tools/gnu/classpath/tools/gjdoc/Parser.java,
	* tools/gnu/classpath/tools/gjdoc/ProgramElementDocImpl.java,
	* tools/gnu/classpath/tools/gjdoc/RootDocImpl.java,
	* tools/gnu/classpath/tools/gjdoc/SeeTagImpl.java,
	* tools/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java,
	* tools/gnu/classpath/tools/gjdoc/SourcePositionImpl.java,
	* tools/gnu/classpath/tools/gjdoc/TagContainer.java,
	* tools/gnu/classpath/tools/gjdoc/TagImpl.java,
	* tools/gnu/classpath/tools/gjdoc/TemporaryStore.java,
	* tools/gnu/classpath/tools/gjdoc/TextTagImpl.java,
	* tools/gnu/classpath/tools/gjdoc/ThrowsTagImpl.java,
	* tools/gnu/classpath/tools/gjdoc/TimerDoclet.java,
	* tools/gnu/classpath/tools/gjdoc/Timer.java,
	* tools/gnu/classpath/tools/gjdoc/TypeImpl.java,
	* tools/gnu/classpath/tools/gjdoc/TypeVariableImpl.java,
	* tools/gnu/classpath/tools/gjdoc/ValueTagImpl.java,
	* tools/gnu/classpath/tools/gjdoc/WritableType.java,
	* tools/gnu/classpath/tools/IOToolkit.java,
	* tools/gnu/classpath/tools/java2xhtml/.cvsignore,
	* tools/gnu/classpath/tools/java2xhtml/Java2xhtml.java,
	* tools/gnu/classpath/tools/MalformedInputEvent.java,
	* tools/gnu/classpath/tools/MalformedInputListener.java,
	* tools/gnu/classpath/tools/NotifyingInputStreamReader.java,
	* tools/gnu/classpath/tools/StringToolkit.java,
	* tools/gnu/classpath/tools/taglets/AuthorTaglet.java,
	* tools/gnu/classpath/tools/taglets/CodeTaglet.java,
	* tools/gnu/classpath/tools/taglets/CopyrightTaglet.java,
	* tools/gnu/classpath/tools/taglets/.cvsignore,
	* tools/gnu/classpath/tools/taglets/DeprecatedTaglet.java,
	* tools/gnu/classpath/tools/taglets/GenericTaglet.java,
	* tools/gnu/classpath/tools/taglets/GnuExtendedTaglet.java,
	* tools/gnu/classpath/tools/taglets/SinceTaglet.java,
	* tools/gnu/classpath/tools/taglets/TagletContext.java,
	* tools/gnu/classpath/tools/taglets/ValueTaglet.java,
	* tools/gnu/classpath/tools/taglets/VersionTaglet.java,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/gjdoc_common.xsl,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/about.xsl,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/allclasses.xsl,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/allpackages.xsl,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/alphaindex_chunked.xsl,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/alphaindex.xsl,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/classdoc-source.xsl,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/classdoc-uses.xsl,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/classdoc.xsl,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/deprecated.xsl,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/descriptor.xsl,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/doctranslet.xsl,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/fulltree.xsl,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/gjdoc.xsl,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/help.xsl,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/html_common.xsl,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/index_noframes.xsl,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/index.xsl,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/packageclasses.xsl,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/packagedoc.xsl,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/res/default_help_en.html,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/res/gjdochtml-clean.css,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/res/gjdochtml.css,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/res/gjdochtml-fixed.css,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/res/gjdochtml-sclara.css,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/res/gjdoc.js,
	* tools/resource/gnu/classpath/tools/gjdoc/doctranslets/html/serialized.xsl,
	* tools/resource/gnu/classpath/tools/gjdoc/dtd/dbcentx.mod,
	* tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsa.ent,
	* tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsb.ent,
	* tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsc.ent,
	* tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsn.ent,
	* tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amso.ent,
	* tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-amsr.ent,
	* tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-box.ent,
	* tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr1.ent,
	* tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-cyr2.ent,
	* tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-dia.ent,
	* tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk1.ent,
	* tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk2.ent,
	* tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk3.ent,
	* tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-grk4.ent,
	* tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat1.ent,
	* tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-lat2.ent,
	* tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-num.ent,
	* tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-pub.ent,
	* tools/resource/gnu/classpath/tools/gjdoc/dtd/ent/iso-tech.ent,
	* tools/resource/gnu/classpath/tools/gjdoc/dtd/gjdoc-alphaindex.dtd,
	* tools/resource/gnu/classpath/tools/gjdoc/dtd/gjdoc.dtd,
	* tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/gjdochtml-clean-color1.css,
	* tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/gjdochtml-clean-layout.css,
	* tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/gjdochtml-vanilla.css,
	* tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/gjdoc.js,
	* tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/help.xhtml,
	* tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/HtmlDoclet.properties,
	* tools/resource/gnu/classpath/tools/gjdoc/htmldoclet/xhtml11-target10.dtd,
	* tools/resource/gnu/classpath/tools/gjdoc/java.lang-classes-1.2.txt,
	* tools/resource/gnu/classpath/tools/gjdoc/java.lang-classes-1.3.txt,
	* tools/resource/gnu/classpath/tools/gjdoc/java.lang-classes-1.4.txt,
	* tools/resource/gnu/classpath/tools/gjdoc/java.lang-classes-1.5.txt,
	* tools/resource/gnu/classpath/tools/gjdoc/rng/gjdoc-classdoc.rng,
	* tools/resource/gnu/classpath/tools/gjdoc/rng/gjdoc-common.rng,
	* tools/resource/gnu/classpath/tools/gjdoc/rng/gjdoc-index.rng,
	* tools/resource/gnu/classpath/tools/gjdoc/version.properties,
	* tools/resource/gnu/classpath/tools/gjdoc/version.properties.in:
	New files, taken from gjdoc source tree.

1 files changed, 16 insertions, 1 deletions

diff --git a/configure.ac b/configure.ac
index bfd617b31..7ec0a5138 100644
--- a/configure.ac
+++ b/configure.ac
@@ -301,6 +301,18 @@ AC_ARG_WITH([vm],
 AC_SUBST(VM_BINARY)
 
 dnl -----------------------------------------------------------
+dnl Sets the Antlr jar to use for compiling gjdoc
+dnl -----------------------------------------------------------
+AC_ARG_WITH([antlr-jar],
+            [AS_HELP_STRING([--with-antlr-jar=file],[Use ANTLR from the specified jar file])],
+            [
+             ANTLR_JAR=$withval
+            ],
+            [
+             ANTLR_JAR="$ANTLR_JAR"
+            ])
+
+dnl -----------------------------------------------------------
 dnl Regenerate headers at build time (disabled by default)
 dnl -----------------------------------------------------------
 AC_ARG_ENABLE([regen-headers],
@@ -345,6 +357,7 @@ AC_PROG_AWK
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CPP
+AC_PROG_ANTLR(2,7,1)
 
 # Handle -Werror default case.
 if test "$ENABLE_WERROR" = default; then
@@ -1051,7 +1064,8 @@ tools/gtnameserv
 tools/gorbd
 tools/grmid
 tools/grmic
-tools/gjavah])
+tools/gjavah
+tools/gjdoc])
 AC_CONFIG_COMMANDS([gappletviewer],[chmod 755 tools/gappletviewer])
 AC_CONFIG_COMMANDS([gjarsigner],[chmod 755 tools/gjarsigner])
 AC_CONFIG_COMMANDS([gkeytool],[chmod 755 tools/gkeytool])
@@ -1064,6 +1078,7 @@ AC_CONFIG_COMMANDS([gorbd],[chmod 755 tools/gorbd])
 AC_CONFIG_COMMANDS([grmid],[chmod 755 tools/grmid])
 AC_CONFIG_COMMANDS([grmic],[chmod 755 tools/grmic])
 AC_CONFIG_COMMANDS([gjavah], [chmod 755 tools/gjavah])
+AC_CONFIG_COMMANDS([gjdoc], [chmod 755 tools/gjdoc])
 fi
 
 AC_CONFIG_COMMANDS([gen-classlist],[chmod 755 lib/gen-classlist.sh])