[kaffe] CVS kaffe (robilad): Fixed gjdoc again
Kaffe CVS
cvs-commits at kaffe.org
Mon Dec 13 20:11:46 PST 2004
PatchSet 5637
Date: 2004/12/14 04:00:36
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Fixed gjdoc again
2004-12-14 Dalibor Topic <robilad at kaffe.org>
* kaffe/kaffe/main.c:
Fixed broken .class ending detection to make gjdoc run again.
Reported by: Apache Gump.
Members:
ChangeLog:1.3182->1.3183
kaffe/kaffe/main.c:1.69->1.70
kaffe/scripts/javadoc.in:1.6->1.7
kaffe/scripts/compat/javadoc.in:1.7->1.8
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3182 kaffe/ChangeLog:1.3183
--- kaffe/ChangeLog:1.3182 Tue Dec 14 02:04:22 2004
+++ kaffe/ChangeLog Tue Dec 14 04:00:36 2004
@@ -1,5 +1,12 @@
2004-12-14 Dalibor Topic <robilad at kaffe.org>
+ * kaffe/kaffe/main.c:
+ Fixed broken .class ending detection to make gjdoc run again.
+
+ Reported by: Apache Gump.
+
+2004-12-14 Dalibor Topic <robilad at kaffe.org>
+
* kaffe/kaffevm/external.c:
Improved native library lookup debug output in case of errors.
Index: kaffe/kaffe/kaffe/main.c
diff -u kaffe/kaffe/kaffe/main.c:1.69 kaffe/kaffe/kaffe/main.c:1.70
--- kaffe/kaffe/kaffe/main.c:1.69 Sun Dec 12 18:23:25 2004
+++ kaffe/kaffe/kaffe/main.c Tue Dec 14 04:00:39 2004
@@ -169,7 +169,8 @@
exit(1);
}
- if (strstr(argv[farg], ".class") != NULL) {
+ if (strcmp(argv[farg] + strlen(argv[farg]) - strlen(".class"),
+ ".class") == 0) {
fprintf(stderr,
"Please do not specify the .class extension\n");
exit(1);
Index: kaffe/kaffe/scripts/javadoc.in
diff -u kaffe/kaffe/scripts/javadoc.in:1.6 kaffe/kaffe/scripts/javadoc.in:1.7
--- kaffe/kaffe/scripts/javadoc.in:1.6 Mon Jul 26 02:40:55 2004
+++ kaffe/kaffe/scripts/javadoc.in Tue Dec 14 04:00:41 2004
@@ -1,8 +1,8 @@
#! /bin/sh
-# Script to run Sun's documenter
+# Script to run javadoc
prefix=@prefix@
exec_prefix=@exec_prefix@
export CLASSPATH=$CLASSPATH:@prefix@/lib/gjdoc.jar
-exec @bindir@/@kaffe_TRANSF@ -Djavax.xml.transform.TransformerFactory=gnu.xml.libxmlj.transform.GnomeTransformerFactory $JAVA_OPTS gnu.classpath.tools.gjdoc.Main ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS gnu.classpath.tools.gjdoc.Main ${1+"$@"}
exit $?
Index: kaffe/kaffe/scripts/compat/javadoc.in
diff -u kaffe/kaffe/scripts/compat/javadoc.in:1.7 kaffe/kaffe/scripts/compat/javadoc.in:1.8
--- kaffe/kaffe/scripts/compat/javadoc.in:1.7 Mon Jul 26 02:40:56 2004
+++ kaffe/kaffe/scripts/compat/javadoc.in Tue Dec 14 04:00:41 2004
@@ -1,7 +1,7 @@
#! /bin/sh
-# Script to run Sun's documenter
+# Script to run gjdoc
prefix=@prefix@
exec_prefix=@exec_prefix@
export CLASSPATH=$CLASSPATH:@prefix@/lib/gjdoc.jar
-exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS -Djavax.xml.transform.TransformerFactory=gnu.xml.libxmlj.transform.GnomeTransformerFactory gnu.classpath.tools.gjdoc.Main ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS gnu.classpath.tools.gjdoc.Main ${1+"$@"}
exit $?
More information about the kaffe
mailing list