tag 465389 patch thanks This patch will do for TestNG purposes, it implements two of the overloaded methods.
With this patch the jar is built correctly, but I get some error from
aot-compile that I don't know how to deal with:
dh_installdirs -pgjdoc
rm -rf build-native
mkdir -p build-native
rm -rf build-native/*.jar*
cp -p *.jar build-native/
rm -rf build-resources
mkdir -p build-resources
cd build-resources; \
for i in ../*.jar; do \
fastjar -xf $i; \
done
find build-resources -name '*.class' -type f | xargs -r rm -f
rm -rf build-resources/META-INF build-resources/*.txt
find build-resources -depth -type d -empty -delete
cd build-resources && find -type f \
| fastjar -c -@ -f
/home/marcus/src/debian/build-area/gjdoc-0.7.8/build-native/resources.jar
PYTHONPATH=/home/marcus/src/debian/build-area/gjdoc-0.7.8/debian \
RPATH=-Wl,-rpath,/usr/lib/gcj-4.2-81 \
time python debian/aot-compile \
--gcj=gcj-4.2 --dbtool='gcj-dbtool-4.2' \
-L /usr/lib/gcj build-native build-native
Traceback (most recent call last):
File "debian/aot-compile", line 84, in ?
compiler.compile()
File "/home/marcus/src/debian/build-area/gjdoc-0.7.8/debian/aotcompile.py",
line 118, in compile
jobs = self.getJobList()
File "/home/marcus/src/debian/build-area/gjdoc-0.7.8/debian/aotcompile.py",
line 131, in getJobList
jobs = weed_jobs(find_jobs(self.srcdir, self.exclusions))
File "/home/marcus/src/debian/build-area/gjdoc-0.7.8/debian/aotcompile.py",
line 187, in find_jobs
job = JarJob(path)
File "/home/marcus/src/debian/build-area/gjdoc-0.7.8/debian/aotcompile.py",
line 316, in __init__
self._walk(zipfile.ZipFile(path, "r"))
File "/usr/lib/python2.4/zipfile.py", line 210, in __init__
self._GetContents()
File "/usr/lib/python2.4/zipfile.py", line 230, in _GetContents
self._RealGetContents()
File "/usr/lib/python2.4/zipfile.py", line 302, in _RealGetContents
raise RuntimeError, \
RuntimeError: File name in directory "com/sun/tools/javadoc/" and header
"META-INF/" differ.
Command exited with non-zero status 1
0.05user 0.03system 0:00.55elapsed 16%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (5major+1140minor)pagefaults 0swaps
make: *** [build-native-stamp] Fel 1
dpkg-buildpackage: misslyckades: fakeroot debian/rules binary returnerade
felkod 2
--- /dev/null 2008-01-31 06:24:14.966004352 +0100
+++ src/com/sun/tools/javadoc/Main.java 2008-02-13 09:34:01.029791772 +0100
@@ -0,0 +1,19 @@
+package com.sun.tools.javadoc;
+
+public class Main
+{
+ public static void main(String[] args)
+ {
+ gnu.classpath.tools.gjdoc.Main.main(args);
+ }
+
+ public static int execute(String[] args)
+ {
+ return gnu.classpath.tools.gjdoc.Main.execute(args);
+ }
+
+ public static int execute(String programName, String[] args)
+ {
+ return gnu.classpath.tools.gjdoc.Main.execute(programName, args);
+ }
+}
--- Makefile.am 2007-04-21 23:58:35.000000000 +0200
+++ Makefile.am 2008-02-12 10:59:08.075352164 +0100
@@ -60,6 +60,7 @@
antlr.so
lib_com_sun_javadoc_la_SOURCES = \
+ src/com/sun/tools/javadoc/Main.java \
src/com/sun/javadoc/ClassDoc.java \
src/com/sun/javadoc/ConstructorDoc.java \
src/com/sun/javadoc/Doc.java \
@@ -369,10 +370,11 @@
$(ANTLR) -o gnu/classpath/tools/gjdoc/expr $<
com-sun-javadoc-$(VERSION).jar: classes $(com_sun_javadoc_jar_CLASSES)
- $(JAR) cf $@ -C classes com/sun/javadoc
+ $(JAR) cf $@ -C classes com/sun/javadoc
+ $(JAR) uf $@ -C classes com/sun/tools/javadoc
com-sun-tools-doclets-Taglet-$(VERSION).jar: classes $(com_sun_tools_doclets_Taglet_jar_CLASSES)
- $(JAR) cf $@ -C classes com/sun/tools
+ $(JAR) cf $@ -C classes com/sun/tools/doclets
gjdoc_resources = $(gnu_classpath_tools_gjdoc_jar_CSS) $(gnu_classpath_tools_gjdoc_jar_DTDS) \
$(gnu_classpath_tools_gjdoc_jar_ENTS) $(gnu_classpath_tools_gjdoc_jar_HTML) \
signature.asc
Description: This is a digitally signed message part.
