February 2011 - macruby-changes - lists.macosforge.org

[5248] MacRuby/trunk
by source_changes＠macosforge.org 26 Feb '11

26 Feb '11

Revision: 5248 http://trac.macosforge.org/projects/ruby/changeset/5248 Author: lsansonetti(a)apple.com Date: 2011-02-25 17:27:10 -0800 (Fri, 25 Feb 2011) Log Message: ----------- revert unwanted changes Modified Paths: -------------- MacRuby/trunk/include/ruby/defines.h MacRuby/trunk/rational.c Modified: MacRuby/trunk/include/ruby/defines.h =================================================================== --- MacRuby/trunk/include/ruby/defines.h 2011-02-26 01:26:13 UTC (rev 5247) +++ MacRuby/trunk/include/ruby/defines.h 2011-02-26 01:27:10 UTC (rev 5248) @@ -76,7 +76,12 @@ #include <AvailabilityMacros.h> -#if SIZEOF_INT*2 <= SIZEOF_LONG_LONG +#if defined(__LP64__) && (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060) +# define BDIGIT uint64_t +# define SIZEOF_BDIGITS 8 +# define BDIGIT_DBL __uint128_t +# define BDIGIT_DBL_SIGNED __int128_t +#elif SIZEOF_INT*2 <= SIZEOF_LONG_LONG # define BDIGIT unsigned int # define SIZEOF_BDIGITS SIZEOF_INT # define BDIGIT_DBL unsigned LONG_LONG Modified: MacRuby/trunk/rational.c =================================================================== --- MacRuby/trunk/rational.c 2011-02-26 01:26:13 UTC (rev 5247) +++ MacRuby/trunk/rational.c 2011-02-26 01:27:10 UTC (rev 5248) @@ -349,6 +349,8 @@ return nurat_s_new_internal(klass, ZERO, ONE); } +#define rb_raise_zerodiv() rb_raise(rb_eZeroDivError, "divided by 0") + #if 0 static VALUE nurat_s_new_bang(int argc, VALUE *argv, VALUE klass) @@ -373,7 +375,7 @@ den = f_negate(den); break; case 0: - rb_num_zerodiv(); + rb_raise_zerodiv(); break; } break; @@ -444,7 +446,7 @@ den = f_negate(den); break; case 0: - rb_num_zerodiv(); + rb_raise_zerodiv(); break; } @@ -468,7 +470,7 @@ den = f_negate(den); break; case 0: - rb_num_zerodiv(); + rb_raise_zerodiv(); break; } @@ -852,10 +854,9 @@ switch (TYPE(other)) { case T_FIXNUM: case T_BIGNUM: + if (f_zero_p(other)) + rb_raise_zerodiv(); { - if (f_zero_p(other)) { - rb_num_zerodiv(); - } get_dat1(self); return f_muldiv(self, @@ -865,10 +866,9 @@ case T_FLOAT: return rb_funcall(f_to_f(self), '/', 1, other); case T_RATIONAL: + if (f_zero_p(other)) + rb_raise_zerodiv(); { - if (f_zero_p(other)) { - rb_num_zerodiv(); - } get_dat2(self, other); if (f_one_p(self)) @@ -1587,7 +1587,7 @@ dat->den = RARRAY_AT(ary ,1); rb_copy_generic_ivar(self, ary); if (f_zero_p(dat->den)) { - rb_num_zerodiv(); + rb_raise_zerodiv(); } return self; }

1 0

[5247] MacRuby/trunk
by source_changes＠macosforge.org 26 Feb '11

26 Feb '11

Revision: 5247 http://trac.macosforge.org/projects/ruby/changeset/5247 Author: lsansonetti(a)apple.com Date: 2011-02-25 17:26:13 -0800 (Fri, 25 Feb 2011) Log Message: ----------- increase the max encoding length, because IOKit contains very large structures Modified Paths: -------------- MacRuby/trunk/bs.c MacRuby/trunk/include/ruby/defines.h MacRuby/trunk/rational.c Modified: MacRuby/trunk/bs.c =================================================================== --- MacRuby/trunk/bs.c 2011-02-26 01:08:28 UTC (rev 5246) +++ MacRuby/trunk/bs.c 2011-02-26 01:26:13 UTC (rev 5247) @@ -253,7 +253,7 @@ return ret; } -#define MAX_ENCODE_LEN 2048 +#define MAX_ENCODE_LEN 4096 #ifndef MIN # define MIN(a, b) (((a) < (b)) ? (a) : (b)) Modified: MacRuby/trunk/include/ruby/defines.h =================================================================== --- MacRuby/trunk/include/ruby/defines.h 2011-02-26 01:08:28 UTC (rev 5246) +++ MacRuby/trunk/include/ruby/defines.h 2011-02-26 01:26:13 UTC (rev 5247) @@ -76,12 +76,7 @@ #include <AvailabilityMacros.h> -#if defined(__LP64__) && (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060) -# define BDIGIT uint64_t -# define SIZEOF_BDIGITS 8 -# define BDIGIT_DBL __uint128_t -# define BDIGIT_DBL_SIGNED __int128_t -#elif SIZEOF_INT*2 <= SIZEOF_LONG_LONG +#if SIZEOF_INT*2 <= SIZEOF_LONG_LONG # define BDIGIT unsigned int # define SIZEOF_BDIGITS SIZEOF_INT # define BDIGIT_DBL unsigned LONG_LONG Modified: MacRuby/trunk/rational.c =================================================================== --- MacRuby/trunk/rational.c 2011-02-26 01:08:28 UTC (rev 5246) +++ MacRuby/trunk/rational.c 2011-02-26 01:26:13 UTC (rev 5247) @@ -349,8 +349,6 @@ return nurat_s_new_internal(klass, ZERO, ONE); } -#define rb_raise_zerodiv() rb_raise(rb_eZeroDivError, "divided by 0") - #if 0 static VALUE nurat_s_new_bang(int argc, VALUE *argv, VALUE klass) @@ -375,7 +373,7 @@ den = f_negate(den); break; case 0: - rb_raise_zerodiv(); + rb_num_zerodiv(); break; } break; @@ -446,7 +444,7 @@ den = f_negate(den); break; case 0: - rb_raise_zerodiv(); + rb_num_zerodiv(); break; } @@ -470,7 +468,7 @@ den = f_negate(den); break; case 0: - rb_raise_zerodiv(); + rb_num_zerodiv(); break; } @@ -854,9 +852,10 @@ switch (TYPE(other)) { case T_FIXNUM: case T_BIGNUM: - if (f_zero_p(other)) - rb_raise_zerodiv(); { + if (f_zero_p(other)) { + rb_num_zerodiv(); + } get_dat1(self); return f_muldiv(self, @@ -866,9 +865,10 @@ case T_FLOAT: return rb_funcall(f_to_f(self), '/', 1, other); case T_RATIONAL: - if (f_zero_p(other)) - rb_raise_zerodiv(); { + if (f_zero_p(other)) { + rb_num_zerodiv(); + } get_dat2(self, other); if (f_one_p(self)) @@ -1587,7 +1587,7 @@ dat->den = RARRAY_AT(ary ,1); rb_copy_generic_ivar(self, ary); if (f_zero_p(dat->den)) { - rb_raise_zerodiv(); + rb_num_zerodiv(); } return self; }

1 0

[5246] MacRuby/trunk
by source_changes＠macosforge.org 26 Feb '11

26 Feb '11

Revision: 5246 http://trac.macosforge.org/projects/ruby/changeset/5246 Author: lsansonetti(a)apple.com Date: 2011-02-25 17:08:28 -0800 (Fri, 25 Feb 2011) Log Message: ----------- fix a bug where we would crash when protecting an internal call during an exception raise Modified Paths: -------------- MacRuby/trunk/error.c MacRuby/trunk/eval.c Modified: MacRuby/trunk/error.c =================================================================== --- MacRuby/trunk/error.c 2011-02-25 22:24:32 UTC (rev 5245) +++ MacRuby/trunk/error.c 2011-02-26 01:08:28 UTC (rev 5246) @@ -828,7 +828,7 @@ desc = "false"; break; default: - d = rb_protect(safe_inspect, obj, 0); + d = rb_protect(safe_inspect, obj, NULL); if (NIL_P(d) || RSTRING_LEN(d) > 65) { d = rb_any_to_s(obj); } Modified: MacRuby/trunk/eval.c =================================================================== --- MacRuby/trunk/eval.c 2011-02-25 22:24:32 UTC (rev 5245) +++ MacRuby/trunk/eval.c 2011-02-26 01:08:28 UTC (rev 5246) @@ -487,7 +487,10 @@ static VALUE protect_rescue(VALUE obj, VALUE exc) { - *(int *)obj = 1; + int *state = (int *)obj; + if (state != NULL) { + *state = 1; + } GC_RETAIN(exc); protect_exc = exc; return Qnil;

1 0

[5245] MacRubyWebsite/trunk/content/blog/2011/02/24/macruby09.txt
by source_changes＠macosforge.org 25 Feb '11

25 Feb '11

Revision: 5245 http://trac.macosforge.org/projects/ruby/changeset/5245 Author: lsansonetti(a)apple.com Date: 2011-02-25 14:24:32 -0800 (Fri, 25 Feb 2011) Log Message: ----------- add a link to the release notes Modified Paths: -------------- MacRubyWebsite/trunk/content/blog/2011/02/24/macruby09.txt Modified: MacRubyWebsite/trunk/content/blog/2011/02/24/macruby09.txt =================================================================== --- MacRubyWebsite/trunk/content/blog/2011/02/24/macruby09.txt 2011-02-25 00:09:35 UTC (rev 5244) +++ MacRubyWebsite/trunk/content/blog/2011/02/24/macruby09.txt 2011-02-25 22:24:32 UTC (rev 5245) @@ -19,7 +19,7 @@ Please give it a try and "let us know":/contact-us.html of any problems you find! -The "complete release notes":http://todo are available. +The "complete release notes":http://lists.macosforge.org/pipermail/macruby-devel/2011-February/007227.html are available. h3. Converging for 1.0

1 0

[5244] MacRubyWebsite/trunk/content
by source_changes＠macosforge.org 25 Feb '11

25 Feb '11

Revision: 5244 http://trac.macosforge.org/projects/ruby/changeset/5244 Author: lsansonetti(a)apple.com Date: 2011-02-24 16:09:35 -0800 (Thu, 24 Feb 2011) Log Message: ----------- prepare blog post for 0.9 release Modified Paths: -------------- MacRubyWebsite/trunk/content/_header.txt MacRubyWebsite/trunk/content/downloads.txt MacRubyWebsite/trunk/content/source.txt Added Paths: ----------- MacRubyWebsite/trunk/content/blog/2011/ MacRubyWebsite/trunk/content/blog/2011/02/ MacRubyWebsite/trunk/content/blog/2011/02/24/ MacRubyWebsite/trunk/content/blog/2011/02/24/macruby09.txt MacRubyWebsite/trunk/content/blog/2011/02/index.txt MacRubyWebsite/trunk/content/blog/2011/index.txt Modified: MacRubyWebsite/trunk/content/_header.txt =================================================================== --- MacRubyWebsite/trunk/content/_header.txt 2011-02-24 00:35:50 UTC (rev 5243) +++ MacRubyWebsite/trunk/content/_header.txt 2011-02-25 00:09:35 UTC (rev 5244) @@ -2,7 +2,7 @@ filter: erb --- <div id="current_version"> - Current Version: 0.8 + Current Version: 0.9 </div> <div id="logo"> <a href="/"><img src="/images/macruby_logo.png" alt="MacRuby" id="logo" /></a> Added: MacRubyWebsite/trunk/content/blog/2011/02/24/macruby09.txt =================================================================== --- MacRubyWebsite/trunk/content/blog/2011/02/24/macruby09.txt (rev 0) +++ MacRubyWebsite/trunk/content/blog/2011/02/24/macruby09.txt 2011-02-25 00:09:35 UTC (rev 5244) @@ -0,0 +1,28 @@ +--- +title: MacRuby 0.9 +created_at: 2011-02-24 16:05:17.841234 -08:00 +blog_post: true +layout: blog_entry +author: lrz +filter: + - erb + - textile +--- +<% @page[:excerpt] = capture_erb do %> +We are glad to announce the release of MacRuby 0.9, after about two months of development since the last release. +<% end %> +<%= RedCloth.new((a)page.excerpt).to_html %> + +This is yet another release focused on stability, compatibility and performance improvements. Users of MacRuby are encouraged to upgrade. + +You can download it from "here":http://www.macruby.org/files/MacRuby%200.9.zip. Please note that this package only runs on Snow Leopard (10.6) or later. Older Mac OS X versions are no longer supported. + +Please give it a try and "let us know":/contact-us.html of any problems you find! + +The "complete release notes":http://todo are available. + +h3. Converging for 1.0 + +We are currently converting towards a first stable release of MacRuby, 1.0. We intend to deliver frequent releases until we reach that goal. + +We do not expect further releases to include significant features, as we are now focusing on stability and compatibility issues. Added: MacRubyWebsite/trunk/content/blog/2011/02/index.txt =================================================================== --- MacRubyWebsite/trunk/content/blog/2011/02/index.txt (rev 0) +++ MacRubyWebsite/trunk/content/blog/2011/02/index.txt 2011-02-25 00:09:35 UTC (rev 5244) @@ -0,0 +1,22 @@ +--- +title: 02 +created_at: 2011-02-24 16:05:17.833331 -08:00 +filter: erb +dirty: true +--- +<h2><%= h((a)page.title) %></h2> + +<% + articles = @pages.find(:all, :in_directory => @page.dir, :recursive => true, + :sort_by => "created_at", :reverse => true, :blog_post => true) + articles.delete(@page) + paginate(articles, 10) do |page| +-%> +<div class="article"> + <h1><%= link_to_page(page) %><span class="date">(<%= page.created_at.strftime('%Y-%m-%d') %>)</span></h1> + + <div class="body"> + <%= render(page) %> + </div> +</div> +<% end -%> Added: MacRubyWebsite/trunk/content/blog/2011/index.txt =================================================================== --- MacRubyWebsite/trunk/content/blog/2011/index.txt (rev 0) +++ MacRubyWebsite/trunk/content/blog/2011/index.txt 2011-02-25 00:09:35 UTC (rev 5244) @@ -0,0 +1,22 @@ +--- +title: 2011 +created_at: 2011-02-24 16:05:17.812426 -08:00 +filter: erb +dirty: true +--- +<h2><%= h((a)page.title) %></h2> + +<% + articles = @pages.find(:all, :in_directory => @page.dir, :recursive => true, + :sort_by => "created_at", :reverse => true, :blog_post => true) + articles.delete(@page) + paginate(articles, 10) do |page| +-%> +<div class="article"> + <h1><%= link_to_page(page) %><span class="date">(<%= page.created_at.strftime('%Y-%m-%d') %>)</span></h1> + + <div class="body"> + <%= render(page) %> + </div> +</div> +<% end -%> Modified: MacRubyWebsite/trunk/content/downloads.txt =================================================================== --- MacRubyWebsite/trunk/content/downloads.txt 2011-02-24 00:35:50 UTC (rev 5243) +++ MacRubyWebsite/trunk/content/downloads.txt 2011-02-25 00:09:35 UTC (rev 5244) @@ -10,7 +10,7 @@ h2. Latest Stable Release <p> -You can download <a href="http://www.macruby.org/files/MacRuby%200.8.zip">MacRuby 0.8</a> as a standalone binary installer. +You can download <a href="http://www.macruby.org/files/MacRuby%200.9.zip">MacRuby 0.9</a> as a standalone binary installer. <em>Note: this release will only work on Intel machines running Snow Leopard (10.6) or higher.</em> </p> Modified: MacRubyWebsite/trunk/content/source.txt =================================================================== --- MacRubyWebsite/trunk/content/source.txt 2011-02-24 00:35:50 UTC (rev 5243) +++ MacRubyWebsite/trunk/content/source.txt 2011-02-25 00:09:35 UTC (rev 5244) @@ -15,10 +15,10 @@ $ svn co http://svn.macosforge.org/repository/ruby/MacRuby/trunk MacRuby-trunk </pre> -If you want to grab the sources of a specific release, look into the tags directory. For example, to grab the sources of the 0.8 release: +If you want to grab the sources of a specific release, look into the tags directory. For example, to grab the sources of the latest release: <pre class="commands"> -$ svn co http://svn.macosforge.org/repository/ruby/MacRuby/tags/0.8 MacRuby-0.8 +$ svn co http://svn.macosforge.org/repository/ruby/MacRuby/tags/0.9 MacRuby-0.9 </pre> For building instructions, please refer to README.rdoc file, but the basic build instructions are:

1 0

[5243] MacRuby/branches/0.9
by source_changes＠macosforge.org 24 Feb '11

24 Feb '11

Revision: 5243 http://trac.macosforge.org/projects/ruby/changeset/5243 Author: lsansonetti(a)apple.com Date: 2011-02-23 16:35:50 -0800 (Wed, 23 Feb 2011) Log Message: ----------- merge r5242 from trunk Revision Links: -------------- http://trac.macosforge.org/projects/ruby/changeset/5242 Modified Paths: -------------- MacRuby/branches/0.9/compiler.cpp MacRuby/branches/0.9/vm.cpp Property Changed: ---------------- MacRuby/branches/0.9/ Property changes on: MacRuby/branches/0.9 ___________________________________________________________________ Modified: svn:mergeinfo - /MacRuby/branches/icu:3533-3744 /MacRuby/trunk:5240 + /MacRuby/branches/icu:3533-3744 /MacRuby/trunk:5240,5242 Modified: MacRuby/branches/0.9/compiler.cpp =================================================================== --- MacRuby/branches/0.9/compiler.cpp 2011-02-24 00:33:59 UTC (rev 5242) +++ MacRuby/branches/0.9/compiler.cpp 2011-02-24 00:35:50 UTC (rev 5243) @@ -2091,12 +2091,14 @@ *flags = DEFINE_SUB_OUTER; } if (outer_level != NULL) { - // Count the number of outers minus the current one. + // Count the number of outers. int level = 0; - for (NODE *n = node; n != NULL; n = n->nd_next) { + NODE *n = node; + while (n != NULL && nd_type(n) == NODE_COLON2) { + n = n->nd_head; level++; } - *outer_level = level + 1; + *outer_level = level; } return compile_node(node->nd_head); } @@ -3936,16 +3938,12 @@ = ivars_slots_cache; old_ivars_slots_cache.clear(); - uint64_t old_outer_mask = outer_mask; - if (current_outer_level > 0) { - outer_mask <<= current_outer_level; - for (int i = 0; i < current_outer_level; i++) { - outer_mask |= (1 << i + 1); - } - } - else { - outer_mask <<= 1; - } + // Increase the outer mask. + int old_outer_mask = outer_mask; + outer_mask <<= current_outer_level + 1; + for (int i = 0; i < current_outer_level; i++) { + outer_mask |= (1 << (i + 1)); + } DEBUG_LEVEL_INC(); Value *val = compile_node(body); @@ -4861,6 +4859,9 @@ Function * RoxorCompiler::compile_main_function(NODE *node, bool *can_interpret_p) { + save_compiler_state(); + reset_compiler_state(); + should_interpret = true; can_interpret = false; @@ -4871,7 +4872,7 @@ if (can_interpret_p != NULL) { *can_interpret_p = should_interpret; } - + restore_compiler_state(); return func; } Modified: MacRuby/branches/0.9/vm.cpp =================================================================== --- MacRuby/branches/0.9/vm.cpp 2011-02-24 00:33:59 UTC (rev 5242) +++ MacRuby/branches/0.9/vm.cpp 2011-02-24 00:35:50 UTC (rev 5243) @@ -1244,7 +1244,7 @@ // the given constant in all modules under the given outer. GET_CORE()->lock(); struct rb_vm_outer *o = GET_CORE()->get_outer((Class)outer); - uint64_t n = 0; + unsigned int n = 0; while (o != NULL && o->klass != (Class)rb_cNSObject) { // If the current outer isn't in the mask, it means we can use it // for const lookup. The outer mask is used when performing const

1 0

[5242] MacRuby/trunk
by source_changes＠macosforge.org 24 Feb '11

24 Feb '11

Revision: 5242 http://trac.macosforge.org/projects/ruby/changeset/5242 Author: lsansonetti(a)apple.com Date: 2011-02-23 16:33:59 -0800 (Wed, 23 Feb 2011) Log Message: ----------- fix a few issues in r5236 Revision Links: -------------- http://trac.macosforge.org/projects/ruby/changeset/5236 Modified Paths: -------------- MacRuby/trunk/compiler.cpp MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2011-02-23 08:34:25 UTC (rev 5241) +++ MacRuby/trunk/compiler.cpp 2011-02-24 00:33:59 UTC (rev 5242) @@ -2091,12 +2091,14 @@ *flags = DEFINE_SUB_OUTER; } if (outer_level != NULL) { - // Count the number of outers minus the current one. + // Count the number of outers. int level = 0; - for (NODE *n = node; n != NULL; n = n->nd_next) { + NODE *n = node; + while (n != NULL && nd_type(n) == NODE_COLON2) { + n = n->nd_head; level++; } - *outer_level = level + 1; + *outer_level = level; } return compile_node(node->nd_head); } @@ -3936,16 +3938,12 @@ = ivars_slots_cache; old_ivars_slots_cache.clear(); - uint64_t old_outer_mask = outer_mask; - if (current_outer_level > 0) { - outer_mask <<= current_outer_level; - for (int i = 0; i < current_outer_level; i++) { - outer_mask |= (1 << i + 1); - } - } - else { - outer_mask <<= 1; - } + // Increase the outer mask. + int old_outer_mask = outer_mask; + outer_mask <<= current_outer_level + 1; + for (int i = 0; i < current_outer_level; i++) { + outer_mask |= (1 << (i + 1)); + } DEBUG_LEVEL_INC(); Value *val = compile_node(body); @@ -4861,6 +4859,9 @@ Function * RoxorCompiler::compile_main_function(NODE *node, bool *can_interpret_p) { + save_compiler_state(); + reset_compiler_state(); + should_interpret = true; can_interpret = false; @@ -4871,7 +4872,7 @@ if (can_interpret_p != NULL) { *can_interpret_p = should_interpret; } - + restore_compiler_state(); return func; } Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2011-02-23 08:34:25 UTC (rev 5241) +++ MacRuby/trunk/vm.cpp 2011-02-24 00:33:59 UTC (rev 5242) @@ -1244,7 +1244,7 @@ // the given constant in all modules under the given outer. GET_CORE()->lock(); struct rb_vm_outer *o = GET_CORE()->get_outer((Class)outer); - uint64_t n = 0; + unsigned int n = 0; while (o != NULL && o->klass != (Class)rb_cNSObject) { // If the current outer isn't in the mask, it means we can use it // for const lookup. The outer mask is used when performing const

1 0

[5241] MacRuby/branches/0.9
by source_changes＠macosforge.org 23 Feb '11

23 Feb '11

Revision: 5241 http://trac.macosforge.org/projects/ruby/changeset/5241 Author: lsansonetti(a)apple.com Date: 2011-02-23 00:34:25 -0800 (Wed, 23 Feb 2011) Log Message: ----------- merge r5240 from trunk Revision Links: -------------- http://trac.macosforge.org/projects/ruby/changeset/5240 Modified Paths: -------------- MacRuby/branches/0.9/rakelib/builder/templates.rb Property Changed: ---------------- MacRuby/branches/0.9/ Property changes on: MacRuby/branches/0.9 ___________________________________________________________________ Modified: svn:mergeinfo - /MacRuby/branches/icu:3533-3744 + /MacRuby/branches/icu:3533-3744 /MacRuby/trunk:5240 Modified: MacRuby/branches/0.9/rakelib/builder/templates.rb =================================================================== --- MacRuby/branches/0.9/rakelib/builder/templates.rb 2011-02-23 08:28:50 UTC (rev 5240) +++ MacRuby/branches/0.9/rakelib/builder/templates.rb 2011-02-23 08:34:25 UTC (rev 5241) @@ -16,7 +16,7 @@ <key>CFBundleIconFile</key> <string></string> <key>CFBundleIdentifier</key> - <string>com.apple.macruby</string> + <string>org.macruby</string> <key>CFBundleInfoDictionaryVersion</key> <string>#{MACRUBY_VERSION}</string> <key>CFBundlePackageType</key>

1 0

[5240] MacRuby/trunk/rakelib/builder/templates.rb
by source_changes＠macosforge.org 23 Feb '11

23 Feb '11

Revision: 5240 http://trac.macosforge.org/projects/ruby/changeset/5240 Author: lsansonetti(a)apple.com Date: 2011-02-23 00:28:50 -0800 (Wed, 23 Feb 2011) Log Message: ----------- change the framework's bundle identifier to use macruby.org instead of apple.com Modified Paths: -------------- MacRuby/trunk/rakelib/builder/templates.rb Modified: MacRuby/trunk/rakelib/builder/templates.rb =================================================================== --- MacRuby/trunk/rakelib/builder/templates.rb 2011-02-23 02:24:37 UTC (rev 5239) +++ MacRuby/trunk/rakelib/builder/templates.rb 2011-02-23 08:28:50 UTC (rev 5240) @@ -16,7 +16,7 @@ <key>CFBundleIconFile</key> <string></string> <key>CFBundleIdentifier</key> - <string>com.apple.macruby</string> + <string>org.macruby</string> <key>CFBundleInfoDictionaryVersion</key> <string>#{MACRUBY_VERSION}</string> <key>CFBundlePackageType</key>

1 0

[5239] MacRuby/trunk/rakelib/builder/options.rb
by source_changes＠macosforge.org 23 Feb '11

23 Feb '11

Revision: 5239 http://trac.macosforge.org/projects/ruby/changeset/5239 Author: lsansonetti(a)apple.com Date: 2011-02-22 18:24:37 -0800 (Tue, 22 Feb 2011) Log Message: ----------- no longer build for i386 by default Modified Paths: -------------- MacRuby/trunk/rakelib/builder/options.rb Modified: MacRuby/trunk/rakelib/builder/options.rb =================================================================== --- MacRuby/trunk/rakelib/builder/options.rb 2011-02-22 22:08:39 UTC (rev 5238) +++ MacRuby/trunk/rakelib/builder/options.rb 2011-02-23 02:24:37 UTC (rev 5239) @@ -25,7 +25,7 @@ $stderr.puts "Getting archs from RC_ARCHS!" s.strip.split(/\s+/) else - b.option('archs', `arch`.include?('ppc') ? 'ppc' : %w{i386 x86_64}) { |x| x.split(',') } + b.option('archs', `arch`.include?('ppc') ? 'ppc' : %w{x86_64}) { |x| x.split(',') } end llvm_default_path = '/usr/local' @@ -219,7 +219,7 @@ Example: - $ rake all archs="i386,ppc" framework_instdir="~/Library/Frameworks" + $ rake all archs="i386,x86_64" framework_instdir="~/Library/Frameworks" } end

1 0