PatchSet 6639
Date: 2005/06/12 13:11:44
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Fix to make javap work again
Members:
ChangeLog:1.4165->1.4166
libraries/javalib/Makefile.am:1.364->1.365
libraries/javalib/Makefile.am.in:1.44->1.45
libraries/javalib/Makefile.in:1.454->1.455
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4165 kaffe/ChangeLog:1.4166
--- kaffe/ChangeLog:1.4165 Sun Jun 12 11:15:03 2005
+++ kaffe/ChangeLog Sun Jun 12 13:11:44 2005
@@ -1,3 +1,10 @@
+2005-06-12 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * libraries/javalib/Makefile.am.in: Put gnu.classpath.tools
+ completely into tools.jar to make javap work fine.
+
+ Reported by: Guilhem Lavaux <[EMAIL PROTECTED]>
+
2005-06-12 Guilhem Lavaux <[EMAIL PROTECTED]>
* kaffe/kaffevm/exception.c
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.364
kaffe/libraries/javalib/Makefile.am:1.365
--- kaffe/libraries/javalib/Makefile.am:1.364 Sat Jun 11 22:55:59 2005
+++ kaffe/libraries/javalib/Makefile.am Sun Jun 12 13:11:47 2005
@@ -5300,11 +5300,11 @@
.PHONY: compile-classes classes
JAR_CMD1 = (cd $(srcdir) && $(ZIP) -q -r $(CURDIR)/[EMAIL PROTECTED] META-INF)
-JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -q -DX -r $(CURDIR)/[EMAIL PROTECTED]
$(SRCDIRS) -x gnu/bytecode/*.class -x gnu/classpath/tools/javap/*.class -x
gnu/classpath/tools/rmi/rmic/*.class)
+JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -q -DX -r $(CURDIR)/[EMAIL PROTECTED]
$(SRCDIRS) -x gnu/bytecode/*.class -x gnu/classpath/tools)
JAR_CMD3 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/[EMAIL PROTECTED]
$(gnu_regexp_message_bundles))
JAR_CMD4 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/[EMAIL PROTECTED]
$(gnu_getopt_message_bundles))
JAR_CMD5 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/[EMAIL PROTECTED]
$(classpath_resources))
-JAR_CMD6 = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/[EMAIL PROTECTED]
gnu/bytecode gnu/classpath/tools/javap gnu/classpath/tools/rmi/rmic)
+JAR_CMD6 = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/[EMAIL PROTECTED]
gnu/bytecode gnu/classpath/tools)
.PHONY: jar-classes
if USE_PRECOMPILED_RT_JAR
Index: kaffe/libraries/javalib/Makefile.am.in
diff -u kaffe/libraries/javalib/Makefile.am.in:1.44
kaffe/libraries/javalib/Makefile.am.in:1.45
--- kaffe/libraries/javalib/Makefile.am.in:1.44 Sat May 21 14:53:10 2005
+++ kaffe/libraries/javalib/Makefile.am.in Sun Jun 12 13:11:48 2005
@@ -354,11 +354,11 @@
.PHONY: compile-classes classes
JAR_CMD1 = (cd $(srcdir) && $(ZIP) -q -r $(CURDIR)/[EMAIL PROTECTED] META-INF)
-JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -q -DX -r $(CURDIR)/[EMAIL PROTECTED]
$(SRCDIRS) -x gnu/bytecode/*.class -x gnu/classpath/tools/javap/*.class -x
gnu/classpath/tools/rmi/rmic/*.class)
+JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -q -DX -r $(CURDIR)/[EMAIL PROTECTED]
$(SRCDIRS) -x gnu/bytecode/*.class -x gnu/classpath/tools)
JAR_CMD3 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/[EMAIL PROTECTED]
$(gnu_regexp_message_bundles))
JAR_CMD4 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/[EMAIL PROTECTED]
$(gnu_getopt_message_bundles))
JAR_CMD5 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/[EMAIL PROTECTED]
$(classpath_resources))
-JAR_CMD6 = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/[EMAIL PROTECTED]
gnu/bytecode gnu/classpath/tools/javap gnu/classpath/tools/rmi/rmic)
+JAR_CMD6 = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/[EMAIL PROTECTED]
gnu/bytecode gnu/classpath/tools)
.PHONY: jar-classes
if USE_PRECOMPILED_RT_JAR
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.454
kaffe/libraries/javalib/Makefile.in:1.455
--- kaffe/libraries/javalib/Makefile.in:1.454 Sat Jun 11 22:56:00 2005
+++ kaffe/libraries/javalib/Makefile.in Sun Jun 12 13:11:48 2005
@@ -5939,11 +5939,11 @@
LIBDIR = lib
rebuildLib = ./rebuildLib
JAR_CMD1 = (cd $(srcdir) && $(ZIP) -q -r $(CURDIR)/[EMAIL PROTECTED] META-INF)
-JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -q -DX -r $(CURDIR)/[EMAIL PROTECTED]
$(SRCDIRS) -x gnu/bytecode/*.class -x gnu/classpath/tools/javap/*.class -x
gnu/classpath/tools/rmi/rmic/*.class)
+JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -q -DX -r $(CURDIR)/[EMAIL PROTECTED]
$(SRCDIRS) -x gnu/bytecode/*.class -x gnu/classpath/tools)
JAR_CMD3 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/[EMAIL PROTECTED]
$(gnu_regexp_message_bundles))
JAR_CMD4 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/[EMAIL PROTECTED]
$(gnu_getopt_message_bundles))
JAR_CMD5 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/[EMAIL PROTECTED]
$(classpath_resources))
-JAR_CMD6 = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/[EMAIL PROTECTED]
gnu/bytecode gnu/classpath/tools/javap gnu/classpath/tools/rmi/rmic)
+JAR_CMD6 = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/[EMAIL PROTECTED]
gnu/bytecode gnu/classpath/tools)
all: all-recursive
.SUFFIXES:
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
