On Tue, 2005-08-09 at 17:19 -0400, Thomas Fitzsimmons wrote: > > > Do you have any idea how to fix the javadoc thing? If so, I can > > > rebuild avalon-framework and see if the class you need appears. > > > > fitzsim should be able to give us some guidance. My first guess would > > be to integrate the javadoc classes into java-gcj-compat's tools.jar. > > > > What do you think Tom? > > Yes, I agree these classes belong in tools.jar. I think just doing that > will fix the javadoc problem -- you're building with ant, right? I > don't think Sun actually includes tools.jar on the system classpath; > rather, ant just loads it directly. I ran across this old problem again with a different package. The following patch to java-gcj-compat solves the problem. Ok to commit? AG Index: Makefile.am =================================================================== RCS file: /cvs/rhug/java-gcj-compat/Makefile.am,v retrieving revision 1.25 diff -u -p -r1.25 Makefile.am --- Makefile.am 4 Jan 2006 22:43:15 -0000 1.25 +++ Makefile.am 6 Jan 2006 15:27:41 -0000 @@ -5,6 +5,9 @@ bin_SCRIPTS = \ jardir = $(SDK_LIB_DIR) jar_DATA = tools.jar +javadoc_jarfile = /usr/share/java/com-sun-javadoc-0.7.7.jar +taglet_jarfile = /usr/share/java/com-sun-tools-doclets-Taglet-0.7.7.jar + tools_jar_source_files = \ $(top_builddir)/com/sun/tools/javac/Config.java \ com/sun/tools/javac/Main.java \ @@ -15,14 +18,21 @@ tools_jar_class_files = $(tools_jar_sour $(tools_jar_class_files): %.class: %.java $(JAVAC) -d . -I . $< +javadoc_class_files = com/sun/tools/doclets/Taglet.class com/sun/javadoc/Doc.class + +$(javadoc_class_files): $(javadoc_jarfile) $(taglet_jarfile) + $(JAR) xf $(javadoc_jarfile) + $(JAR) xf $(taglet_jarfile) + rm -rf META-INF + pr13212.so: pr13212.c $(GCJ_BIN_DIR)/gcc$(gcc_suffix) $(CFLAGS) -fPIC -shared -o $@ $< -lgcj libjawt.so: echo | $(GCJ_BIN_DIR)/gcc$(gcc_suffix) -shared -O2 -fPIC -o libjawt.so -Wl,-soname,libjawt.so -xc - -lgcjawt -tools.jar: $(tools_jar_class_files) - $(JAR) cMf $@ $(tools_jar_class_files) +tools.jar: $(tools_jar_class_files) $(javadoc_class_files) + $(JAR) cMf $@ $(tools_jar_class_files) com/sun/javadoc com/sun/tools/doclets java: java.c $(GCJ_BIN_DIR)/gcc$(gcc_suffix) -DJAVA_HOME="\"$(JAVA_HOME_DIR)\"" -DARCH="\"$(CPU)\"" -DGCJ_BIN_DIR="\"$(GCJ_BIN_DIR)\"" -o $@ $< @@ -73,6 +83,10 @@ uninstall-local: DISTCLEANFILES = \ com/sun/tools/javac/Config.java +mostlyclean-local: + rm -rf com/sun/tools/doclets + rm -rf com/sun/javadoc + CLEANFILES = \ java \ libjawt.so \
