Merge branch 'master' of github.com:mruby/mruby

Rakefile

@@ -8,7 +8,8 @@ load 'tasks/mruby_gem_spec.rake'
 
 ##############################
 # compile flags
-load File.expand_path(ENV['CONFIG'] || './build_config.rb')
+MRUBY_CONFIG = File.expand_path(ENV['MRUBY_CONFIG'] || './build_config.rb')
+load MRUBY_CONFIG
 
 load 'tasks/rules.rake'
 load 'src/mruby_core.rake'
@@ -37,9 +38,9 @@ depfiles = MRuby.targets['host'].bins.map do |bin|
   install_path
 end
 
-depfiles += MRuby.targets.reject {|n,t| n == 'host' }.map do |n, t|
+depfiles += MRuby.targets.reject {|n,t| n == 'host' }.map { |n, t|
   ["#{t.build_dir}/lib/libmruby.a"] + t.bins.map { |bin| exefile("#{t.build_dir}/bin/#{bin}") }
-end
+}.flatten
 
 desc "build all targets, install (locally) in-repo"
 task :all => depfiles

doc/compile/README.md

@@ -83,7 +83,7 @@ MRuby::CrossBuild.new('i386') do |conf|
 end
 ```
 
-You can configurate the same options as for a normal build.
+You can configurate the same options as for a normal build. You can specified your own build_config.rb with *$MRUBY_CONFIG*.
 
 ## Build process
 

src/string.c

@@ -1114,44 +1114,6 @@ mrb_str_downcase(mrb_state *mrb, mrb_value self)
   return str;
 }
 
-/* 15.2.10.5.15 */
-/*
- *  call-seq:
- *     str.each(separator=$/) {|substr| block }        => str
- *     str.each_line(separator=$/) {|substr| block }   => str
- *
- *  Splits <i>str</i> using the supplied parameter as the record separator
- *  (<code>$/</code> by default), passing each substring in turn to the supplied
- *  block. If a zero-length record separator is supplied, the string is split
- *  into paragraphs delimited by multiple successive newlines.
- *
- *     print "Example one\n"
- *     "hello\nworld".each {|s| p s}
- *     print "Example two\n"
- *     "hello\nworld".each('l') {|s| p s}
- *     print "Example three\n"
- *     "hello\n\n\nworld".each('') {|s| p s}
- *
- *  <em>produces:</em>
- *
- *     Example one
- *     "hello\n"
- *     "world"
- *     Example two
- *     "hel"
- *     "l"
- *     "o\nworl"
- *     "d"
- *     Example three
- *     "hello\n\n\n"
- *     "world"
- */
-static mrb_value
-mrb_str_each_line(mrb_state *mrb, mrb_value str)
-{
-  return mrb_nil_value();
-}
-
 /* 15.2.10.5.16 */
 /*
  *  call-seq:
@@ -3033,7 +2995,6 @@ mrb_init_string(mrb_state *mrb)
   mrb_define_method(mrb, s, "chop!",           mrb_str_chop_bang,       ARGS_REQ(1));              /* 15.2.10.5.12 */
   mrb_define_method(mrb, s, "downcase",        mrb_str_downcase,        ARGS_NONE());              /* 15.2.10.5.13 */
   mrb_define_method(mrb, s, "downcase!",       mrb_str_downcase_bang,   ARGS_NONE());              /* 15.2.10.5.14 */
-  mrb_define_method(mrb, s, "each_line",       mrb_str_each_line,       ARGS_REQ(1));              /* 15.2.10.5.15 */
   mrb_define_method(mrb, s, "empty?",          mrb_str_empty_p,         ARGS_NONE());              /* 15.2.10.5.16 */
   mrb_define_method(mrb, s, "eql?",            mrb_str_eql,             ARGS_REQ(1));              /* 15.2.10.5.17 */
 #ifdef ENABLE_REGEXP

tasks/mrbgems.rake

@@ -29,5 +29,7 @@ mrb_init_mrbgems(mrb_state *mrb) {
 __EOF__
       end
     end
+
+    file "#{build_dir}/mrbgems/gem_init.c" => MRUBY_CONFIG
   end
 end