| CODENOTIFIER | HelpYou are not signed inSign in |
Project: RJB
Revision: 77
Author: arton
Date: 14 Aug 2008 06:22:35
Changes:add classic jvm directory for searching jvm
Files:| ...... | @@ -1804,12 +1804,12 @@ | |
| 1804 | 1804 | /* |
| 1805 | 1805 | * free java class |
| 1806 | 1806 | */ |
| 1807 | #if 0 | |
| 1807 | 1808 | static void free_constructor(struct cls_constructor* p) |
| 1808 | 1809 | { |
| 1809 | 1810 | free(p->arg_convert); |
| 1810 | 1811 | free(p->method_signature); |
| 1811 | 1812 | } |
| 1812 | #if 0 | |
| 1813 | 1813 | static int free_method_item(ID key, struct cls_method* pm, int dummy) |
| 1814 | 1814 | { |
| 1815 | 1815 | for (; pm; pm = pm->next) |
| ...... | @@ -33,6 +33,7 @@ | |
| 33 | 33 | #include "rjb.h" |
| 34 | 34 | |
| 35 | 35 | #define JVM_TYPE "client" |
| 36 | #define ALT_JVM_TYPE "classic" | |
| 36 | 37 | |
| 37 | 38 | #if defined(_WIN32) || defined(__CYGWIN__) |
| 38 | 39 | #if defined(__CYGWIN__) |
| ...... | @@ -89,8 +90,6 @@ | |
| 89 | 90 | char* libpath; |
| 90 | 91 | char* java_home; |
| 91 | 92 | char* jh; |
| 92 | VALUE dl; | |
| 93 | VALUE importer; | |
| 94 | 93 | |
| 95 | 94 | jh = getenv("JAVA_HOME"); |
| 96 | 95 | #if defined(__APPLE__) && defined(__MACH__) |
| ...... | @@ -229,7 +228,6 @@ | |
| 229 | 228 | { "DUMMY", NULL }, /* for classpath count */ |
| 230 | 229 | }; |
| 231 | 230 | char* newpath; |
| 232 | VALUE ptr; | |
| 233 | 231 | int len; |
| 234 | 232 | int result; |
| 235 | 233 | GETDEFAULTJAVAVMINITARGS initargs; |
| ...... | @@ -241,7 +239,7 @@ | |
| 241 | 239 | |
| 242 | 240 | if (!RTEST(jvmdll)) |
| 243 | 241 | { |
| 244 | if (!load_jvm(JVM_TYPE)) | |
| 242 | if (!load_jvm(JVM_TYPE) && !load_jvm(ALT_JVM_TYPE)) | |
| 245 | 243 | { |
| 246 | 244 | return -1; |
| 247 | 245 | } |
| ...... | @@ -1,3 +1,9 @@ | |
| 1 | Thu Aug 14 arton | |
| 2 | *ext/rjb.c, load.c, etc | |
| 3 | change comment line // -> /* */ because AIX's compiler | |
| 4 | add _AIX for load.c (this patch from Ittay Dror, thanks) | |
| 5 | *ext/load.c | |
| 6 | add ALT_JVM_TYPE for alternative jvm directory (by Kumar) | |
| 1 | 7 | Sun Jul 13 arton |
| 2 | 8 | *ext/rjb.c |
| 3 | 9 | display warning when Rjb load jvm implicitly if $DEBUG or $VERBOSE. |