codenotifier - RJB: revision 70

Project: RJB

Revision: 70

Author: arton

Date: 26 May 2008 08:31:35

Changes:

os x update

Files:
modified: /trunk/ext/rjb.c (try)
modified: /trunk/ext/load.c (try)
modified: /trunk/test/test.rb (try)
modified: /trunk/ChangeLog (try)
modified: /trunk/ext/extconf.rb (try)

Diff:

/trunk/ext/rjb.c

/trunk/ext/load.c

/trunk/test/test.rb

/trunk/ChangeLog

/trunk/ext/extconf.rb

To list

......	@@ -41,6 +41,20 @@
41	41	#define ACC_VOLATILE 0x0040
42	42	#define ACC_TRANSIENT 0x0080
43	43
	44	#define RJB_FIND_CLASS(var, name) \
	45	var = (*jenv)->FindClass(jenv, name); \
	46	rjb_check_exception(jenv, 1)
	47	#define RJB_HOLD_CLASS(var, name) \
	48	var = (*jenv)->FindClass(jenv, name); \
	49	rjb_check_exception(jenv, 1); \
	50	var = (*jenv)->NewGlobalRef(jenv, var)
	51	#define RJB_LOAD_METHOD(var, obj, name, sig) \
	52	var = (*jenv)->GetMethodID(jenv, obj, name, sig); \
	53	rjb_check_exception(jenv, 1)
	54	#define RJB_LOAD_STATIC_METHOD(var, obj, name, sig) \
	55	var = (*jenv)->GetStaticMethodID(jenv, obj, name, sig); \
	56	rjb_check_exception(jenv, 1)
	57
44	58	static void register_class(VALUE, VALUE);
45	59	static VALUE import_class(JNIEnv* jenv, jclass, VALUE);
46	60	static VALUE register_instance(JNIEnv* jenv, struct jvi_data*, jobject);
......	@@ -517,7 +531,7 @@
517	531	{ "java/lang/Double", "doubleValue", "()D", "(D)V", NULL, 0, 0, jdouble2rv, },
518	532	{ "java/lang/Boolean", "booleanValue", "()Z", "(Z)Ljava/lang/Boolean;",
519	533	NULL, 0, 0, jboolean2rv, },
520		{ "java/lang/Character", "charValue", "()C", NULL, NULL, 0, 0, jint2rv, },
	534	{ "java/lang/Character", "charValue", "()C", NULL, NULL, 0, 0, jchar2rv, },
521	535	{ "java/lang/Short", "intValue", "()I", NULL, NULL, 0, 0, jint2rv, },
522	536	{ "java/lang/Byte", "intValue", "()I", NULL, NULL, 0, 0, jint2rv, },
523	537	{ "java/lang/Float", "doubleValue", "()D", NULL, NULL, 0, 0, jdouble2rv, },
......	@@ -1673,67 +1687,44 @@
1673	1687	main_jenv = jenv;
1674	1688	}
1675	1689
1676		jconstructor = (*jenv)->FindClass(jenv, "java/lang/reflect/Constructor");
1677		rjb_check_exception(jenv, 1);
1678		ctrGetParameterTypes = (*jenv)->GetMethodID(jenv, jconstructor, "getParameterTypes", "()[Ljava/lang/Class;");
1679		rjb_check_exception(jenv, 1);
1680		jmethod = (*jenv)->FindClass(jenv, "java/lang/reflect/Method");
1681		method_getModifiers = (*jenv)->GetMethodID(jenv, jmethod, "getModifiers", "()I");
1682		rjb_check_exception(jenv, 1);
1683		method_getName = (*jenv)->GetMethodID(jenv, jmethod, "getName", "()Ljava/lang/String;");
1684		rjb_check_exception(jenv, 1);
1685		getParameterTypes = (*jenv)->GetMethodID(jenv, jmethod, "getParameterTypes", "()[Ljava/lang/Class;");
1686		rjb_check_exception(jenv, 1);
1687		getReturnType = (*jenv)->GetMethodID(jenv, jmethod, "getReturnType", "()Ljava/lang/Class;");
1688		rjb_check_exception(jenv, 1);
	1690	RJB_FIND_CLASS(jconstructor, "java/lang/reflect/Constructor");
	1691	RJB_LOAD_METHOD(ctrGetParameterTypes, jconstructor, "getParameterTypes", "()[Ljava/lang/Class;");
	1692	RJB_FIND_CLASS(jmethod, "java/lang/reflect/Method");
	1693	RJB_LOAD_METHOD(method_getModifiers, jmethod, "getModifiers", "()I");
	1694	RJB_LOAD_METHOD(method_getName, jmethod, "getName", "()Ljava/lang/String;");
	1695	RJB_LOAD_METHOD(getParameterTypes, jmethod, "getParameterTypes", "()[Ljava/lang/Class;");
	1696	RJB_LOAD_METHOD(getReturnType, jmethod, "getReturnType", "()Ljava/lang/Class;");
	1697
	1698	RJB_FIND_CLASS(jfield, "java/lang/reflect/Field");
	1699	RJB_LOAD_METHOD(field_getModifiers, jfield, "getModifiers", "()I");
	1700	RJB_LOAD_METHOD(field_getName, jfield, "getName", "()Ljava/lang/String;");
	1701	RJB_LOAD_METHOD(field_getType, jfield, "getType", "()Ljava/lang/Class;");
	1702
	1703	RJB_HOLD_CLASS(j_class, "java/lang/Class");
	1704	RJB_LOAD_METHOD(rjb_class_getName, j_class, "getName", "()Ljava/lang/String;");
1689	1705
1690		jfield = (*jenv)->FindClass(jenv, "java/lang/reflect/Field");
1691		field_getModifiers = (*jenv)->GetMethodID(jenv, jfield, "getModifiers", "()I");
1692		rjb_check_exception(jenv, 1);
1693		field_getName = (*jenv)->GetMethodID(jenv, jfield, "getName", "()Ljava/lang/String;");
1694		rjb_check_exception(jenv, 1);
1695		field_getType = (*jenv)->GetMethodID(jenv, jfield, "getType", "()Ljava/lang/Class;");
1696		rjb_check_exception(jenv, 1);
	1706	RJB_HOLD_CLASS(rjb_j_throwable, "java/lang/Throwable");
	1707	RJB_LOAD_METHOD(rjb_throwable_getMessage, rjb_j_throwable, "getMessage", "()Ljava/lang/String;");
1697	1708
1698		j_class = (*jenv)->FindClass(jenv, "java/lang/Class");
1699		rjb_check_exception(jenv, 1);
1700		rjb_class_getName = (*jenv)->GetMethodID(jenv, j_class, "getName", "()Ljava/lang/String;");
1701		rjb_check_exception(jenv, 1);
1702		j_class = (*jenv)->NewGlobalRef(jenv, j_class);
	1709	RJB_HOLD_CLASS(j_string, "java/lang/String");
	1710	RJB_LOAD_METHOD(str_tostring, j_string, "toString", "()Ljava/lang/String;");
1703	1711
1704		rjb_j_throwable = (*jenv)->FindClass(jenv, "java/lang/Throwable");
1705		rjb_check_exception(jenv, 1);
1706		rjb_throwable_getMessage = (*jenv)->GetMethodID(jenv, rjb_j_throwable, "getMessage", "()Ljava/lang/String;");
1707		rjb_check_exception(jenv, 1);
1708
1709		j_string = (*jenv)->FindClass(jenv, "java/lang/String");
1710		rjb_check_exception(jenv, 1);
1711		str_tostring = (*jenv)->GetMethodID(jenv, j_string, "toString", "()Ljava/lang/String;");
1712		rjb_check_exception(jenv, 1);
1713		j_string = (*jenv)->NewGlobalRef(jenv, j_string);
1714
1715		j_object = (*jenv)->FindClass(jenv, "java/lang/Object");
1716		rjb_check_exception(jenv, 1);
1717		j_object = (*jenv)->NewGlobalRef(jenv, j_object);
	1712	RJB_HOLD_CLASS(j_object, "java/lang/Object");
1718	1713
1719	1714	for (i = PRM_INT; i < PRM_LAST; i++)
1720	1715	{
1721	1716	jclass klass = (*jenv)->FindClass(jenv, jpcvt[i].classname);
1722	1717	if (i == PRM_BOOLEAN)
1723	1718	{
1724		jpcvt[i].ctr_id = (*jenv)->GetStaticMethodID(jenv,
1725		klass, "valueOf", jpcvt[i].ctrsig);
1726		rjb_check_exception(jenv, 1);
	1719	RJB_LOAD_STATIC_METHOD(jpcvt[i].ctr_id, klass, "valueOf", jpcvt[i].ctrsig);
1727	1720	}
1728	1721	else if (jpcvt[i].ctrsig)
1729	1722	{
1730		jpcvt[i].ctr_id = (*jenv)->GetMethodID(jenv, klass,
1731		"<init>", jpcvt[i].ctrsig);
1732		rjb_check_exception(jenv, 1);
	1723	RJB_LOAD_METHOD(jpcvt[i].ctr_id, klass, "<init>", jpcvt[i].ctrsig);
1733	1724	}
1734		jpcvt[i].to_prim_id = (*jenv)->GetMethodID(jenv, klass,
	1725	RJB_LOAD_METHOD(jpcvt[i].to_prim_id, klass,
1735	1726	jpcvt[i].to_prim_method, jpcvt[i].prmsig);
1736		rjb_check_exception(jenv, 1);
	1727
1737	1728	jpcvt[i].klass = (*jenv)->NewGlobalRef(jenv, klass);
1738	1729	}
1739	1730

......	@@ -86,10 +86,12 @@
86	86	VALUE dl;
87	87	VALUE importer;
88	88
89		#if defined(__APPLE__) && defined(__MACH__)
90		jh = "/System/Library/Frameworks/JavaVM.framework";
91		#else
92	89	jh = getenv("JAVA_HOME");
	90	#if defined(__APPLE__) && defined(__MACH__)
	91	if (!jh)
	92	{
	93	jh = "/System/Library/Frameworks/JavaVM.framework";
	94	}
93	95	#endif
94	96	if (!jh)
95	97	{

......	@@ -615,5 +615,16 @@
615	615	assert_equal "\0\x1\x2\x3\x4", map.get('abc')
616	616	assert_equal "\x5\x6\x7\x8\x9", map.get('def')
617	617	end
	618
	619	def x_test_zzunload
	620	# this test should run at the last
	621	unload
	622	begin
	623	load('.')
	624	fail 'no exception'
	625	rescue
	626	assert_equal "can't create Java VM", $!.message
	627	end
	628	end
618	629	end
619	630

......	@@ -1,3 +1,11 @@
	1	Mon May 26 arton
	2	*ext/rjb.c
	3	correct char primitive conversion for Bigendian machine.
	4	use macroes for loading classes
	5	*ext/load.c
	6	adjust OS X's directory
	7	*ext/extconf.rb
	8	adjust OS X's directory if Home exists
1	9	Thu Mar 27 arton
2	10	*ext/rjb.c
3	11	mark version 1.1.4 for the next release.

......	@@ -33,6 +33,7 @@
33	33	raise "JAVA_HOME is not directory." unless File.directory?(javahome)
34	34	p = Path.new
35	35	inc = p.include(javahome, 'include')
	36	inc = p.include(javahome, 'Home/include') unless File.exists?(inc)
36	37	Dir.open(inc).each do \|d\|
37	38	next if d[0] == ?.
38	39	if File.directory?(p.joint(inc, d))