Hi,
I committed this patch, which adds asm-awareness to toolwrapper.c.
Tom
2006-10-24 Thomas Fitzsimmons <[EMAIL PROTECTED]>
* tools/Makefile.am: Add ASM_JAR define to each tool's CFLAGS.
* tools/toolwrapper.c (main): Set bootclasspath, not classpath.
Add ASM_JAR to bootclasspath.
Index: tools/Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/tools/Makefile.am,v
retrieving revision 1.24
diff -u -r1.24 Makefile.am
--- tools/Makefile.am 22 Sep 2006 22:53:16 -0000 1.24
+++ tools/Makefile.am 24 Oct 2006 17:58:41 -0000
@@ -40,63 +40,75 @@
gappletviewer_SOURCES = toolwrapper.c
gappletviewer_CFLAGS = \
-DTOOLPACKAGE="\"appletviewer\"" \
- -DTOOLNAME="\"gappletviewer\""
+ -DTOOLNAME="\"gappletviewer\"" \
+ -DASM_JAR=""
gjarsigner_SOURCES = toolwrapper.c
gjarsigner_CFLAGS = \
-DTOOLPACKAGE="\"jarsigner\"" \
- -DTOOLNAME="\"gjarsigner\""
+ -DTOOLNAME="\"gjarsigner\"" \
+ -DASM_JAR=""
gkeytool_SOURCES = toolwrapper.c
gkeytool_CFLAGS = \
-DTOOLPACKAGE="\"keytool\"" \
- -DTOOLNAME="\"gkeytool\""
+ -DTOOLNAME="\"gkeytool\"" \
+ -DASM_JAR=""
gjar_SOURCES = toolwrapper.c
gjar_CFLAGS = \
-DTOOLPACKAGE="\"jar\"" \
- -DTOOLNAME="\"gjar\""
+ -DTOOLNAME="\"gjar\"" \
+ -DASM_JAR=""
gnative2ascii_SOURCES = toolwrapper.c
gnative2ascii_CFLAGS = \
-DTOOLPACKAGE="\"native2ascii\"" \
- -DTOOLNAME="\"gnative2ascii\""
+ -DTOOLNAME="\"gnative2ascii\"" \
+ -DASM_JAR=""
gserialver_SOURCES = toolwrapper.c
gserialver_CFLAGS = \
-DTOOLPACKAGE="\"serialver\"" \
- -DTOOLNAME="\"gserialver\""
+ -DTOOLNAME="\"gserialver\"" \
+ -DASM_JAR=""
grmiregistry_SOURCES = toolwrapper.c
grmiregistry_CFLAGS = \
-DTOOLPACKAGE="\"rmiregistry\"" \
- -DTOOLNAME="\"grmiregistry\""
+ -DTOOLNAME="\"grmiregistry\"" \
+ -DASM_JAR=""
gtnameserv_SOURCES = toolwrapper.c
gtnameserv_CFLAGS = \
-DTOOLPACKAGE="\"tnameserv\"" \
- -DTOOLNAME="\"gtnameserv\""
+ -DTOOLNAME="\"gtnameserv\"" \
+ -DASM_JAR=""
gorbd_SOURCES = toolwrapper.c
gorbd_CFLAGS = \
-DTOOLPACKAGE="\"orbd\"" \
- -DTOOLNAME="\"gorbd\""
+ -DTOOLNAME="\"gorbd\"" \
+ -DASM_JAR=""
grmid_SOURCES = toolwrapper.c
grmid_CFLAGS = \
-DTOOLPACKAGE="\"rmid\"" \
- -DTOOLNAME="\"grmid\""
+ -DTOOLNAME="\"grmid\"" \
+ -DASM_JAR=""
if USE_ASM
gjavah_SOURCES = toolwrapper.c
gjavah_CFLAGS = \
-DTOOLPACKAGE="\"javah\"" \
- -DTOOLNAME="\"gjavah\""
+ -DTOOLNAME="\"gjavah\"" \
+ -DASM_JAR="\":$(PATH_TO_ASM)\""
grmic_SOURCES = toolwrapper.c
grmic_CFLAGS = \
-DTOOLPACKAGE="\"rmic\"" \
- -DTOOLNAME="\"grmic\""
+ -DTOOLNAME="\"grmic\"" \
+ -DASM_JAR="\":$(PATH_TO_ASM)\""
endif
else
Index: tools/toolwrapper.c
===================================================================
RCS file: /sources/classpath/classpath/tools/toolwrapper.c,v
retrieving revision 1.3
diff -u -r1.3 toolwrapper.c
--- tools/toolwrapper.c 18 Aug 2006 19:41:07 -0000 1.3
+++ tools/toolwrapper.c 24 Oct 2006 17:58:41 -0000
@@ -136,7 +136,7 @@
goto destroy;
}
- vm_args.options[vm_args.nOptions++].optionString = "-Djava.class.path=" TOOLS_ZIP;
+ vm_args.options[vm_args.nOptions++].optionString = "-Xbootclasspath/p:" TOOLS_ZIP ASM_JAR;
}
/* Terminate vm_args.options with a NULL element. */
