Merge master.

2 files changed, 14 insertions, 4 deletions

diff --git a/tasks/benchmark.rake b/tasks/benchmark.rake
index 84e69ebee..6352f5c17 100644
--- a/tasks/benchmark.rake
+++ b/tasks/benchmark.rake
@@ -5,7 +5,7 @@ end
 $dat_files = []
 
 def bm_files
-  Dir.glob("#{MRUBY_ROOT}/benchmark/bm_*.rb")
+  Dir.glob("#{MRUBY_ROOT}/benchmark/bm_*.rb").sort
 end
 
 def build_config_name
@@ -67,8 +67,8 @@ MRuby.each_target do |target|
       puts "..."
 
       data = (0...MRuby::BENCHMARK_REPEAT).map do |n|
-        str = %x{(time -f "%e %S %U" #{mruby_bin} #{bm_file}) 2>&1 >/dev/null}
-        str.split(' ').map(&:to_f)
+        str = %x{(time -p #{mruby_bin} #{bm_file}) 2>&1 >/dev/null}
+        str.scan(/\d+\.\d+$/).map(&:to_f) # [real, user, sys]
       end
 
       File.open(task.name, "w") do |f|
diff --git a/tasks/mrbgems.rake b/tasks/mrbgems.rake
index c814a16db..0a3ae652d 100644
--- a/tasks/mrbgems.rake
+++ b/tasks/mrbgems.rake
@@ -5,9 +5,10 @@ MRuby.each_target do
     gems.check self
 
     # loader all gems
+    active_gems_txt = "#{build_dir}/mrbgems/active_gems.txt"
     self.libmruby_objs << objfile("#{build_dir}/mrbgems/gem_init")
     file objfile("#{build_dir}/mrbgems/gem_init") => ["#{build_dir}/mrbgems/gem_init.c", "#{build_dir}/LEGAL"]
-    file "#{build_dir}/mrbgems/gem_init.c" => [MRUBY_CONFIG, __FILE__, *Dir.glob("#{build_dir}/mrbgems/mruby-*/*.c")] do |t|
+    file "#{build_dir}/mrbgems/gem_init.c" => [active_gems_txt, MRUBY_CONFIG, __FILE__] do |t|
       mkdir_p "#{build_dir}/mrbgems"
       open(t.name, 'w') do |f|
         gem_func_gems = gems.select { |g| g.generate_functions }
@@ -49,6 +50,15 @@ MRuby.each_target do
         f.puts %Q[}]
       end
     end
+    file active_gems_txt => :generate_active_gems_txt
+    task :generate_active_gems_txt do |t|
+      def t.timestamp; Time.at(0) end
+      active_gems = gems.sort_by(&:name).inject(""){|s, g| s << "#{g.name}\n"}
+      if !File.exist?(active_gems_txt) || File.read(active_gems_txt) != active_gems
+        mkdir_p File.dirname(active_gems_txt)
+        File.write(active_gems_txt, active_gems)
+      end
+    end
   end
 
   # legal documents