[kaffe] CVS kaffe (robilad): rmic fix in a more generic way

Kaffe CVS Wed, 18 May 2005 12:51:50 -0700

PatchSet 6542 
Date: 2005/05/18 19:52:25
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
rmic fix in a more generic way


Members: 
        ChangeLog:1.4068->1.4069 
        kaffe/scripts/rmic.in:INITIAL->1.9 
        libraries/javalib/Makefile.am:1.351->1.352 
        libraries/javalib/Makefile.am.in:1.42->1.43 
        libraries/javalib/Makefile.in:1.441->1.442 
        libraries/javalib/gnu/classpath/tools/rmi/rmic/Compiler.java:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4068 kaffe/ChangeLog:1.4069
--- kaffe/ChangeLog:1.4068      Wed May 18 04:14:16 2005
+++ kaffe/ChangeLog     Wed May 18 19:52:25 2005
@@ -1,3 +1,13 @@
+2005-05-18  Dalibor Topic  <[EMAIL PROTECTED]>
+
+       * libraries/javalib/Makefile.am.in:
+       Move rmic to tools.jar.
+
+       * kaffe/scripts/rmic.in: Updated accordingly.
+
+       * libraries/javalib/gnu/classpath/tools/rmi/rmic/Compiler.java
+       (classPrefix) Implement in generic fashion.
+
 2005-05-18  Rei Odaira <[EMAIL PROTECTED]>
 
        * kaffe/kaffevm/classMethod.c:
===================================================================
Checking out kaffe/kaffe/scripts/rmic.in
RCS:  /home/cvs/kaffe/kaffe/kaffe/scripts/rmic.in,v
VERS: 1.9
***************
--- /dev/null   Sun Aug  4 19:57:58 2002
+++ kaffe/kaffe/scripts/rmic.in Wed May 18 19:57:31 2005
@@ -0,0 +1,10 @@
+#! /bin/sh
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+
+PATH=${PATH}:@bindir@
+export PATH
+
+exec @bindir@/@kaffe_TRANSF@ -cp @jrelibdir@/tools.jar 
-Dclasspath.compiler=jikes $JAVA_OPTS gnu.classpath.tools.rmi.rmic.RMIC 
${1+"$@"}
+exit $?
+
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.351 
kaffe/libraries/javalib/Makefile.am:1.352
--- kaffe/libraries/javalib/Makefile.am:1.351   Tue May 17 10:20:14 2005
+++ kaffe/libraries/javalib/Makefile.am Wed May 18 19:52:28 2005
@@ -5229,11 +5229,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)
+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_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)
+JAR_CMD6 = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/[EMAIL PROTECTED] 
gnu/bytecode gnu/classpath/tools/javap gnu/classpath/tools/rmi/rmic)
 
 .PHONY: jar-classes
 if USE_PRECOMPILED_RT_JAR
Index: kaffe/libraries/javalib/Makefile.am.in
diff -u kaffe/libraries/javalib/Makefile.am.in:1.42 
kaffe/libraries/javalib/Makefile.am.in:1.43
--- kaffe/libraries/javalib/Makefile.am.in:1.42 Sun Apr 24 09:57:39 2005
+++ kaffe/libraries/javalib/Makefile.am.in      Wed May 18 19:52:29 2005
@@ -105,11 +105,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)
+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_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)
+JAR_CMD6 = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/[EMAIL PROTECTED] 
gnu/bytecode gnu/classpath/tools/javap gnu/classpath/tools/rmi/rmic)
 
 .PHONY: jar-classes
 if USE_PRECOMPILED_RT_JAR
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.441 
kaffe/libraries/javalib/Makefile.in:1.442
--- kaffe/libraries/javalib/Makefile.in:1.441   Tue May 17 10:20:15 2005
+++ kaffe/libraries/javalib/Makefile.in Wed May 18 19:52:29 2005
@@ -5862,11 +5862,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)
+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_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)
+JAR_CMD6 = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/[EMAIL PROTECTED] 
gnu/bytecode gnu/classpath/tools/javap gnu/classpath/tools/rmi/rmic)
 all: all-recursive
 
 .SUFFIXES:
Index: kaffe/libraries/javalib/gnu/classpath/tools/rmi/rmic/Compiler.java
diff -u kaffe/libraries/javalib/gnu/classpath/tools/rmi/rmic/Compiler.java:1.2 
kaffe/libraries/javalib/gnu/classpath/tools/rmi/rmic/Compiler.java:1.3
--- kaffe/libraries/javalib/gnu/classpath/tools/rmi/rmic/Compiler.java:1.2      
Wed May 18 00:44:08 2005
+++ kaffe/libraries/javalib/gnu/classpath/tools/rmi/rmic/Compiler.java  Wed May 
18 19:52:33 2005
@@ -73,5 +73,6 @@
 
   /** Class prefix used when trying to find instance.  */
   private static final String classPrefix =
-    "gnu.classpath.tools.rmi.rmic.Compile_";
+    Compiler.class.getPackage().getName() + ".Compile_";
+//    "gnu.classpath.tools.rmi.rmic.Compile_";
 }

_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): rmic fix in a more generic way

Reply via email to