pkg-config.rb rbsm.msg @@ -1,3 +1,7 @@ +2006-10-09 + * Change : pkg-config を使うように変更( kou ) + * Fix: rbsm.js を添付し忘れていたので追加 + 2006-10-03 * Change : 内部の日本語をUTF-8に変更 * : Google Code にアップロード ChangeLog @@ -1,16 +1,26 @@ require 'mkmf' -dir_config("smjs") -#$CFLAGS += " -gdbg" -case RUBY_PLATFORM -when /mswin32|mingw|bccwin32/ - $defs << "-DXP_WIN" - lib = "js32" -else - $defs << "-DXP_UNIX" - lib = "smjs" +require 'pkg-config' + +def find_smjs + dir_config("smjs") + #$CFLAGS += " -gdbg" + case RUBY_PLATFORM + when /mswin32|mingw|bccwin32/ + $defs << " -DXP_WIN" + lib = "js32" + else + $defs << " -DXP_UNIX" + lib = "smjs" + end + + $defs << " -DNEED_SMJS_PREFIX" + have_library(lib) end -#if have_header("smjs/jsapi.h") or have_header("jsapi.h") -if have_library(lib) - create_makefile("spidermonkey") + +if %w(xulrunner-js thunderbird-js moziila-js).any? do |package| + PKGConfig.have_package(package) + end or find_smjs + create_makefile("spidermonkey") +else + exit 1 end -#end extconf.rb @@ -1,8 +1,16 @@ #define JS_C_STRINGS_ARE_UTF8 -#include "ruby.h" -#include "smjs/jsapi.h" -#include "smjs/jshash.h" -#include "smjs/jsobj.h" + +#include <ruby.h> + +#ifdef NEED_SMJS_PREFIX +# include <smjs/jsapi.h> +# include <smjs/jshash.h> +# include <smjs/jsobj.h> +#else +# include <jsapi.h> +# include <jshash.h> +# include <jsobj.h> +#endif extern VALUE ruby_errinfo; @@ -635,17 +643,17 @@ rbsm_class_no_such_method( JSContext* cx, JSObject* thisobj, uintN argc, jsval* char* keyname; sSMJS_Class* so; keyname = JS_GetStringBytes(JSVAL_TO_STRING(argv[0])); - printf("_noSuchMethod__( %s )",keyname); + //printf("_noSuchMethod__( %s )",keyname); if( !( so = JS_GetInstancePrivate( cx, JSVAL_TO_OBJECT(argv[-2]), &JSRubyObjectClass, NULL ) ) ){ JS_ReportErrorNumber(cx, rbsm_GetErrorMessage, NULL, RBSMMSG_NOT_FUNCTION, keyname); return JS_FALSE; } if( strcmp( keyname, g_last0arity.keyname )==0 ){ - printf("!\n"); + //printf("!\n"); *rval = g_last0arity.val; return JS_TRUE; } - printf("!=%s]",g_last0arity.keyname); + //printf("!=%s]",g_last0arity.keyname); return JS_FALSE; /* // 引数をSpiderMonkey::Valueに spidermonkey.c @@ -287,7 +287,7 @@ class SpiderMonkeyTest < Test::Unit::TestCase def add1(a); a.to_i + 1; end; def add2(*a); @args = a; a.size end; end - def test_hoge2 + def test_property_and_method hoge = Hoge2.new cx = SpiderMonkey::Context.new cx.set_property( "hoge", hoge ); test.rb af5695f8289ef5abcb9e60acd8fa296e897528d8 nazoking nazoking@368abcae-401b-0410-88d4-195e74ebbf5f http://github.com/matthewd/ruby-mozjs/commit/391f558fe1d472426cca8d0fc90438b927f71d15 391f558fe1d472426cca8d0fc90438b927f71d15 2006-10-08T10:15:10-07:00 2006-10-08T10:15:10-07:00 * Change : pkg-config を使うように変更( kou ) * Fix: rbsm.js を添付し忘れていたので追加 git-svn-id: http://ruby-spidermonkey.googlecode.com/svn/trunk@3 368abcae-401b-0410-88d4-195e74ebbf5f 7e0145656dcc719582f03ee3fa7c732786195e82 nazoking nazoking@368abcae-401b-0410-88d4-195e74ebbf5f