10 files changed, 126 insertions, 90 deletions
diff --git a/mrbgems/Makefile b/mrbgems/Makefile
index ab8b364ac..29d71d586 100644
--- a/mrbgems/Makefile
+++ b/mrbgems/Makefile
@@ -59,7 +59,8 @@ $(GEMDLIB) :
 
 # clean driver and all gems
 .PHONY : clean
-clean : $(GEM_MAKEFILE)
+clean : $(GENERATOR_BIN)
 	@echo "Cleanup Gems"
+	$(GENERATOR_BIN) makefile > $(GEM_MAKEFILE)
 	$(MAKE) clean -C g
 	-$(RM_F) $(INIT).c *.o *.d $(GENERATOR_BIN) $(GEM_MAKEFILE)
diff --git a/mrbgems/g/c_extension_example/Makefile b/mrbgems/g/c_extension_example/Makefile
deleted file mode 100644
index b245e9696..000000000
--- a/mrbgems/g/c_extension_example/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-include ../../Makefile4gem
-
-GEM := c_extension_example
-
-GEM_C_FILES := $(wildcard $(SRC_DIR)/*.c)
-GEM_OBJECTS := $(patsubst %.c, %.o, $(GEM_C_FILES))
-
-gem-all : $(GEM_OBJECTS)
-	$(AR) rs $(LIBR) $<
-
-gem-clean :
-	-$(RM) $(GEM_OBJECTS)
diff --git a/mrbgems/g/c_extension_example/README.md b/mrbgems/g/c_extension_example/README.md
deleted file mode 100644
index 3803c2065..000000000
--- a/mrbgems/g/c_extension_example/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-C Extension Example
-=========
-
-This is an example gem which implements a C extension.
diff --git a/mrbgems/g/c_extension_example/src/example.c b/mrbgems/g/c_extension_example/src/example.c
deleted file mode 100644
index 9f0b07839..000000000
--- a/mrbgems/g/c_extension_example/src/example.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <mruby.h>
-#include <stdio.h>
-
-static struct RClass *_class_cextension;
-
-static mrb_value
-mrb_c_method(mrb_state *mrb, mrb_value self)
-{
-  puts("A C Extension");
-  return self;
-}
-
-void
-mrb_c_extension_example_gem_init(mrb_state* mrb) {
-  _class_cextension = mrb_define_module(mrb, "CExtension");
-  mrb_define_class_method(mrb, _class_cextension, "c_method", mrb_c_method, ARGS_NONE());
-}
diff --git a/mrbgems/g/c_extension_example/test/example.rb b/mrbgems/g/c_extension_example/test/example.rb
deleted file mode 100644
index 367d18029..000000000
--- a/mrbgems/g/c_extension_example/test/example.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-assert('C Extension Example') do
-  CExtension.respond_to? :c_method
-end
diff --git a/mrbgems/g/ruby_extension_example/Makefile b/mrbgems/g/ruby_extension_example/Makefile
deleted file mode 100644
index 7ebec4f09..000000000
--- a/mrbgems/g/ruby_extension_example/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-include ../../Makefile4gem
-
-GEM := ruby_extension_example
-
-gem-all :
-
-gem-clean :
diff --git a/mrbgems/g/ruby_extension_example/README.md b/mrbgems/g/ruby_extension_example/README.md
deleted file mode 100644
index 906a0d8f2..000000000
--- a/mrbgems/g/ruby_extension_example/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-Pure Ruby Extension Example
-=========
-
-This is an example gem which implements a pure Ruby extension.
diff --git a/mrbgems/g/ruby_extension_example/mrblib/example.rb b/mrbgems/g/ruby_extension_example/mrblib/example.rb
deleted file mode 100644
index b07a2b580..000000000
--- a/mrbgems/g/ruby_extension_example/mrblib/example.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class RubyExtension
-  def RubyExtension.ruby_method
-    puts "A Ruby Extension"
-  end
-end
diff --git a/mrbgems/g/ruby_extension_example/test/example.rb b/mrbgems/g/ruby_extension_example/test/example.rb
deleted file mode 100644
index 0c1b63469..000000000
--- a/mrbgems/g/ruby_extension_example/test/example.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-assert('Ruby Extension Example') do
-  RubyExtension.respond_to? :ruby_method
-end
diff --git a/mrbgems/generator.c b/mrbgems/generator.c
index 7015f5a4d..f33a43944 100644
--- a/mrbgems/generator.c
+++ b/mrbgems/generator.c
@@ -45,10 +45,10 @@ directory_exists(char path[4096]) {
  *     FALSE => template for all GEMs
  *
  */
-void
-for_each_gem (char before[1024], char after[1024],
-              char start[1024], char end[1024],
-              char dir_to_skip[1024])
+static char
+*for_each_gem (char before[1024], char after[1024],
+               char start[1024], char end[1024],
+               char dir_to_skip[1024])
 {
   struct dirent **eps;
   int n;
@@ -99,7 +99,7 @@ for_each_gem (char before[1024], char after[1024],
   }
 
   strcat(complete_line, end);
-  puts(complete_line);
+  return complete_line;
 }
 
 /*
@@ -109,6 +109,11 @@ for_each_gem (char before[1024], char after[1024],
 void
 make_gem_makefile()
 {
+  char *gem_check = "";
+  int gem_empty;
+  int gem_c_empty;
+  int gem_ruby_empty;
+
   puts("CFLAGS := -I. -I../../include -I../../src");
   puts("");
   puts("ifeq ($(OS),Windows_NT)");
@@ -118,29 +123,69 @@ make_gem_makefile()
   puts("endif");
   puts("");
 
+  gem_check = for_each_gem("", "", "", "", "");
+  if (strcmp(gem_check, "") == 0)
+    gem_empty = TRUE;
+  else
+    gem_empty = FALSE;
+
+  gem_check = for_each_gem("", "", "", "", "src");
+  if (strcmp(gem_check, "") == 0)
+    gem_c_empty = TRUE;
+  else 
+    gem_c_empty = FALSE;
+
+  gem_check = for_each_gem("", "", "", "", "mrblib");
+  if (strcmp(gem_check, "") == 0)
+    gem_ruby_empty = TRUE;
+  else 
+    gem_ruby_empty = FALSE;
+
   puts(".PHONY : all");
-  puts("all : all_gems mrblib_gem.o");
-  puts("\t$(AR) rs ../../lib/libmruby.a mrblib_gem.o");
-  puts("");
+  if (gem_empty) {
+    puts("all :");
+    puts("");
+  }
+  else {
+    if (gem_c_empty) {
+      puts("all : mrblib_gem.o");
+      puts("\t$(AR) rs ../../lib/libmruby.a mrblib_gem.o");
+    }
+    else if (gem_ruby_empty) {
+      puts("all : all_gems");
+    }
+    else {
+      puts("all : all_gems mrblib_gem.o");
+      puts("\t$(AR) rs ../../lib/libmruby.a mrblib_gem.o");
+    }
 
-  puts("all_gems :");
-  for_each_gem("\t@$(MAKE) -C ", " $(MAKE_FLAGS)\n", "", "", "");
-  puts("");
+    puts("");
 
-  puts("mrblib_gem.o : mrblib_gem.c");
-  puts("");
+    // Rule for building all C extensions of each Gem
+    if (!gem_c_empty) {
+      puts("all_gems :");
+      puts(for_each_gem("\t@$(MAKE) -C ", " $(MAKE_FLAGS)\n", "", "", ""));
+      puts("");
+    }
 
-  puts("mrblib_gem.c : mrblib_gem.ctmp");
-  puts("\tcat $< > $@");
-  puts("");
+    // Rule for building all Ruby Extension of each Gem
+    if (!gem_ruby_empty) {
+      puts("mrblib_gem.o : mrblib_gem.c");
+      puts("");
 
-  puts("mrblib_gem.ctmp : mrblib_gem.rbtmp");
-  puts("\t../../bin/mrbc -Bmrblib_gem_irep -o$@ $<");
-  puts("");
+      puts("mrblib_gem.c : mrblib_gem.ctmp");
+      puts("\tcat $< > $@");
+      puts("");
 
-  puts("mrblib_gem.rbtmp :");
-  for_each_gem(" ", "/mrblib/*.rb", "\tcat", "> mrblib_gem.rbtmp", "mrblib");
-  puts("");
+      puts("mrblib_gem.ctmp : mrblib_gem.rbtmp");
+      puts("\t../../bin/mrbc -Bmrblib_gem_irep -o$@ $<");
+      puts("");
+
+      puts("mrblib_gem.rbtmp :");
+      puts(for_each_gem(" ", "/mrblib/*.rb", "\tcat", "> mrblib_gem.rbtmp", "mrblib"));
+      puts("");
+    }
+  }
 
   puts(".PHONY : prepare-test");
   puts("prepare-test : mrbgemtest.ctmp");
@@ -151,13 +196,20 @@ make_gem_makefile()
   puts("");
 
   puts("mrbgemtest.rbtmp :");
-  for_each_gem(" ", "/test/*.rb ", "\tcat", " > mrbgemtest.rbtmp", "");
+
+  if (!gem_empty)
+    puts(for_each_gem(" ", "/test/*.rb ", "\tcat", " > mrbgemtest.rbtmp", ""));
+  else
+    puts("\t../generator rbtmp > mrbgemtest.rbtmp");
+    
   puts("");
 
   puts(".PHONY : clean");
   puts("clean :");
   puts("\t$(RM) *.c *.d *.rbtmp *.ctmp *.o mrbtest");
-  for_each_gem("\t@$(MAKE) clean -C ", " $(MAKE_FLAGS)\n", "", "", "");
+
+  if (!gem_empty)
+    puts(for_each_gem("\t@$(MAKE) clean -C ", " $(MAKE_FLAGS)\n", "", "", ""));
 }
 
 /*
@@ -167,6 +219,29 @@ make_gem_makefile()
 void
 make_init_gems()
 {
+  char *gem_check = "";
+  int gem_empty;
+  int gem_c_empty;
+  int gem_ruby_empty;
+
+  gem_check = for_each_gem("", "", "", "", "");
+  if (strcmp(gem_check, "") == 0)
+    gem_empty = TRUE;
+  else
+    gem_empty = FALSE;
+
+  gem_check = for_each_gem("", "", "", "", "src");
+  if (strcmp(gem_check, "") == 0)
+    gem_c_empty = TRUE;
+  else
+    gem_c_empty = FALSE;
+
+  gem_check = for_each_gem("", "", "", "", "mrblib");
+  if (strcmp(gem_check, "") == 0)
+    gem_ruby_empty = TRUE;
+  else
+    gem_ruby_empty = FALSE;
+
   puts("/*");
   puts(" * This file contains a list of all");
   puts(" * initializing methods which are");
@@ -185,25 +260,38 @@ make_init_gems()
   puts("#include \"mruby/proc.h\"");
   puts("");
 
-  for_each_gem("void mrb_", "_gem_init(mrb_state*);\n", "", "", "src");
+  if (!gem_c_empty)
+    puts(for_each_gem("void mrb_", "_gem_init(mrb_state*);\n", "", "", "src"));
+
+  if (!gem_ruby_empty)
+    puts("extern const char mrblib_gem_irep[];");
 
-  puts("extern const char mrblib_gem_irep[];");
   puts("");
 
   puts("void");
   puts("mrb_init_mrbgems(mrb_state *mrb) {");
 
-  for_each_gem("  mrb_", "_gem_init(mrb);\n", "", "", "src");
+  if (!gem_c_empty)
+    puts(for_each_gem("  mrb_", "_gem_init(mrb);\n", "", "", "src"));
+
+  if (!gem_ruby_empty) {
+    puts("  int n = mrb_read_irep(mrb, mrblib_gem_irep);");
+    puts("  mrb_run(mrb, mrb_proc_new(mrb, mrb->irep[n]), mrb_top_self(mrb));");
+    puts("  if (mrb->exc) {");
+    puts("    mrb_p(mrb, mrb_obj_value(mrb->exc));");
+    puts("    exit(0);");
+    puts("  }");
+  }
 
-  puts("  int n = mrb_read_irep(mrb, mrblib_gem_irep);");
-  puts("  mrb_run(mrb, mrb_proc_new(mrb, mrb->irep[n]), mrb_top_self(mrb));");
-  puts("  if (mrb->exc) {");
-  puts("    mrb_p(mrb, mrb_obj_value(mrb->exc));");
-  puts("    exit(0);");
-  puts("  }");
   puts("}");
 }
 
+void
+make_rbtmp()
+{
+  puts("");
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -212,11 +300,13 @@ main (int argc, char *argv[])
       make_gem_makefile();
     else if (strcmp(argv[1], "init_gems") == 0)
       make_init_gems();
+    else if (strcmp(argv[1], "rbtmp") == 0)
+      make_rbtmp();
     else
       return 1;
   }
   else {
-    puts("Argument missing! Options: 'makefile', 'init_gems'");
+    puts("Argument missing! Options: 'makefile', 'init_gems', 'rbtmp'");
     return 1;
   }