[cp-patches] Patch: FYI: fix minor tool buglets

[Tom Tromey]

I'm checking this in.

A couple of the tools have a main class not named "Main".
This fixes the tool wrappers to respect that.

Tom

Index: ChangeLog
from  Tom Tromey  <[EMAIL PROTECTED]>

        * tools/toolwrapper.c (MAINCLASS): New define.
        (main): Use it.
        * tools/Makefile.am (gnative2ascii_CFLAGS): Added -D for
        MAINCLASS.
        (gserialver_CFLAGS): Likewise.
        * tools/gnative2ascii.in: Main class is named Native2ASCII.
        * tools/gserialver.in: Main class is named SerialVer.

Index: tools/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/Makefile.am,v
retrieving revision 1.29
diff -u -r1.29 Makefile.am
--- tools/Makefile.am 10 Dec 2006 20:25:50 -0000 1.29
+++ tools/Makefile.am 13 Dec 2006 17:55:05 -0000
@@ -49,12 +49,14 @@
 gnative2ascii_SOURCES = toolwrapper.c
 gnative2ascii_CFLAGS = \
        -DTOOLPACKAGE="\"native2ascii\"" \
-       -DTOOLNAME="\"gnative2ascii\""
+       -DTOOLNAME="\"gnative2ascii\"" \
+       -DMAINCLASS="\"Native2ASCII\""
 
 gserialver_SOURCES = toolwrapper.c
 gserialver_CFLAGS = \
        -DTOOLPACKAGE="\"serialver\"" \
-       -DTOOLNAME="\"gserialver\""
+       -DTOOLNAME="\"gserialver\"" \
+       -DMAINCLASS="\"SerialVer\""
 
 grmiregistry_SOURCES = toolwrapper.c
 grmiregistry_CFLAGS = \
Index: tools/gnative2ascii.in
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnative2ascii.in,v
retrieving revision 1.1
diff -u -r1.1 gnative2ascii.in
--- tools/gnative2ascii.in 27 Jun 2006 18:58:51 -0000 1.1
+++ tools/gnative2ascii.in 13 Dec 2006 17:55:05 -0000
@@ -44,4 +44,4 @@
 [EMAIL PROTECTED]@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
-exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" 
gnu.classpath.tools.native2ascii.Main "$@"
+exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" 
gnu.classpath.tools.native2ascii.Native2ASCII "$@"
Index: tools/gserialver.in
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gserialver.in,v
retrieving revision 1.1
diff -u -r1.1 gserialver.in
--- tools/gserialver.in 27 Jun 2006 18:58:51 -0000 1.1
+++ tools/gserialver.in 13 Dec 2006 17:55:05 -0000
@@ -44,4 +44,4 @@
 [EMAIL PROTECTED]@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
-exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" 
gnu.classpath.tools.serialver.Main "$@"
+exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" 
gnu.classpath.tools.serialver.SerialVer "$@"
Index: tools/toolwrapper.c
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/toolwrapper.c,v
retrieving revision 1.5
diff -u -r1.5 toolwrapper.c
--- tools/toolwrapper.c 7 Dec 2006 17:22:53 -0000 1.5
+++ tools/toolwrapper.c 13 Dec 2006 17:55:05 -0000
@@ -46,6 +46,10 @@
 # error JNI version 1.2 or greater required
 #endif
 
+#ifndef MAINCLASS
+#define MAINCLASS "Main"
+#endif
+
 union env_union
 {
   void *void_env;
@@ -216,7 +220,9 @@
       (*env)->SetObjectArrayElement (env, args_array, i, str);
     }
 
-  class_id = (*env)->FindClass (env, "gnu/classpath/tools/" TOOLPACKAGE 
"/Main");
+  class_id
+    = (*env)->FindClass (env,
+                        "gnu/classpath/tools/" TOOLPACKAGE "/" MAINCLASS);
   if (class_id == NULL)
     {
       fprintf (stderr, TOOLNAME ": FindClass failed.\n");