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

[429] MacRuby/trunk/bin/hotcocoa
by source_changes＠macosforge.org 13 Aug '08

13 Aug '08

Revision: 429 http://trac.macosforge.org/projects/ruby/changeset/429 Author: rich(a)infoether.com Date: 2008-08-12 20:43:15 -0700 (Tue, 12 Aug 2008) Log Message: ----------- add label Modified Paths: -------------- MacRuby/trunk/bin/hotcocoa Modified: MacRuby/trunk/bin/hotcocoa =================================================================== --- MacRuby/trunk/bin/hotcocoa 2008-08-13 03:35:11 UTC (rev 428) +++ MacRuby/trunk/bin/hotcocoa 2008-08-13 03:43:15 UTC (rev 429) @@ -46,9 +46,12 @@ include HotCocoa +# Replace the following code with your own hotcocoa code + application do |app| window :frame => [100, 100, 500, 500], :title => "#{app_name}" do |win| - win.will_close { exit } + win << label(:text => "Hello from HotCocoa", :layout => {:start => false}) + win.will_close { exit } end end }

1 0

[428] MacRuby/trunk/instruby.rb
by source_changes＠macosforge.org 13 Aug '08

13 Aug '08

Revision: 428 http://trac.macosforge.org/projects/ruby/changeset/428 Author: rich(a)infoether.com Date: 2008-08-12 20:35:11 -0700 (Tue, 12 Aug 2008) Log Message: ----------- do not rename hotcocoa command Modified Paths: -------------- MacRuby/trunk/instruby.rb Modified: MacRuby/trunk/instruby.rb =================================================================== --- MacRuby/trunk/instruby.rb 2008-08-13 03:16:17 UTC (rev 427) +++ MacRuby/trunk/instruby.rb 2008-08-13 03:35:11 UTC (rev 428) @@ -304,9 +304,9 @@ for src in Dir["bin/*"] next unless File.file?(src) next if /\/[.#]|(\.(old|bak|orig|rej|diff|patch|core)|~|\/core)$/i =~ src + + name = (File.basename(src) == "hotcocoa" ? "hotcocoa" : ruby_install_name.sub(/ruby/, File.basename(src))) - name = ruby_install_name.sub(/ruby/, File.basename(src)) - shebang = '' body = '' open(src, "rb") do |f|

1 0

[427] MacRuby/trunk/bin/hotcocoa
by source_changes＠macosforge.org 13 Aug '08

13 Aug '08

Revision: 427 http://trac.macosforge.org/projects/ruby/changeset/427 Author: rich(a)infoether.com Date: 2008-08-12 20:16:17 -0700 (Tue, 12 Aug 2008) Log Message: ----------- fix #! line Modified Paths: -------------- MacRuby/trunk/bin/hotcocoa Modified: MacRuby/trunk/bin/hotcocoa =================================================================== --- MacRuby/trunk/bin/hotcocoa 2008-08-13 03:04:21 UTC (rev 426) +++ MacRuby/trunk/bin/hotcocoa 2008-08-13 03:16:17 UTC (rev 427) @@ -1,4 +1,4 @@ -#!/usr/local/bin/macruby +#!/usr/bin/env ruby project_name = ARGV.shift

1 0

[426] MacRuby/trunk/bin/hotcocoa
by source_changes＠macosforge.org 13 Aug '08

13 Aug '08

Revision: 426 http://trac.macosforge.org/projects/ruby/changeset/426 Author: rich(a)infoether.com Date: 2008-08-12 20:04:21 -0700 (Tue, 12 Aug 2008) Log Message: ----------- initial checkin of hotcocoa generator Added Paths: ----------- MacRuby/trunk/bin/hotcocoa Added: MacRuby/trunk/bin/hotcocoa =================================================================== --- MacRuby/trunk/bin/hotcocoa (rev 0) +++ MacRuby/trunk/bin/hotcocoa 2008-08-13 03:04:21 UTC (rev 426) @@ -0,0 +1,79 @@ +#!/usr/local/bin/macruby + +project_name = ARGV.shift + +unless project_name + puts "Usage: hotcocoa <project name>" + exit +end + +if File.exist?(project_name) + if File.extname(project_name) == ".rb" + file_to_copy = project_name + project_name = project_name[0..-4] + else + puts %{Error: "#{project_name}" already exists in this directory.} + exit + end +else + file_to_copy = nil +end + +require 'fileutils' + +config_dir = File.join(project_name, "config") +lib_dir = File.join(project_name, "lib") +test_dir = File.join(project_name, "test") +app_name = project_name.split("_").collect(&:capitalize).join(" ") + +FileUtils.mkdir_p config_dir +FileUtils.mkdir_p lib_dir +FileUtils.mkdir_p test_dir + +File.open(File.join(config_dir, "build.yml"), "w") do |file| + file.puts %{:name: #{app_name}} + file.puts %{:load: lib/#{project_name}.rb} + file.puts %{:sources: } + file.puts %{ - lib/**/*.rb} +end + +File.open(File.join(lib_dir, "#{project_name}.rb"), "w") do |file| + if file_to_copy + file.write File.read(file_to_copy) + else + file.puts %{ +require 'hotcocoa' + +include HotCocoa + +application do |app| + window :frame => [100, 100, 500, 500], :title => "#{app_name}" do |win| + win.will_close { exit } + end +end + } + end +end + +File.open(File.join(project_name, "Rakefile"), "w") do |file| + file.puts %{ +task :default => [:run] + +task :build do + require 'hotcocoa/application_builder' + ApplicationBuilder.build :file => "config/build.yml" +end + +task :run => [:build] do + require 'yaml' + app_name = YAML.load(File.read("config/build.yml"))[:name] + `open "#{app_name}.app"` +end + +task :clean do + require 'yaml' + app_name = YAML.load(File.read("config/build.yml"))[:name] + `rm -rf "#{app_name}.app"` +end + } +end \ No newline at end of file Property changes on: MacRuby/trunk/bin/hotcocoa ___________________________________________________________________ Name: svn:executable + *

1 0

[425] MacRuby/trunk/lib/hotcocoa/application_builder.rb
by source_changes＠macosforge.org 13 Aug '08

13 Aug '08

Revision: 425 http://trac.macosforge.org/projects/ruby/changeset/425 Author: rich(a)infoether.com Date: 2008-08-12 19:23:31 -0700 (Tue, 12 Aug 2008) Log Message: ----------- put cd in quotes 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-08-13 02:22:58 UTC (rev 424) +++ MacRuby/trunk/lib/hotcocoa/application_builder.rb 2008-08-13 02:23:31 UTC (rev 425) @@ -93,7 +93,7 @@ f.puts %{ <key>CFBundleDevelopmentRegion</key>} f.puts %{ <string>English</string>} f.puts %{ <key>CFBundleExecutable</key>} - f.puts %{ <string>#{name}</string>} + f.puts %{ <string>#{name.gsub(/ /, '')}</string>} f.puts %{ <key>CFBundleIdentifier</key>} f.puts %{ <string>com.yourcompany.#{name}</string>} f.puts %{ <key>CFBundleInfoDictionaryVersion</key>} @@ -125,7 +125,7 @@ } } end - `cd #{macos_root} && gcc main.m -o #{name} -arch ppc -arch i386 -framework MacRuby -framework Foundation -fobjc-gc-only` + puts `cd "#{macos_root}" && gcc main.m -o #{name.gsub(/ /, '')} -arch ppc -arch i386 -framework MacRuby -framework Foundation -fobjc-gc-only` File.unlink(objective_c_source_file) end

1 0

[424] MacRuby/trunk/sample-macruby/HotCocoa/secure_text_field_app_builder. rb
by source_changes＠macosforge.org 13 Aug '08

13 Aug '08

Revision: 424 http://trac.macosforge.org/projects/ruby/changeset/424 Author: rich(a)infoether.com Date: 2008-08-12 19:22:58 -0700 (Tue, 12 Aug 2008) Log Message: ----------- remove this example Removed Paths: ------------- MacRuby/trunk/sample-macruby/HotCocoa/secure_text_field_app_builder.rb Deleted: MacRuby/trunk/sample-macruby/HotCocoa/secure_text_field_app_builder.rb =================================================================== --- MacRuby/trunk/sample-macruby/HotCocoa/secure_text_field_app_builder.rb 2008-08-13 02:16:48 UTC (rev 423) +++ MacRuby/trunk/sample-macruby/HotCocoa/secure_text_field_app_builder.rb 2008-08-13 02:22:58 UTC (rev 424) @@ -1,3 +0,0 @@ -require 'hotcocoa/application_builder' - -ApplicationBuilder.build :name => "SecureTextField", :load => "secure_text_field.rb", :force => true

1 0

[423] MacRuby/branches/lrz_unstable
by source_changes＠macosforge.org 13 Aug '08

13 Aug '08

Revision: 423 http://trac.macosforge.org/projects/ruby/changeset/423 Author: lsansonetti(a)apple.com Date: 2008-08-12 19:16:48 -0700 (Tue, 12 Aug 2008) Log Message: ----------- wip Modified Paths: -------------- MacRuby/branches/lrz_unstable/class.c MacRuby/branches/lrz_unstable/vm_method.c Modified: MacRuby/branches/lrz_unstable/class.c =================================================================== --- MacRuby/branches/lrz_unstable/class.c 2008-08-13 01:10:29 UTC (rev 422) +++ MacRuby/branches/lrz_unstable/class.c 2008-08-13 02:16:48 UTC (rev 423) @@ -610,12 +610,19 @@ methods = class_copyMethodList((Class)module, &methods_count); if (methods != NULL) { for (i = 0; i < methods_count; i++) { - Method method = methods[i]; + Method method = methods[i], method2; DLOG("DEFI", "-[%s %s]", class_getName((Class)klass), (char *)method_getName(method)); - assert(class_addMethod((Class)klass, - method_getName(method), - method_getImplementation(method), - method_getTypeEncoding(method))); + + method2 = class_getInstanceMethod((Class)klass, method_getName(method)); + if (method2 != NULL && method2 != class_getInstanceMethod((Class)RCLASS_SUPER(klass), method_getName(method))) { + method_setImplementation(method2, method_getImplementation(method)); + } + else { + assert(class_addMethod((Class)klass, + method_getName(method), + method_getImplementation(method), + method_getTypeEncoding(method))); + } } free(methods); } Modified: MacRuby/branches/lrz_unstable/vm_method.c =================================================================== --- MacRuby/branches/lrz_unstable/vm_method.c 2008-08-13 01:10:29 UTC (rev 422) +++ MacRuby/branches/lrz_unstable/vm_method.c 2008-08-13 02:16:48 UTC (rev 423) @@ -232,7 +232,7 @@ NODE *node; if (klass == 0) return NULL; - node = rb_objc_method_node(klass, id, NULL, NULL); + node = rb_method_node(klass, id); if (node != NULL) { if (klassp != NULL) /* TODO honour klassp */ *klassp = klass; @@ -315,7 +315,21 @@ rb_method_node(VALUE klass, ID id) { #if WITH_OBJC - return rb_objc_method_node(klass, id, NULL, NULL); + NODE *node = rb_objc_method_node(klass, id, NULL, NULL); + if (node == NULL) { + const char *id_str = rb_id2name(id); + size_t slen = strlen(id_str); + + if (id_str[slen - 1] == ':') { + return NULL; + } + else { + char buf[100]; + snprintf(buf, sizeof buf, "%s:", id_str); + return rb_method_node(klass, rb_intern(buf)); + } + } + return node; #else struct cache_entry *ent;

1 0

[422] MacRuby/branches/lrz_unstable
by source_changes＠macosforge.org 13 Aug '08

13 Aug '08

Revision: 422 http://trac.macosforge.org/projects/ruby/changeset/422 Author: lsansonetti(a)apple.com Date: 2008-08-12 18:10:29 -0700 (Tue, 12 Aug 2008) Log Message: ----------- wip Modified Paths: -------------- MacRuby/branches/lrz_unstable/class.c MacRuby/branches/lrz_unstable/compile.c MacRuby/branches/lrz_unstable/include/ruby/ruby.h MacRuby/branches/lrz_unstable/objc.m MacRuby/branches/lrz_unstable/object.c MacRuby/branches/lrz_unstable/variable.c MacRuby/branches/lrz_unstable/vm_eval.c MacRuby/branches/lrz_unstable/vm_insnhelper.c Modified: MacRuby/branches/lrz_unstable/class.c =================================================================== --- MacRuby/branches/lrz_unstable/class.c 2008-08-12 06:00:09 UTC (rev 421) +++ MacRuby/branches/lrz_unstable/class.c 2008-08-13 01:10:29 UTC (rev 422) @@ -121,7 +121,6 @@ VALUE klass; klass = rb_objc_alloc_class(name, super, T_CLASS, rb_cClass); - objc_registerClassPair((Class)klass); if (RCLASS_SUPER(klass) == rb_cNSObject) { @@ -230,28 +229,30 @@ rb_mod_init_copy(VALUE clone, VALUE orig) { rb_obj_init_copy(clone, orig); +#if !WITH_OBJC if (!RCLASS_SINGLETON(CLASS_OF(clone))) { RBASIC(clone)->klass = rb_singleton_class_clone(orig); } +#endif #if WITH_OBJC { - Class ocsuper; + VALUE super; int version_flag; if (orig == rb_cNSMutableString || orig == rb_cNSMutableArray || orig == rb_cNSMutableHash) { - ocsuper = (Class)orig; + super = orig; rb_warn("cloning class `%s' is not supported, creating a " \ "subclass instead", rb_class2name(orig)); } else { - ocsuper = class_getSuperclass((Class)orig); + super = RCLASS_SUPER(orig); } - class_setSuperclass((Class)clone, ocsuper); + RCLASS_SUPER(clone) = super; version_flag = RCLASS_IS_RUBY_CLASS; - if ((RCLASS_VERSION(ocsuper) & RCLASS_IS_OBJECT_SUBCLASS) == RCLASS_IS_OBJECT_SUBCLASS) + if ((RCLASS_VERSION(super) & RCLASS_IS_OBJECT_SUBCLASS) == RCLASS_IS_OBJECT_SUBCLASS) version_flag |= RCLASS_IS_OBJECT_SUBCLASS; class_setVersion((Class)clone, version_flag); @@ -370,26 +371,21 @@ return rb_cClass; } else { -// VALUE metasuper; VALUE klass; klass = rb_class_boot(super); RBASIC(obj)->klass = klass; #if WITH_OBJC - //RCLASS_SET_SINGLETON(klass); + if (super == rb_cNSObject) { + RCLASS_VERSION(klass) ^= RCLASS_IS_OBJECT_SUBCLASS; + } + RCLASS_SET_VERSION_FLAG(klass, RCLASS_IS_SINGLETON); #else FL_SET(klass, FL_SINGLETON); #endif rb_singleton_class_attached(klass, obj); -#if 0 - metasuper = RBASIC(rb_class_real(super))->klass; - /* metaclass of a superclass may be NULL at boot time */ - if (metasuper) { - RBASIC(klass)->klass = metasuper; - } -#endif return klass; } } @@ -1190,29 +1186,22 @@ } DEFER_INTS; -#if WITH_OBJC - if (NATIVE(obj)) { - Class ocklass; - - ocklass = *(Class *)obj; - klass = (VALUE)ocklass; - if (class_isMetaClass(ocklass)) - return klass; - - if (!RCLASS_SINGLETON(ocklass)) - klass = rb_make_metaclass(obj, (VALUE)ocklass); - - return klass; - } - if (TYPE(obj) == T_CLASS) - return obj; -#endif if (RCLASS_SINGLETON(RBASIC(obj)->klass) && rb_iv_get(RBASIC(obj)->klass, "__attached__") == obj) { klass = RBASIC(obj)->klass; } else { - klass = rb_make_metaclass(obj, RBASIC(obj)->klass); +#if WITH_OBJC + switch (TYPE(obj)) { + case T_CLASS: + case T_MODULE: + klass = *(VALUE *)obj; + break; + default: + klass = rb_make_metaclass(obj, RBASIC(obj)->klass); + break; + } +#endif } #if 0 if (OBJ_TAINTED(obj)) { Modified: MacRuby/branches/lrz_unstable/compile.c =================================================================== --- MacRuby/branches/lrz_unstable/compile.c 2008-08-12 06:00:09 UTC (rev 421) +++ MacRuby/branches/lrz_unstable/compile.c 2008-08-13 01:10:29 UTC (rev 422) @@ -732,7 +732,7 @@ mcache->as.rcall.sel = sel_registerName(buf); } } - operands[4] = (VALUE)mcache; + GC_WB(&operands[4], mcache); iobj = new_insn_core(iseq, line_no, BIN(send), 5, operands); return iobj; } Modified: MacRuby/branches/lrz_unstable/include/ruby/ruby.h =================================================================== --- MacRuby/branches/lrz_unstable/include/ruby/ruby.h 2008-08-12 06:00:09 UTC (rev 421) +++ MacRuby/branches/lrz_unstable/include/ruby/ruby.h 2008-08-13 01:10:29 UTC (rev 422) @@ -499,7 +499,7 @@ # define RCLASS_IS_OBJECT_SUBCLASS 0x100 /* class is a true RBObject subclass */ # define RCLASS_IS_RUBY_CLASS 0x200 /* class was created from Ruby */ # define RCLASS_IS_MODULE 0x400 /* class represents a Ruby Module */ -# define RCLASS_IS_SINGLETON 0x800 /* class represents a singleton/metaclass */ +# define RCLASS_IS_SINGLETON 0x800 /* class represents a singleton */ # define RCLASS_IS_FROZEN 0x1000 /* class is frozen */ # define RCLASS_IS_TAINTED 0x2000 /* class is tainted */ # define RCLASS_IS_STRING_SUBCLASS 0x10000 /* class is a subclass of NSCFString */ @@ -509,16 +509,17 @@ # define RCLASS_VERSION(m) (class_getVersion((Class)m)) # define RCLASS_SET_VERSION_FLAG(m,f) (class_setVersion((Class)m, (RCLASS_VERSION(m) | f))) # define RCLASS_SUPER(m) (class_getSuperclass((Class)m)) -# define RCLASS_SINGLETON(m) (class_isMetaclass((Class)m)) +# define RCLASS_META(m) (class_isMetaclass((Class)m)) # else # define RCLASS_VERSION(m) (*(long *)((void *)m + (sizeof(void *) * 3))) # define RCLASS_SET_VERSION_FLAG(m,f) (RCLASS_VERSION(m) |= f) # define RCLASS_SUPER(m) (*(VALUE *)((void *)m + (sizeof(void *) * 1))) # define _RCLASS_INFO(m) (*(long *)((void *)m + (sizeof(void *) * 4))) -# define RCLASS_SINGLETON(m) (_RCLASS_INFO(m) & CLS_META) +# define RCLASS_META(m) (_RCLASS_INFO(m) & CLS_META) # endif # define RCLASS_RUBY(m) ((RCLASS_VERSION(m) & RCLASS_IS_RUBY_CLASS) == RCLASS_IS_RUBY_CLASS) # define RCLASS_MODULE(m) ((RCLASS_VERSION(m) & RCLASS_IS_MODULE) == RCLASS_IS_MODULE) +# define RCLASS_SINGLETON(m) ((RCLASS_VERSION(m) & RCLASS_IS_SINGLETON) == RCLASS_IS_SINGLETON) CFMutableDictionaryRef rb_class_ivar_dict(VALUE); CFMutableDictionaryRef rb_class_ivar_dict_or_create(VALUE); void rb_class_ivar_set_dict(VALUE, CFMutableDictionaryRef); @@ -1181,7 +1182,7 @@ } #if WITH_OBJC else if ((k = *(Class *)obj) != NULL) { - if (RCLASS_SINGLETON(k)) { + if (RCLASS_META(k)) { if (RCLASS_MODULE(obj)) return T_MODULE; else return T_CLASS; } Modified: MacRuby/branches/lrz_unstable/objc.m =================================================================== --- MacRuby/branches/lrz_unstable/objc.m 2008-08-12 06:00:09 UTC (rev 421) +++ MacRuby/branches/lrz_unstable/objc.m 2008-08-13 01:10:29 UTC (rev 422) @@ -1722,12 +1722,25 @@ static ID rb_bs_struct_field_ivar_id(void) { + const char *frame_str; char ivar_name[128]; - int len; + size_t len; - len = snprintf(ivar_name, sizeof ivar_name, "@%s", - rb_id2name(rb_frame_this_func())); - if (ivar_name[len - 1] == '=') + frame_str = rb_id2name(rb_frame_this_func()); + if (strlen(frame_str) >= 5 + && frame_str[0] == 's' + && frame_str[1] == 'e' + && frame_str[2] == 't' + && isupper(frame_str[3])) { + + len = snprintf(ivar_name, sizeof ivar_name, "@%s", &frame_str[3]); + ivar_name[1] = tolower(ivar_name[1]); + } + else { + len = snprintf(ivar_name, sizeof ivar_name, "@%s", frame_str); + } + + if (ivar_name[len - 1] == '=' || ivar_name[len - 1] == ':') ivar_name[len - 1] = '\0'; return rb_intern(ivar_name); Modified: MacRuby/branches/lrz_unstable/object.c =================================================================== --- MacRuby/branches/lrz_unstable/object.c 2008-08-12 06:00:09 UTC (rev 421) +++ MacRuby/branches/lrz_unstable/object.c 2008-08-13 01:10:29 UTC (rev 422) @@ -131,6 +131,11 @@ rb_class_real(VALUE cl) { #if WITH_OBJC + if (cl == 0) + return 0; + while (RCLASS_SINGLETON(cl)) { + cl = RCLASS_SUPER(cl); + } return cl; #else if (cl == 0) @@ -937,6 +942,7 @@ || rb_objc_flag_check((const void *)obj, FL_FREEZE) ? Qtrue : Qfalse; case T_CLASS: + case T_ICLASS: case T_MODULE: return (RCLASS_VERSION(obj) & RCLASS_IS_FROZEN) == RCLASS_IS_FROZEN ? Qtrue : Qfalse; default: @@ -2508,6 +2514,12 @@ { return NATIVE(recv) ? Qtrue : Qfalse; } + +static VALUE +rb_class_is_meta(VALUE klass) +{ + return RCLASS_META(klass) ? Qtrue : Qfalse; +} #endif /* @@ -2729,6 +2741,7 @@ rb_define_method(rb_cModule, "ancestors", rb_mod_ancestors, 0); /* in class.c */ #if WITH_OBJC rb_define_private_method(rb_cModule, "ib_outlet", rb_mod_objc_ib_outlet, -1); /* in objc.m */ + rb_define_method(rb_cClass, "__meta__?", rb_class_is_meta, 0); #endif rb_define_private_method(rb_cModule, "attr", rb_mod_attr, -1); Modified: MacRuby/branches/lrz_unstable/variable.c =================================================================== --- MacRuby/branches/lrz_unstable/variable.c 2008-08-12 06:00:09 UTC (rev 421) +++ MacRuby/branches/lrz_unstable/variable.c 2008-08-13 01:10:29 UTC (rev 422) @@ -1246,7 +1246,7 @@ if (!CFDictionaryGetValueIfPresent( (CFDictionaryRef)ROBJECT(obj)->ivars.as.tbl, (const void *)id, - (const void **)val)) + (const void **)&val)) val = Qundef; break; } @@ -1259,6 +1259,7 @@ if (len <= index) break; val = ptr[index]; #endif + if (val != Qundef) return val; break; @@ -1363,6 +1364,7 @@ xfree(ROBJECT(obj)->ivars.as.ary); GC_WB(&ROBJECT(obj)->ivars.as.tbl, tbl); + CFMakeCollectable(tbl); RB_IVAR_SET_TYPE(ROBJECT(obj)->ivars, RB_IVAR_TBL); } else { @@ -2427,6 +2429,10 @@ #endif tmp = klass; +#if WITH_OBJC + if (!RCLASS_META(klass)) + tmp = klass = *(VALUE *)klass; +#endif CVAR_LOOKUP(0, {if (!front) front = klass; target = klass;}); if (target) { if (front && target != front) { @@ -2461,6 +2467,10 @@ #endif tmp = klass; +#if WITH_OBJC + if (!RCLASS_META(klass)) + tmp = klass = *(VALUE *)klass; +#endif CVAR_LOOKUP(&value, {if (!front) front = klass; target = klass;}); if (!target) { rb_name_error(id,"uninitialized class variable %s in %s", @@ -2492,6 +2502,10 @@ CFMutableDictionaryRef iv_dict; #endif if (!klass) return Qfalse; +#if WITH_OBJC + if (!RCLASS_META(klass)) + klass = *(VALUE *)klass; +#endif CVAR_LOOKUP(0,return Qtrue); return Qfalse; } Modified: MacRuby/branches/lrz_unstable/vm_eval.c =================================================================== --- MacRuby/branches/lrz_unstable/vm_eval.c 2008-08-12 06:00:09 UTC (rev 421) +++ MacRuby/branches/lrz_unstable/vm_eval.c 2008-08-13 01:10:29 UTC (rev 422) @@ -198,10 +198,25 @@ SEL sel; if (argc > 0 && mid != ID_ALLOCATOR) { + const char *mid_str; char buf[512]; - strncpy(buf, rb_id2name(mid), sizeof buf); - if (buf[strlen(buf) - 1] != ':') - strlcat(buf, ":", sizeof buf); + size_t len; + + mid_str = rb_id2name(mid); + len = strlen(mid_str); + if (len > 1 && mid_str[len - 1] == '=' && isalpha(mid_str[len - 2])) { + assert(len + 3 < sizeof(buf)); + buf[0] = 's'; + buf[1] = 'e'; + buf[2] = 't'; + buf[3] = toupper(mid_str[0]); + strlcpy(&buf[4], &mid_str[1], len - 1); + buf[len + 2] = ':'; + buf[len + 3] = '\0'; + } + else if (mid_str[len - 1] != ':') { + snprintf(buf, sizeof buf, "%s:", mid_str); + } mid = rb_intern(buf); } Modified: MacRuby/branches/lrz_unstable/vm_insnhelper.c =================================================================== --- MacRuby/branches/lrz_unstable/vm_insnhelper.c 2008-08-12 06:00:09 UTC (rev 421) +++ MacRuby/branches/lrz_unstable/vm_insnhelper.c 2008-08-13 01:10:29 UTC (rev 422) @@ -674,7 +674,7 @@ SEL sel; IMP imp; mn = rb_objc_method_node(klass, id, &imp, &sel); - if (imp != NULL) { + if (mn == NULL && imp != NULL) { static struct rb_method_cache mcache_s; mcache = &mcache_s; mcache->as.ocall.sel = sel;

1 0

[421] MacRuby/trunk/lib/hotcocoa/application_builder.rb
by source_changes＠macosforge.org 12 Aug '08

12 Aug '08

Revision: 421 http://trac.macosforge.org/projects/ruby/changeset/421 Author: rich(a)infoether.com Date: 2008-08-11 23:00:09 -0700 (Mon, 11 Aug 2008) Log Message: ----------- change force to overwrite, expand the sources upon appending them, explicitly build the directories if needed in the Resources dir 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-08-11 17:37:44 UTC (rev 420) +++ MacRuby/trunk/lib/hotcocoa/application_builder.rb 2008-08-12 06:00:09 UTC (rev 421) @@ -6,7 +6,7 @@ ApplicationBundlePackage = "APPL????" - attr_accessor :name, :load_file, :sources, :force + attr_accessor :name, :load_file, :sources, :overwrite def self.build(build_options) if build_options[:file] @@ -16,7 +16,7 @@ ab = new ab.name = build_options[:name] ab.load_file = build_options[:load] - ab.force = (build_options.include?(:force) ? build_options[:force] : false) + ab.overwrite = (build_options.include?(:overwrite) ? build_options[:overwrite] : true) sources = build_options[:sources] || [] sources.each do |source| ab << source @@ -35,22 +35,24 @@ copy_sources end - def force? - @force + def overwrite? + @overwrite end - def <<(source_file) - sources << source_file + def <<(source_file_pattern) + Dir.glob(source_file_pattern).each do |source_file| + sources << source_file + end end private def check_for_bundle_root if File.exist?(bundle_root) - if force? - puts `rm -rf #{bundle_root}` + if overwrite? + `rm -rf #{bundle_root}` else - puts "Error, #{bundle_root} already exists, use :force => true to remove" + puts "Error, #{bundle_root} already exists, use :overwrite => true to remove" end end end @@ -72,7 +74,9 @@ def copy_sources FileUtils.cp_r load_file, resources_root unless sources.include?(load_file) sources.each do |source| - FileUtils.cp_r source, resources_root + destination = File.join(resources_root, source) + FileUtils.mkdir_p(File.dirname(destination)) unless File.exist?(File.dirname(destination)) + FileUtils.cp_r source, destination end end

1 0

[420] MacRuby/trunk/lib/hotcocoa/application_builder.rb
by source_changes＠macosforge.org 11 Aug '08

11 Aug '08

Revision: 420 http://trac.macosforge.org/projects/ruby/changeset/420 Author: rich(a)infoether.com Date: 2008-08-11 10:37:44 -0700 (Mon, 11 Aug 2008) Log Message: ----------- add copying of load file to sources, change require to load, enable :force to remove and rebuild app 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-08-11 17:36:29 UTC (rev 419) +++ MacRuby/trunk/lib/hotcocoa/application_builder.rb 2008-08-11 17:37:44 UTC (rev 420) @@ -1,3 +1,5 @@ +require 'fileutils' + module HotCocoa class ApplicationBuilder @@ -4,7 +6,7 @@ ApplicationBundlePackage = "APPL????" - attr_accessor :name, :require_file, :sources + attr_accessor :name, :load_file, :sources, :force def self.build(build_options) if build_options[:file] @@ -13,8 +15,10 @@ end ab = new ab.name = build_options[:name] - ab.require_file = build_options[:require] - build_options[:sources].each do |source| + ab.load_file = build_options[:load] + ab.force = (build_options.include?(:force) ? build_options[:force] : false) + sources = build_options[:sources] || [] + sources.each do |source| ab << source end ab.build @@ -25,17 +29,32 @@ end def build + check_for_bundle_root build_bundle_structure write_bundle_files copy_sources end + def force? + @force + end + def <<(source_file) sources << source_file end private + def check_for_bundle_root + if File.exist?(bundle_root) + if force? + puts `rm -rf #{bundle_root}` + else + puts "Error, #{bundle_root} already exists, use :force => true to remove" + end + end + end + def build_bundle_structure Dir.mkdir(bundle_root) Dir.mkdir(contents_root) @@ -51,8 +70,10 @@ end def copy_sources - require 'fileutils' - FileUtils.cp_r sources, resources_root + FileUtils.cp_r load_file, resources_root unless sources.include?(load_file) + sources.each do |source| + FileUtils.cp_r source, resources_root + end end def write_pkg_info_file @@ -108,7 +129,7 @@ File.open(main_ruby_source_file, "wb") do |f| f.puts %{ $:.unshift NSBundle.mainBundle.resourcePath.fileSystemRepresentation - require '#{require_file}' + load '#{load_file}' } end end

1 0