Moved some building script from GNU make to Ruby script

Added minirake what's Rake subset

Rakefile

@@ -88,6 +88,7 @@ task :clean do
   end
   sh "#{MAKE} clean -C tools/mruby #{MAKE_FLAGS}"
   sh "#{MAKE} clean -C tools/mirb #{MAKE_FLAGS}"
+  sh "#{MAKE} clean -C test #{MAKE_FLAGS}"
 end
 
 desc "show build config summary"

minirake

@@ -390,7 +390,18 @@ class RakeApp
         display_tasks
       else
         ARGV.push("default") if ARGV.size == 0
-        ARGV.each { |task_name| MiniRake::Task[task_name].invoke }
+        p ARGV
+        tasks = []
+        ARGV.each do |task_name|
+          if /^(\w+)=(.*)/.match(task_name)
+            ENV[$1] = $2
+          else
+            tasks << task_name
+          end
+        end
+        tasks.each do |task_name|
+          MiniRake::Task[task_name].invoke
+        end
       end
     rescue Exception => ex
       puts "rake aborted!"

mrbgems/Makefile4gem

@@ -28,6 +28,9 @@ ifeq ($(strip $(ACTIVE_GEMS)),)
   ACTIVE_GEMS = GEMS.active
 endif
 
+MAKEFILE_GEM_LIST := $(MRUBY_ROOT)/mrbgems/g/MakefileGemList
+include $(MAKEFILE_GEM_LIST)
+
 # Default rules which are calling the
 # gem specific gem-all and gem-clean
 # implementations of a gem
@@ -46,14 +49,14 @@ gem_mixlib.c : gem_mrblib_header.ctmp gem_mrblib_irep.ctmp gem_mixlib_init.ctmp
 	cat $^ > $@
 
 gem_mixlib_init.ctmp :
-	$(MRUBY_ROOT)/mrbgems/generator gem_mixlib $(GEM) > $@
+	ruby $(MRUBY_ROOT)/mrbgems/generate_gem_mixlib.rb '$(GEM)' > $@
 
 # Building target for C files
 gem-c-files : gem_srclib.o
 	$(AR) rs $(GEM_PACKAGE) $(GEM_OBJECTS) $<
 
 gem_srclib.c :
-	$(MRUBY_ROOT)/mrbgems/generator gem_srclib $(GEM) > $@
+	ruby $(MRUBY_ROOT)/mrbgems/generate_gem_srclib.rb '$(GEM)' > $@
 
 # Building target for Ruby Files
 gem-rb-files : gem_mrblib.o
@@ -63,10 +66,10 @@ gem_mrblib.c : gem_mrblib_header.ctmp gem_mrblib_irep.ctmp gem_mrblib_init.ctmp
 	cat $^ > $@
 
 gem_mrblib_header.ctmp :
-	$(MRUBY_ROOT)/mrbgems/generator gem_mrblib > $@
+	ruby $(MRUBY_ROOT)/mrbgems/generate_gem_mrblib_header.rb '$(GEM)' > $@
 
 gem_mrblib_init.ctmp :
-	$(MRUBY_ROOT)/mrbgems/generator gem_mrblib $(GEM) > $@
+	ruby $(MRUBY_ROOT)/mrbgems/generate_gem_mrblib.rb '$(GEM)' > $@
 
 gem_mrblib_irep.ctmp : gem_mrblib.rbtmp
 	$(MRUBY_ROOT)/bin/mrbc -Bgem_mrblib_irep_$(subst -,_,$(GEM)) -o$@ $<
@@ -84,6 +87,9 @@ gem-clean-c-files :
 gem-clean-rb-files :
 	-$(RM) $(GEM_PACKAGE) gem_mrblib.o gem_mrblib.c gem_mrblib_header.ctmp gem_mrblib_init.ctmp gem_mrblib_irep.ctmp gem_mrblib.rbtmp
 
+%.o : %.c
+	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(GEM_INCLUDE_LIST) $< -o $@
+
 .PHONY : clean
 clean : gem-clean
 	@echo "Gem '$(GEM)' is clean"

mrbgems/build_tasks.rb

@@ -7,31 +7,32 @@ MAKEFILE_4_GEM = "#{MRUBY_ROOT}/mrbgems/Makefile4gem"
 
 GEM_MAKE_FLAGS = "#{MAKE_FLAGS} MAKEFILE_4_GEM='#{MAKEFILE_4_GEM}'"
 
-task :mrbgems_all => ["#{GEM_INIT}.a"] do
-  for_each_gem do |f|
-    sh "#{MAKE} -C #{f} #{GEM_MAKE_FLAGS}"
+task :mrbgems_all => ["#{GEM_INIT}.a", :mrbgems_generate_gem_makefile_list] do
+  for_each_gem do |path, gemname|
+    sh "#{MAKE} -C #{path} #{GEM_MAKE_FLAGS}"
   end
 end
 
 task :mrbgems_clean do
+  sh "cd #{MRUBY_ROOT}/mrbgems && #{RM_F} *.c *.d *.a *.o"
   sh "cd #{MRUBY_ROOT}/mrbgems/g && #{RM_F} *.c *.d *.rbtmp *.ctmp *.o mrbtest"
-  for_each_gem do |f|
-    sh "#{MAKE} clean -C #{f} #{GEM_MAKE_FLAGS}"
+  for_each_gem do |path, gemname|
+    sh "#{MAKE} clean -C #{path} #{GEM_MAKE_FLAGS}"
   end
 end
 
 task :mrbgems_prepare_test do
-  sh "#{CAT} #{for_each_gem{|f| "#{f}/test/*.rb "}} > #{MRUBY_ROOT}/mrbgems/g/mrbgemtest.rbtmp"
+  sh "#{CAT} #{for_each_gem{|path, gemname| "#{path}/test/*.rb "}} > #{MRUBY_ROOT}/mrbgems/g/mrbgemtest.rbtmp"
   sh "#{MRUBY_ROOT}/bin/mrbc -Bmrbgemtest_irep -o#{MRUBY_ROOT}/mrbgems/g/mrbgemtest.ctmp #{MRUBY_ROOT}/mrbgems/g/mrbgemtest.rbtmp"
 end
 
 file "#{GEM_INIT}.a" => ["#{GEM_INIT}.c", "#{GEM_INIT}.o"] do |t|
-  sh "#{AR} rs #{t.name} #{t.prerequisites.join(' ')}"
+  sh "#{AR} rs #{t.name} #{GEM_INIT}.o"
 end
 
 rule ".o" => [".c"] do |t|
   puts "Build the driver which initializes all gems"
-  sh "#{CC} #{CFLAGS.join(' ')} -I #{MRUBY_ROOT}/include -MMD -c #{t.source} -o #{t.name}"
+  sh "#{CC} #{CFLAGS.join(' ')} -I#{MRUBY_ROOT}/include -MMD -c #{t.source} -o #{t.name}"
 end
 
 file "#{GEM_INIT}.c" do |t|
@@ -50,11 +51,11 @@ file "#{GEM_INIT}.c" do |t|
 
 #include "mruby.h"
 
-#{for_each_gem{|f| "void GENERATED_TMP_mrb_%s_gem_init(mrb_state*);\n" % [File.basename(f)]}}
+#{for_each_gem{|path, gemname, escaped_gemname| "void GENERATED_TMP_mrb_%s_gem_init(mrb_state*);" % [escaped_gemname]}}
 
 void
 mrb_init_mrbgems(mrb_state *mrb) {
-#{for_each_gem{|f| "  GENERATED_TMP_mrb_%s_gem_init(mrb);\n" % [File.basename(f)]}}
+#{for_each_gem{|path, gemname, escaped_gemname| "  GENERATED_TMP_mrb_%s_gem_init(mrb);" % [escaped_gemname]}}
 }
 __EOF__
   end
@@ -62,17 +63,22 @@ end
 
 def for_each_gem(&block)
   IO.readlines(ACTIVE_GEMS).map { |line|
-    block.call(line.chomp)
+    path = line.chomp
+    gemname = File.basename(path)
+    escaped_gemname = gemname.gsub(/-/, '_')
+    block.call(path, gemname, escaped_gemname)
   }.join('')
 end
 
 task :mrbgems_generate_gem_makefile_list do
   open(GEM_MAKEFILE_LIST, 'w') do |f|
     f.puts <<__EOF__
-GEM_LIST := #{for_each_gem{|f| "#{f}/mrb-#{File.basename(f)}-gem.a"}}
+GEM_LIST := #{for_each_gem{|path, gemname| "#{path}/mrb-#{gemname}-gem.a "}}
 
 GEM_ARCHIVE_FILES := #{MRUBY_ROOT}/mrbgems/gem_init.a
 GEM_ARCHIVE_FILES += $(GEM_LIST)
+
+GEM_INCLUDE_LIST := #{for_each_gem{|path, gemname| "-I#{path}/include "}}
 __EOF__
   end
 end

mrbgems/generate_gem_mixlib.rb

+#!/usr/bin/env ruby
+
+gemname = ARGV.shift.gsub('-', '_')
+
+puts <<__EOF__
+void mrb_#{gemname}_gem_init(mrb_state*);
+
+void
+GENERATED_TMP_mrb_#{gemname}_gem_init(mrb_state *mrb)
+{
+  mrb_#{gemname}_gem_init(mrb);
+  mrb_load_irep(mrb, gem_mrblib_irep_#{gemname});
+  if (mrb->exc) {
+    mrb_p(mrb, mrb_obj_value(mrb->exc));
+    exit(0);
+  }
+}
+__EOF__

mrbgems/generate_gem_mrblib.rb

+#!/usr/bin/env ruby
+
+gemname = ARGV.shift.gsub('-', '_')
+
+puts <<__EOF__
+void
+GENERATED_TMP_mrb_#{gemname}_gem_init(mrb_state *mrb)
+{
+  mrb_load_irep(mrb, gem_mrblib_irep_#{gemname});
+  if (mrb->exc) {
+    mrb_p(mrb, mrb_obj_value(mrb->exc));
+    exit(0);
+  }
+}
+__EOF__

mrbgems/generate_gem_mrblib_header.rb

+#!/usr/bin/env ruby
+
+puts <<__EOF__
+/*
+ * This file is loading the irep
+ * Ruby GEM code.
+ *
+ * IMPORTANT:
+ *   This file was generated!
+ *   All manual changes will get lost.
+ */
+#include "mruby.h"
+#include "mruby/irep.h"
+#include "mruby/dump.h"
+#include "mruby/string.h"
+#include "mruby/proc.h"
+
+__EOF__
\ No newline at end of file

mrbgems/generate_gem_srclib.rb

+#!/usr/bin/env ruby
+
+gemname = ARGV.shift.gsub('-', '_')
+
+puts <<__EOF__
+/*
+ * This file is loading the irep
+ * Ruby GEM code.
+ *
+ * IMPORTANT:
+ *   This file was generated!
+ *   All manual changes will get lost.
+ */
+#include "mruby.h"
+
+void mrb_#{gemname}_gem_init(mrb_state*);
+
+void
+GENERATED_TMP_mrb_#{gemname}_gem_init(mrb_state *mrb)
+{
+  mrb_#{gemname}_gem_init(mrb);
+}
+__EOF__
\ No newline at end of file

test/Makefile

@@ -78,7 +78,8 @@ MRUBY= ../bin/mruby
 EXE := $(TARGET)
 endif
 
-RAKE  = ../minirake
+RAKE = ../minirake
+
 
 ##############################
 # generic build targets, rules