Changeset 439 for EcnlProtoTool/trunk/mruby-2.1.1/tasks/mrbgems.rake

Timestamp:

Jul 9, 2020, 8:51:43 AM (4 years ago)

Author:

coas-nagasima

Message:

mrubyを2.1.1に更新

Location:

EcnlProtoTool/trunk/mruby-2.1.1

Files:

• . (moved) (moved from EcnlProtoTool/trunk/mruby-1.3.0 )
• tasks/mrbgems.rake (modified) (4 diffs)

EcnlProtoTool/trunk/mruby-2.1.1/tasks/mrbgems.rake

@@ -6 +6 @@
 
     # loader all gems
-    self.libmruby << objfile("#{build_dir}/mrbgems/gem_init")
+    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__] do |t|
-      FileUtils.mkdir_p "#{build_dir}/mrbgems"
+      mkdir_p "#{build_dir}/mrbgems"
       open(t.name, 'w') do |f|
         gem_func_gems = gems.select { |g| g.generate_functions }
@@ -19 +19 @@
           s << "  GENERATED_TMP_mrb_#{g.funcname}_gem_init(mrb);\n"
         end
-        gem_final_calls = gem_func_gems.each_with_object('') do |g, s|
+        gem_final_calls = gem_func_gems.reverse_each.with_object('') do |g, s|
           s << "  GENERATED_TMP_mrb_#{g.funcname}_gem_final(mrb);\n"
         end
@@ -35 +35 @@
         f.puts %Q[]
         f.write gem_func_decls
+        unless gem_final_calls.empty?
         f.puts %Q[]
-        f.puts %Q[static void]
-        f.puts %Q[mrb_final_mrbgems(mrb_state *mrb) {]
-        f.write gem_final_calls
-        f.puts %Q[}]
+          f.puts %Q[static void]
+          f.puts %Q[mrb_final_mrbgems(mrb_state *mrb) {]
+          f.write gem_final_calls
+          f.puts %Q[}]
+        end
         f.puts %Q[]
         f.puts %Q[void]
@@ -52 +54 @@
   # legal documents
   file "#{build_dir}/LEGAL" => [MRUBY_CONFIG, __FILE__] do |t|
+    mkdir_p File.dirname t.name
     open(t.name, 'w+') do |f|
      f.puts <<LEGAL