December 2008 - macruby-changes - lists.macosforge.org

[766] MacRuby/trunk
by source_changes＠macosforge.org 03 Dec '08

03 Dec '08

Revision: 766 http://trac.macosforge.org/projects/ruby/changeset/766 Author: lsansonetti(a)apple.com Date: 2008-12-03 14:30:51 -0800 (Wed, 03 Dec 2008) Log Message: ----------- fix for #173 (patch contributed by Vincent Isambart) Modified Paths: -------------- MacRuby/trunk/Rakefile MacRuby/trunk/version.c Modified: MacRuby/trunk/Rakefile =================================================================== --- MacRuby/trunk/Rakefile 2008-12-03 07:31:30 UTC (rev 765) +++ MacRuby/trunk/Rakefile 2008-12-03 22:30:51 UTC (rev 766) @@ -262,8 +262,42 @@ end end +desc "Create revision.h" +task :revision_h do + revision_h = 'revision.h' + current_revision = nil + if File.exist?('.svn') + info = `sh -c 'LANG=C svn info' 2>&1` + md_revision = /^Revision: (\d+)$/.match(info) + md_url = /^URL: (.+)$/.match(info) + current_revision = "svn revision #{md_revision[1]} from #{md_url[1]}" if md_revision and md_url + end + if not current_revision and File.exist?('.git/HEAD') + md_ref = /^ref: (.+)$/.match(File.read('.git/HEAD')) + if md_ref + head_file = ".git/#{md_ref[1]}" + current_revision = "git commit #{File.read(head_file).strip}" if File.exist?(head_file) + end + end + current_revision = 'unknown revision' unless current_revision + + new_revision_h = "#define MACRUBY_REVISION \"#{current_revision}\"\n" + + must_recreate_header = true + if File.exist?(revision_h) + must_recreate_header = false if File.read(revision_h) == new_revision_h + end + + if must_recreate_header + File.open(revision_h, 'w') do |f| + f.print new_revision_h + end + end +end + + desc "Build known objects" -task :objects => [:config_h, :dtrace_h] do +task :objects => [:config_h, :dtrace_h, :revision_h] do sh "/usr/bin/ruby tool/compile_prelude.rb prelude.rb miniprelude.c.new" if !File.exist?('miniprelude.c') or File.read('miniprelude.c') != File.read('miniprelude.c.new') mv('miniprelude.c.new', 'miniprelude.c') Modified: MacRuby/trunk/version.c =================================================================== --- MacRuby/trunk/version.c 2008-12-03 07:31:30 UTC (rev 765) +++ MacRuby/trunk/version.c 2008-12-03 22:30:51 UTC (rev 766) @@ -11,6 +11,7 @@ #include "ruby/ruby.h" #include "version.h" +#include "revision.h" #include <stdio.h> #define PRINT(type) puts(ruby_##type) @@ -39,6 +40,7 @@ #if WITH_OBJC rb_define_global_const("RUBY_ARCH", rb_str_new2(RUBY_ARCH)); rb_define_global_const("MACRUBY_VERSION", rb_float_new(MACRUBY_VERSION)); + rb_define_global_const("MACRUBY_REVISION", rb_str_new2(MACRUBY_REVISION)); #endif }

1 0

[765] MacRuby/trunk/misc/xcode-templates/Target Templates
by source_changes＠macosforge.org 03 Dec '08

03 Dec '08

Revision: 765 http://trac.macosforge.org/projects/ruby/changeset/765 Author: lsansonetti(a)apple.com Date: 2008-12-02 23:31:30 -0800 (Tue, 02 Dec 2008) Log Message: ----------- move the 'Embed MacRuby' target into the 'Ruby' folder Added Paths: ----------- MacRuby/trunk/misc/xcode-templates/Target Templates/Ruby/ MacRuby/trunk/misc/xcode-templates/Target Templates/Ruby/Embed MacRuby.trgttmpl Removed Paths: ------------- MacRuby/trunk/misc/xcode-templates/Target Templates/Embed MacRuby.trgttmpl Deleted: MacRuby/trunk/misc/xcode-templates/Target Templates/Embed MacRuby.trgttmpl =================================================================== --- MacRuby/trunk/misc/xcode-templates/Target Templates/Embed MacRuby.trgttmpl 2008-12-03 07:29:05 UTC (rev 764) +++ MacRuby/trunk/misc/xcode-templates/Target Templates/Embed MacRuby.trgttmpl 2008-12-03 07:31:30 UTC (rev 765) @@ -1,13 +0,0 @@ -{ - Class = Aggregate; - Description = "Target that embeds MacRuby.framework inside the current application bundle."; - CustomBuildSettings = { - }; - BuildPhases = ( - { - Class = ShellScript; - ShellPath = "/bin/sh"; - ShellScript = "PATH=\"$PATH:/usr/local/bin\" /usr/bin/env macruby -r hotcocoa/application_builder -e \"HotCocoa::ApplicationBuilder.deploy(ARGV[0])\" $TARGET_BUILD_DIR/$PROJECT_NAME.app"; - }, - ); -} Added: MacRuby/trunk/misc/xcode-templates/Target Templates/Ruby/Embed MacRuby.trgttmpl =================================================================== --- MacRuby/trunk/misc/xcode-templates/Target Templates/Ruby/Embed MacRuby.trgttmpl (rev 0) +++ MacRuby/trunk/misc/xcode-templates/Target Templates/Ruby/Embed MacRuby.trgttmpl 2008-12-03 07:31:30 UTC (rev 765) @@ -0,0 +1,13 @@ +{ + Class = Aggregate; + Description = "Target that embeds MacRuby.framework inside the current application bundle."; + CustomBuildSettings = { + }; + BuildPhases = ( + { + Class = ShellScript; + ShellPath = "/bin/sh"; + ShellScript = "PATH=\"$PATH:/usr/local/bin\" /usr/bin/env macruby -r hotcocoa/application_builder -e \"HotCocoa::ApplicationBuilder.deploy(ARGV[0])\" $TARGET_BUILD_DIR/$PROJECT_NAME.app"; + }, + ); +}

1 0

[764] MacRuby/trunk
by source_changes＠macosforge.org 03 Dec '08

03 Dec '08

Revision: 764 http://trac.macosforge.org/projects/ruby/changeset/764 Author: lsansonetti(a)apple.com Date: 2008-12-02 23:29:05 -0800 (Tue, 02 Dec 2008) Log Message: ----------- deprecate the 'build_as_embeddable' build config variable, refactor HotCocoa's ApplicationBuilder to support a direct deploy facility, introduce a 'Embed MacRuby' Xcode target that calls HotCocoa's ApplicationBuilder's deploy facility Modified Paths: -------------- MacRuby/trunk/Rakefile MacRuby/trunk/lib/hotcocoa/application_builder.rb Added Paths: ----------- MacRuby/trunk/misc/xcode-templates/Target Templates/ MacRuby/trunk/misc/xcode-templates/Target Templates/Embed MacRuby.trgttmpl Modified: MacRuby/trunk/Rakefile =================================================================== --- MacRuby/trunk/Rakefile 2008-12-03 06:07:05 UTC (rev 763) +++ MacRuby/trunk/Rakefile 2008-12-03 07:29:05 UTC (rev 764) @@ -1,6 +1,6 @@ # User customizable variables. # These variables can be set from the command line. Example: -# $ rake build_as_embeddable=true +# $ rake framework_instdir=~/Library/Frameworks sym_instdir=~/bin def do_option(name, default) val = ENV[name] @@ -28,7 +28,6 @@ FRAMEWORK_INSTDIR = do_option('framework_instdir', '/Library/Frameworks') SYM_INSTDIR = do_option('sym_instdir', '/usr/local') NO_WARN_BUILD = !do_option('allow_build_warnings', false) -BUILD_AS_EMBEDDABLE = do_option('build_as_embeddable', false) ENABLE_STATIC_LIBRARY = do_option('enable_static_library', 'no') { 'yes' } ENABLE_DEBUG_LOGGING = do_option('enable_debug_logging', true) { |x| x == 'true' } @@ -36,6 +35,11 @@ # Everything below this comment should *not* be modified. +if ENV['build_as_embeddable'] + $stderr.puts "The 'build_as_embeddable' build configuration has been removed because it is no longer necessary. To package a full version of MacRuby inside your application, please use `macrake deploy` for HotCocoa apps and the `Embed MacRuby` target for Xcode apps." + exit 1 +end + verbose(true) if `sw_vers -productVersion`.strip.to_f < 10.5 @@ -69,15 +73,7 @@ RUBY_VENDOR_LIB2 = File.join(RUBY_VENDOR_LIB, NEW_RUBY_VERSION) RUBY_VENDOR_ARCHLIB = File.join(RUBY_VENDOR_LIB2, NEW_RUBY_PLATFORM) -INSTALL_NAME = - if BUILD_AS_EMBEDDABLE - File.join("@executable_path/../Frameworks", FRAMEWORK_NAME + '.framework', - 'Versions', MACRUBY_VERSION, 'usr/lib', - 'lib' + RUBY_SO_NAME + '.dylib') - else - File.join(FRAMEWORK_USR_LIB, 'lib' + RUBY_SO_NAME + '.dylib') - end - +INSTALL_NAME = File.join(FRAMEWORK_USR_LIB, 'lib' + RUBY_SO_NAME + '.dylib') ARCHFLAGS = ARCHS.map { |a| '-arch ' + a }.join(' ') CFLAGS = "-I. -I./include -I/usr/include/libxml2 #{ARCHFLAGS} -fno-common -pipe -O2 -g -Wall" CFLAGS << " -Wno-parentheses -Wno-deprecated-declarations -Werror" if NO_WARN_BUILD Modified: MacRuby/trunk/lib/hotcocoa/application_builder.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/application_builder.rb 2008-12-03 06:07:05 UTC (rev 763) +++ MacRuby/trunk/lib/hotcocoa/application_builder.rb 2008-12-03 07:29:05 UTC (rev 764) @@ -64,7 +64,18 @@ end builder.build end - + + # Used by the "Embed MacRuby" Xcode target. + def self.deploy(path) + raise "Given path `#{path}' does not exist" unless File.exist?(path) + raise "Given path `#{path}' does not look like an application bundle" unless File.extname(path) == '.app' + deployer = new + Dir.chdir(File.dirname(path)) do + deployer.name = File.basename(path, '.app') + deployer.deploy + end + end + def initialize @sources = [] @resources = [] @@ -76,11 +87,15 @@ write_bundle_files copy_sources copy_resources - copy_framework if deploy? - copy_bs_dylibs if deploy? + deploy if deploy? copy_icon_file if icon end - + + def deploy + copy_framework + copy_bs_dylibs + end + def deploy? @deploy end @@ -129,7 +144,10 @@ end def copy_framework - FileUtils.cp_r macruby_framework_path, frameworks_root + unless File.exist?(File.join(frameworks_root, 'MacRuby.framework')) + FileUtils.mkdir_p frameworks_root + FileUtils.cp_r macruby_framework_path, frameworks_root + end `install_name_tool -change #{current_macruby_path}/usr/lib/libmacruby.dylib @executable_path/../Frameworks/MacRuby.framework/Versions/#{current_macruby_version}/usr/lib/libmacruby.dylib '#{macos_root}/#{objective_c_executable_file}'` end Added: MacRuby/trunk/misc/xcode-templates/Target Templates/Embed MacRuby.trgttmpl =================================================================== --- MacRuby/trunk/misc/xcode-templates/Target Templates/Embed MacRuby.trgttmpl (rev 0) +++ MacRuby/trunk/misc/xcode-templates/Target Templates/Embed MacRuby.trgttmpl 2008-12-03 07:29:05 UTC (rev 764) @@ -0,0 +1,13 @@ +{ + Class = Aggregate; + Description = "Target that embeds MacRuby.framework inside the current application bundle."; + CustomBuildSettings = { + }; + BuildPhases = ( + { + Class = ShellScript; + ShellPath = "/bin/sh"; + ShellScript = "PATH=\"$PATH:/usr/local/bin\" /usr/bin/env macruby -r hotcocoa/application_builder -e \"HotCocoa::ApplicationBuilder.deploy(ARGV[0])\" $TARGET_BUILD_DIR/$PROJECT_NAME.app"; + }, + ); +}

1 0

[763] MacRuby/trunk/lib/hotcocoa/application_builder.rb
by source_changes＠macosforge.org 03 Dec '08

03 Dec '08

Revision: 763 http://trac.macosforge.org/projects/ruby/changeset/763 Author: lsansonetti(a)apple.com Date: 2008-12-02 22:07:05 -0800 (Tue, 02 Dec 2008) Log Message: ----------- copy the bs dylib files during deploy Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/application_builder.rb Modified: MacRuby/trunk/lib/hotcocoa/application_builder.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/application_builder.rb 2008-12-01 06:41:49 UTC (rev 762) +++ MacRuby/trunk/lib/hotcocoa/application_builder.rb 2008-12-03 06:07:05 UTC (rev 763) @@ -77,6 +77,7 @@ copy_sources copy_resources copy_framework if deploy? + copy_bs_dylibs if deploy? copy_icon_file if icon end @@ -131,6 +132,15 @@ FileUtils.cp_r macruby_framework_path, frameworks_root `install_name_tool -change #{current_macruby_path}/usr/lib/libmacruby.dylib @executable_path/../Frameworks/MacRuby.framework/Versions/#{current_macruby_version}/usr/lib/libmacruby.dylib '#{macos_root}/#{objective_c_executable_file}'` end + + def copy_bs_dylibs + unless File.exist?(bridgesupport_root) + FileUtils.mkdir_p(bridgesupport_root) + Dir.glob('/System/Library/Frameworks/**/BridgeSupport/*.dylib').each do |p| + FileUtils.cp(p, bridgesupport_root) + end + end + end def copy_sources if secure? @@ -250,6 +260,10 @@ def resources_root File.join(contents_root, "Resources") end + + def bridgesupport_root + File.join(resources_root, "BridgeSupport") + end def info_plist_file File.join(contents_root, "Info.plist")

1 0

[762] MacRuby/trunk
by source_changes＠macosforge.org 01 Dec '08

01 Dec '08

Revision: 762 http://trac.macosforge.org/projects/ruby/changeset/762 Author: lsansonetti(a)apple.com Date: 2008-11-30 22:41:49 -0800 (Sun, 30 Nov 2008) Log Message: ----------- BridgeSupport files and dylibs can now be located inside the executable bundle, in Resources/bridgeSupport Modified Paths: -------------- MacRuby/trunk/bs.c MacRuby/trunk/bs.h MacRuby/trunk/objc.m Modified: MacRuby/trunk/bs.c =================================================================== --- MacRuby/trunk/bs.c 2008-12-01 03:13:32 UTC (rev 761) +++ MacRuby/trunk/bs.c 2008-12-01 06:41:49 UTC (rev 762) @@ -65,12 +65,42 @@ return name; } -bool -bs_find_path(const char *framework_path, char *path, const size_t path_len) +static inline const char * +_bs_main_bundle_bs_path(void) { + static bool done = false; + static char *path = NULL; + /* XXX not thread-safe */ + if (!done) { + CFBundleRef bundle; + + done = true; + bundle = CFBundleGetMainBundle(); + if (bundle != NULL) { + CFURLRef url; + + url = CFBundleCopyResourceURL(bundle, CFSTR("BridgeSupport"), + NULL, NULL); + if (url != NULL) { + CFStringRef str = CFURLCopyPath(url); + path = (char *)malloc(sizeof(char) * PATH_MAX); + CFStringGetFileSystemRepresentation(str, path, PATH_MAX); + CFRelease(str); + CFRelease(url); + } + } + } + return path; +} + +static bool +_bs_find_path(const char *framework_path, char *path, const size_t path_len, + const char *ext) +{ + const char *main_bundle_bs_path; char *framework_name; char *home; - + if (framework_path == NULL || *framework_path == '\0' || path == NULL || path_len == 0) return false; @@ -88,23 +118,30 @@ if (framework_name == NULL) return false; - snprintf(path, path_len, "%s/Resources/BridgeSupport/%s.bridgesupport", - framework_path, framework_name); + main_bundle_bs_path = _bs_main_bundle_bs_path(); + if (main_bundle_bs_path != NULL) { + snprintf(path, path_len, "%s/%s.%s", main_bundle_bs_path, + framework_name, ext); + CHECK_IF_EXISTS(); + } + + snprintf(path, path_len, "%s/Resources/BridgeSupport/%s.%s", + framework_path, framework_name, ext); CHECK_IF_EXISTS(); home = getenv("HOME"); if (home != NULL) { - snprintf(path, path_len, "%s/Library/BridgeSupport/%s.bridgesupport", - home, framework_name); + snprintf(path, path_len, "%s/Library/BridgeSupport/%s.%s", + home, framework_name, ext); CHECK_IF_EXISTS(); } - snprintf(path, path_len, "/Library/BridgeSupport/%s.bridgesupport", - framework_name); + snprintf(path, path_len, "/Library/BridgeSupport/%s.%s", + framework_name, ext); CHECK_IF_EXISTS(); - snprintf(path, path_len, "/System/Library/BridgeSupport/%s.bridgesupport", - framework_name); + snprintf(path, path_len, "/System/Library/BridgeSupport/%s.%s", + framework_name, ext); CHECK_IF_EXISTS(); #undef CHECK_IF_EXISTS @@ -113,6 +150,12 @@ return false; } +bool +bs_find_path(const char *framework_path, char *path, const size_t path_len) +{ + return _bs_find_path(framework_path, path, path_len, "bridgesupport"); +} + static inline char * get_attribute(xmlTextReaderPtr reader, const char *name) { @@ -383,8 +426,8 @@ bool bs_parser_parse(bs_parser_t *parser, const char *path, - bs_parse_options_t options, bs_parse_callback_t callback, - void *context, char **error) + const char *framework_path, bs_parse_options_t options, + bs_parse_callback_t callback, void *context, char **error) { xmlTextReaderPtr reader; bs_element_function_t *func; @@ -501,12 +544,14 @@ bs_path_found = bs_find_path(depends_on_path, bs_path, sizeof bs_path); - free(depends_on_path); if (bs_path_found) { - if (!bs_parser_parse(parser, bs_path, options, callback, context, - error)) + if (!bs_parser_parse(parser, bs_path, depends_on_path, options, + callback, context, error)) { + free(depends_on_path); return false; + } } + free(depends_on_path); break; } @@ -1123,15 +1168,14 @@ } CFRelease(cf_path); - if (success && options == BS_PARSE_OPTIONS_LOAD_DYLIBS) { - char *p, buf[PATH_MAX]; - strncpy(buf, path, sizeof buf); - p = strrchr(buf, '.'); - assert(p != NULL); - strlcpy(p, ".dylib", p - path - 1); - if (access(buf, R_OK) == 0) { + if (success && options == BS_PARSE_OPTIONS_LOAD_DYLIBS && framework_path != NULL) { + char buf[PATH_MAX]; + + if (_bs_find_path(framework_path, buf, sizeof buf, "dylib")) { if (dlopen(buf, RTLD_LAZY) == NULL) { - *error = dlerror(); + if (error != NULL) { + *error = dlerror(); + } success = false; } } Modified: MacRuby/trunk/bs.h =================================================================== --- MacRuby/trunk/bs.h 2008-12-01 03:13:32 UTC (rev 761) +++ MacRuby/trunk/bs.h 2008-12-01 06:41:49 UTC (rev 762) @@ -185,6 +185,7 @@ * * Finds the path of a framework's bridge support file, by looking at the * following locations, in order of priority: + * - inside the main executable bundle (if any), in the Resources/BridgeSupport directory ; * - inside the framework bundle, in the Resources/BridgeSupport directory ; * - in ~/Library/BridgeSupport ; * - in /Library/BridgeSupport ; @@ -232,6 +233,10 @@ * * parser: the parser object. * path: the full path of the bridge support file to parse. + * framework_path: the full path of the framework this bridge support file + * comes from. This is only required if options is BS_PARSE_OPTIONS_LOAD_DYLIBS + * in order to locate the dylib files. Pass NULL if you are passing the + * default BS_PARSE_OPTIONS_DEFAULT option. * options: parsing options. * callback: a callback function pointer. * context: a contextual data pointer that will be passed to the callback @@ -241,8 +246,8 @@ * don't need it. */ bool bs_parser_parse(bs_parser_t *parser, const char *path, - bs_parse_options_t options, bs_parse_callback_t callback, void *context, - char **error); + const char *framework_path, bs_parse_options_t options, + bs_parse_callback_t callback, void *context, char **error); /* bs_element_free() * Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2008-12-01 03:13:32 UTC (rev 761) +++ MacRuby/trunk/objc.m 2008-12-01 06:41:49 UTC (rev 762) @@ -2760,7 +2760,8 @@ static bs_parser_t *bs_parser = NULL; static void -rb_objc_load_bridge_support(const char *path, int options) +rb_objc_load_bridge_support(const char *path, const char *framework_path, + int options) { char *error; bool ok; @@ -2774,7 +2775,7 @@ assert(rb_cObject_dict != NULL); enable_method_added = Qfalse; - ok = bs_parser_parse(bs_parser, path, options, + ok = bs_parser_parse(bs_parser, path, framework_path, options, bs_parse_cb, rb_cObject_dict, &error); enable_method_added = Qtrue; if (!ok) { @@ -2827,7 +2828,7 @@ static VALUE rb_objc_load_bs(VALUE recv, VALUE path) { - rb_objc_load_bridge_support(StringValuePtr(path), 0); + rb_objc_load_bridge_support(StringValuePtr(path), NULL, 0); return recv; } @@ -2837,7 +2838,8 @@ char path[PATH_MAX]; if (bs_find_path(framework_path, path, sizeof path)) { - rb_objc_load_bridge_support(path, BS_PARSE_OPTIONS_LOAD_DYLIBS); + rb_objc_load_bridge_support(path, framework_path, + BS_PARSE_OPTIONS_LOAD_DYLIBS); } } @@ -3640,7 +3642,7 @@ - (void)loadBridgeSupportFileAtPath:(NSString *)path { - rb_objc_load_bridge_support([path fileSystemRepresentation], 0); + rb_objc_load_bridge_support([path fileSystemRepresentation], NULL, 0); } - (void)loadBridgeSupportFileAtURL:(NSURL *)URL

1 0

[761] MacRuby/trunk
by source_changes＠macosforge.org 01 Dec '08

01 Dec '08

Revision: 761 http://trac.macosforge.org/projects/ruby/changeset/761 Author: lsansonetti(a)apple.com Date: 2008-11-30 19:13:32 -0800 (Sun, 30 Nov 2008) Log Message: ----------- fixing some regressions Modified Paths: -------------- MacRuby/trunk/insns.def MacRuby/trunk/objc.m MacRuby/trunk/vm_insnhelper.c Modified: MacRuby/trunk/insns.def =================================================================== --- MacRuby/trunk/insns.def 2008-11-29 05:53:03 UTC (rev 760) +++ MacRuby/trunk/insns.def 2008-12-01 03:13:32 UTC (rev 761) @@ -1090,12 +1090,32 @@ recv = GET_SELF(); vm_search_superclass(GET_CFP(), GET_ISEQ(), recv, TOPN(num), &id, &klass); - mn = rb_objc_method_node(klass, id, NULL, &sel); #if WITH_OBJC + static ID idNew = 0, idNew2 = 0, idNew3 = 0; struct rb_method_cache mcache; void *mcachep; + if (idNew == 0) { + idNew = rb_intern("new"); + idNew2 = rb_intern("new:"); + idNew3 = rb_intern("__new__"); + } + + /* because #new is added on every new NSObject subclasses, and if overriden + we should still call our implementation with super */ + if ((id == idNew || id == idNew2) && klass == *(VALUE *)rb_cNSObject) { + VALUE k = CLASS_OF(recv); + if ((mn = rb_objc_method_node(k, idNew3, NULL, &sel)) == NULL) { + rb_bug("can't look up __new__ in klass `%s'\n", + class_getName((Class)k)); + } + klass = k; + } + else { + mn = rb_objc_method_node(klass, id, NULL, &sel); + } + if (mn != NULL) { mcache.flags = RB_MCACHE_RCALL_FLAG; mcache.as.rcall.sel = sel; Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2008-11-29 05:53:03 UTC (rev 760) +++ MacRuby/trunk/objc.m 2008-12-01 03:13:32 UTC (rev 761) @@ -2780,14 +2780,14 @@ if (!ok) { rb_raise(rb_eRuntimeError, "%s", error); } -#if defined(__LP64__) -# if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060 - /* XXX work around for <rdar://problem/6399046> NSNotFound 64-bit value is incorrect - * XXX we should introduce the possibility to write prelude scripts per +#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1060 + /* XXX we should introduce the possibility to write prelude scripts per * frameworks where this kind of changes could be located. */ - static bool nsnotfound_fixed = false; - if (!nsnotfound_fixed) { +#if defined(__LP64__) + static bool R6399046_fixed = false; + /* XXX work around for <rdar://problem/6399046> NSNotFound 64-bit value is incorrect */ + if (!R6399046_fixed) { ID nsnotfound = rb_intern("NSNotFound"); VALUE val = (VALUE)CFDictionaryGetValue(rb_cObject_dict, (void *)nsnotfound); @@ -2795,11 +2795,33 @@ CFDictionarySetValue(rb_cObject_dict, (const void *)nsnotfound, (const void *)ULL2NUM(NSNotFound)); - nsnotfound_fixed = true; + R6399046_fixed = true; + DLOG("XXX", "applied work-around for rdar://problem/6399046"); } } -# endif #endif + static bool R6401816_fixed = false; + /* XXX work around for <rdar://problem/6401816> -[NSObject performSelector:withObject:] has wrong sel_of_type attributes*/ + if (!R6401816_fixed) { + bs_element_method_t *bs_method = + rb_bs_find_method((Class)rb_cNSObject, + @selector(performSelector:withObject:)); + if (bs_method != NULL) { + bs_element_arg_t *arg = bs_method->args; + while (arg != NULL) { + if (arg->index == 0 + && arg->sel_of_type != NULL + && arg->sel_of_type[0] != '@') { + arg->sel_of_type[0] = '@'; + R6401816_fixed = true; + DLOG("XXX", "applied work-around for rdar://problem/6401816"); + break; + } + arg++; + } + } + } +#endif } static VALUE Modified: MacRuby/trunk/vm_insnhelper.c =================================================================== --- MacRuby/trunk/vm_insnhelper.c 2008-11-29 05:53:03 UTC (rev 760) +++ MacRuby/trunk/vm_insnhelper.c 2008-12-01 03:13:32 UTC (rev 761) @@ -1433,7 +1433,6 @@ static inline VALUE vm_search_normal_superclass(VALUE klass, VALUE recv, ID mid) { - static ID idNew = 0, idNew2 = 0, idNew3 = 0; VALUE k, ary; int i, count; bool klass_located; @@ -1477,22 +1476,6 @@ (void *)recv, class_getName((Class)k)); - if (idNew == 0) { - idNew = rb_intern("new"); - idNew2 = rb_intern("new:"); - idNew3 = rb_intern("__new__"); - } - - /* because #new is added on every new NSObject subclasses, and if overriden - we should still call our implementation with super */ - if ((mid == idNew || mid == idNew2) && k == *(VALUE *)rb_cNSObject) { - if (rb_objc_method_node(klass, idNew3, NULL, NULL) == NULL) { - rb_bug("can't look up __new__ in klass `%s'\n", - class_getName((Class)klass)); - } - k = klass; - } - return k; } #endif

1 0