[kaffe] CVS kaffe (robilad): Bootstrap fix for Nice
Kaffe CVS
cvs-commits at kaffe.org
Thu Mar 31 15:22:45 PST 2005
PatchSet 5629
Date: 2005/03/31 23:16:49
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Bootstrap fix for Nice
2005-03-31 Dalibor Topic <robilad at kaffe.org>
Moved gnu.bytecode into tools.jar to fix problems
with nice's bootstrap.
Reported by: Daniel Bonniot <bonniot at users.sourceforge.net>
* kaffe/scripts/javap.in: Add tools.jar to classpath.
* kaffe/scripts/kaffe.in: Don't add tools.jar to BOOTCLASSPATH.
* libraries/javalib/Makefile.am.in: (jrelib_DATA) Added tools.jar.
(JAR_CMD2) Don't add gnu.bytecode and gnu.classpath.tools.javap
to rt.jar.
(JAR_CMD7) Put gnu.bytecode and gnu.classpath.tools.javap into
tools.jar.
(tools.jar) New target.
Members:
ChangeLog:1.3800->1.3801
kaffe/scripts/javap.in:1.7->1.8
kaffe/scripts/kaffe.in:1.34->1.35
libraries/javalib/Makefile.am:1.329->1.330
libraries/javalib/Makefile.am.in:1.37->1.38
libraries/javalib/Makefile.in:1.417->1.418
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3800 kaffe/ChangeLog:1.3801
--- kaffe/ChangeLog:1.3800 Thu Mar 31 15:14:51 2005
+++ kaffe/ChangeLog Thu Mar 31 23:16:49 2005
@@ -1,5 +1,23 @@
2005-03-31 Dalibor Topic <robilad at kaffe.org>
+ Moved gnu.bytecode into tools.jar to fix problems
+ with nice's bootstrap.
+
+ Reported by: Daniel Bonniot <bonniot at users.sourceforge.net>
+
+ * kaffe/scripts/javap.in: Add tools.jar to classpath.
+
+ * kaffe/scripts/kaffe.in: Don't add tools.jar to BOOTCLASSPATH.
+
+ * libraries/javalib/Makefile.am.in: (jrelib_DATA) Added tools.jar.
+ (JAR_CMD2) Don't add gnu.bytecode and gnu.classpath.tools.javap
+ to rt.jar.
+ (JAR_CMD7) Put gnu.bytecode and gnu.classpath.tools.javap into
+ tools.jar.
+ (tools.jar) New target.
+
+2005-03-31 Dalibor Topic <robilad at kaffe.org>
+
* config/arm/linux/md.c: Added missing arm/jit.h include.
Reported by: gian paolo ciceri <gp.ciceri at acm.org>
Index: kaffe/kaffe/scripts/javap.in
diff -u kaffe/kaffe/scripts/javap.in:1.7 kaffe/kaffe/scripts/javap.in:1.8
--- kaffe/kaffe/scripts/javap.in:1.7 Thu Mar 3 18:55:52 2005
+++ kaffe/kaffe/scripts/javap.in Thu Mar 31 23:16:53 2005
@@ -1,6 +1,6 @@
#! /bin/sh
prefix=@prefix@
exec_prefix=@exec_prefix@
-exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS gnu.classpath.tools.javap.JavapMain ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS -cp @jrelibdir@/tools.jar gnu.classpath.tools.javap.JavapMain ${1+"$@"}
exit $?
Index: kaffe/kaffe/scripts/kaffe.in
diff -u kaffe/kaffe/scripts/kaffe.in:1.34 kaffe/kaffe/scripts/kaffe.in:1.35
--- kaffe/kaffe/scripts/kaffe.in:1.34 Thu Jan 20 20:56:34 2005
+++ kaffe/kaffe/scripts/kaffe.in Thu Mar 31 23:16:53 2005
@@ -62,7 +62,7 @@
if test x"${BOOTCLASSPATH+set}"x != x"set"x ; then
BOOTCLASSPATH=
fi
-for f in rt.jar comm.jar pjava.jar servlet.jar tools.jar microsoft.jar rmi.jar; do
+for f in rt.jar comm.jar pjava.jar servlet.jar microsoft.jar rmi.jar; do
if test -f "$KAFFE_LIBDIR/$f"; then
BOOTCLASSPATH="$BOOTCLASSPATH$PATHSEP$KAFFE_LIBDIR/$f"
fi
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.329 kaffe/libraries/javalib/Makefile.am:1.330
--- kaffe/libraries/javalib/Makefile.am:1.329 Thu Mar 24 01:44:35 2005
+++ kaffe/libraries/javalib/Makefile.am Thu Mar 31 23:16:54 2005
@@ -47,6 +47,7 @@
jrelib_DATA = \
rt.jar \
+ tools.jar \
$(installed_properties)
Klasses_jar_SRCS = \
@@ -5106,11 +5107,12 @@
echo timestamp > $(LIBDIR)/stamp
JAR_CMD1 = (cd $(srcdir) && $(ZIP) -q -r $(CURDIR)/$@.new META-INF)
-JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(SRCDIRS))
+JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(SRCDIRS) -x gnu/bytecode/*.class -x gnu/classpath/tools/javap/*.class)
JAR_CMD3 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_regexp_message_bundles))
JAR_CMD4 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(serialized_converters))
JAR_CMD5 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_getopt_message_bundles))
JAR_CMD6 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(classpath_resources))
+JAR_CMD7 = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/$@.new gnu/bytecode gnu/classpath/tools/javap)
.PHONY: jar-classes
if USE_PRECOMPILED_RT_JAR
@@ -5129,6 +5131,13 @@
$(JAR_CMD6)
mv $@.new $@
endif
+
+# Put gnu.bytecode into tools.jar to avoid problems
+# with applications using their own version of it.
+tools.jar: $(LIBDIR)/stamp $(gnu_bytecode_SRCS)
+ rm -f tools.jar
+ $(JAR_CMD7)
+ mv $@.new $@
.PHONY: build-classes Klasses
build-classes Klasses: rt.jar
Index: kaffe/libraries/javalib/Makefile.am.in
diff -u kaffe/libraries/javalib/Makefile.am.in:1.37 kaffe/libraries/javalib/Makefile.am.in:1.38
--- kaffe/libraries/javalib/Makefile.am.in:1.37 Thu Mar 24 01:44:36 2005
+++ kaffe/libraries/javalib/Makefile.am.in Thu Mar 31 23:16:54 2005
@@ -47,6 +47,7 @@
jrelib_DATA = \
rt.jar \
+ tools.jar \
$(installed_properties)
Klasses_jar_SRCS = \
@@ -194,11 +195,12 @@
echo timestamp > $(LIBDIR)/stamp
JAR_CMD1 = (cd $(srcdir) && $(ZIP) -q -r $(CURDIR)/$@.new META-INF)
-JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(SRCDIRS))
+JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(SRCDIRS) -x gnu/bytecode/*.class -x gnu/classpath/tools/javap/*.class)
JAR_CMD3 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_regexp_message_bundles))
JAR_CMD4 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(serialized_converters))
JAR_CMD5 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_getopt_message_bundles))
JAR_CMD6 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(classpath_resources))
+JAR_CMD7 = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/$@.new gnu/bytecode gnu/classpath/tools/javap)
.PHONY: jar-classes
if USE_PRECOMPILED_RT_JAR
@@ -217,6 +219,13 @@
$(JAR_CMD6)
mv $@.new $@
endif
+
+# Put gnu.bytecode into tools.jar to avoid problems
+# with applications using their own version of it.
+tools.jar: $(LIBDIR)/stamp $(gnu_bytecode_SRCS)
+ rm -f tools.jar
+ $(JAR_CMD7)
+ mv $@.new $@
.PHONY: build-classes Klasses
build-classes Klasses: rt.jar
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.417 kaffe/libraries/javalib/Makefile.in:1.418
--- kaffe/libraries/javalib/Makefile.in:1.417 Thu Mar 31 11:55:51 2005
+++ kaffe/libraries/javalib/Makefile.in Thu Mar 31 23:16:55 2005
@@ -402,6 +402,7 @@
jrelib_DATA = \
rt.jar \
+ tools.jar \
$(installed_properties)
Klasses_jar_SRCS = \
@@ -5720,11 +5721,12 @@
LIBDIR = lib
rebuildLib = ./rebuildLib
JAR_CMD1 = (cd $(srcdir) && $(ZIP) -q -r $(CURDIR)/$@.new META-INF)
-JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(SRCDIRS))
+JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(SRCDIRS) -x gnu/bytecode/*.class -x gnu/classpath/tools/javap/*.class)
JAR_CMD3 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_regexp_message_bundles))
JAR_CMD4 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(serialized_converters))
JAR_CMD5 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gnu_getopt_message_bundles))
JAR_CMD6 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(classpath_resources))
+JAR_CMD7 = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/$@.new gnu/bytecode gnu/classpath/tools/javap)
all: all-recursive
.SUFFIXES:
@@ -6099,6 +6101,13 @@
@USE_PRECOMPILED_RT_JAR_FALSE@ $(JAR_CMD5)
@USE_PRECOMPILED_RT_JAR_FALSE@ $(JAR_CMD6)
@USE_PRECOMPILED_RT_JAR_FALSE@ mv $@.new $@
+
+# Put gnu.bytecode into tools.jar to avoid problems
+# with applications using their own version of it.
+tools.jar: $(LIBDIR)/stamp $(gnu_bytecode_SRCS)
+ rm -f tools.jar
+ $(JAR_CMD7)
+ mv $@.new $@
.PHONY: build-classes Klasses
build-classes Klasses: rt.jar
More information about the kaffe
mailing list