From 9d8143f9302f86348df5d0a75ebbb433c8330354 Mon Sep 17 00:00:00 2001
From: Masaki Muranaka <monaka@monami-ya.jp>
Date: Thu, 11 Apr 2013 13:15:12 +0900
Subject: [PATCH] Move mirb and mruby to mrbgems.

---
 Rakefile                                      |  2 --
 build_config.rb                               |  9 ++++++++-
 mrbgems/mruby-tool-mirb/mrbgem.rake           |  5 +++++
 .../mruby-tool-mirb/tools}/mirb/mirb.c        |  0
 mrbgems/mruby-tool-mruby/mrbgem.rake          |  5 +++++
 .../mruby-tool-mruby/tools}/mruby/mruby.c     |  0
 tasks/mruby_build.rake                        |  2 +-
 tools/mirb/mirb.rake                          | 19 -------------------
 tools/mruby/mruby.rake                        | 19 -------------------
 9 files changed, 19 insertions(+), 42 deletions(-)
 create mode 100644 mrbgems/mruby-tool-mirb/mrbgem.rake
 rename {tools => mrbgems/mruby-tool-mirb/tools}/mirb/mirb.c (100%)
 create mode 100644 mrbgems/mruby-tool-mruby/mrbgem.rake
 rename {tools => mrbgems/mruby-tool-mruby/tools}/mruby/mruby.c (100%)
 delete mode 100644 tools/mirb/mirb.rake
 delete mode 100644 tools/mruby/mruby.rake

diff --git a/Rakefile b/Rakefile
index a09dde6dd..f9e5e5ce3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -25,8 +25,6 @@ load "#{MRUBY_ROOT}/tools/mrbc/mrbc.rake"
 
 load "#{MRUBY_ROOT}/tasks/mrbgems.rake"
 load "#{MRUBY_ROOT}/tasks/libmruby.rake"
-load "#{MRUBY_ROOT}/tools/mruby/mruby.rake"
-load "#{MRUBY_ROOT}/tools/mirb/mirb.rake"
 
 load "#{MRUBY_ROOT}/tasks/mrbgems_test.rake"
 load "#{MRUBY_ROOT}/test/mrbtest.rake"
diff --git a/build_config.rb b/build_config.rb
index 670721ee3..4aaf1dc63 100644
--- a/build_config.rb
+++ b/build_config.rb
@@ -49,7 +49,14 @@ MRuby::Build.new do |conf|
 
 
   # Generate binaries
-  # conf.bins = %w(mrbc mruby mirb)
+  # conf.bins = %w(mrbc)
+
+  # Generate mirb command
+  conf.gem "#{root}/mrbgems/mruby-tool-mirb"
+
+  # Generate mruby command
+  conf.gem "#{root}/mrbgems/mruby-tool-mruby"
+
 
   # C compiler settings
   # conf.cc do |cc|
diff --git a/mrbgems/mruby-tool-mirb/mrbgem.rake b/mrbgems/mruby-tool-mirb/mrbgem.rake
new file mode 100644
index 000000000..d4296319e
--- /dev/null
+++ b/mrbgems/mruby-tool-mirb/mrbgem.rake
@@ -0,0 +1,5 @@
+MRuby::Gem::Specification.new('mruby-tool-mirb') do |spec|
+  spec.license = 'MIT'
+  spec.authors = 'mruby developers'
+  spec.bins = %w(mirb)
+end
diff --git a/tools/mirb/mirb.c b/mrbgems/mruby-tool-mirb/tools/mirb/mirb.c
similarity index 100%
rename from tools/mirb/mirb.c
rename to mrbgems/mruby-tool-mirb/tools/mirb/mirb.c
diff --git a/mrbgems/mruby-tool-mruby/mrbgem.rake b/mrbgems/mruby-tool-mruby/mrbgem.rake
new file mode 100644
index 000000000..6e6d57b00
--- /dev/null
+++ b/mrbgems/mruby-tool-mruby/mrbgem.rake
@@ -0,0 +1,5 @@
+MRuby::Gem::Specification.new('mruby-tool-mruby') do |spec|
+  spec.license = 'MIT'
+  spec.authors = 'mruby developers'
+  spec.bins = %w(mruby)
+end
diff --git a/tools/mruby/mruby.c b/mrbgems/mruby-tool-mruby/tools/mruby/mruby.c
similarity index 100%
rename from tools/mruby/mruby.c
rename to mrbgems/mruby-tool-mruby/tools/mruby/mruby.c
diff --git a/tasks/mruby_build.rake b/tasks/mruby_build.rake
index dcb557bfd..4a8dcf99b 100644
--- a/tasks/mruby_build.rake
+++ b/tasks/mruby_build.rake
@@ -74,7 +74,7 @@ module MRuby
         @git = Command::Git.new(self)
         @mrbc = Command::Mrbc.new(self)
 
-        @bins = %w(mruby mrbc mirb)
+        @bins = %w(mrbc)
         @gems, @libmruby = [], []
         @build_mrbtest_lib_only = false
 
diff --git a/tools/mirb/mirb.rake b/tools/mirb/mirb.rake
deleted file mode 100644
index f258a9df9..000000000
--- a/tools/mirb/mirb.rake
+++ /dev/null
@@ -1,19 +0,0 @@
-MRuby.each_target do
-  current_dir = File.dirname(__FILE__).relative_path_from(Dir.pwd)
-  relative_from_root = File.dirname(__FILE__).relative_path_from(MRUBY_ROOT)
-  current_build_dir = "#{build_dir}/#{relative_from_root}"
-
-  if bins.find { |s| s.to_s == 'mirb' }
-    exec = exefile("#{build_dir}/bin/mirb")
-    objs = Dir.glob("#{current_dir}/*.c").map { |f| objfile(f.pathmap("#{current_build_dir}/%n")) }
-
-    file exec => objs + [libfile("#{build_dir}/lib/libmruby")] do |t|
-      gem_flags = gems.map { |g| g.linker.flags }
-      gem_flags_before_libraries = gems.map { |g| g.linker.flags_before_libraries }
-      gem_flags_after_libraries = gems.map { |g| g.linker.flags_after_libraries }
-      gem_libraries = gems.map { |g| g.linker.libraries }
-      gem_library_paths = gems.map { |g| g.linker.library_paths }
-      linker.run t.name, t.prerequisites, gem_libraries, gem_library_paths, gem_flags, gem_flags_before_libraries
-    end
-  end
-end
diff --git a/tools/mruby/mruby.rake b/tools/mruby/mruby.rake
deleted file mode 100644
index dc3cbe2a2..000000000
--- a/tools/mruby/mruby.rake
+++ /dev/null
@@ -1,19 +0,0 @@
-MRuby.each_target do
-  current_dir = File.dirname(__FILE__).relative_path_from(Dir.pwd)
-  relative_from_root = File.dirname(__FILE__).relative_path_from(MRUBY_ROOT)
-  current_build_dir = "#{build_dir}/#{relative_from_root}"
-
-  if bins.find { |s| s.to_s == 'mruby' }
-    exec = exefile("#{build_dir}/bin/mruby")
-    objs = Dir.glob("#{current_dir}/*.c").map { |f| objfile(f.pathmap("#{current_build_dir}/%n")) }.flatten
-
-    file exec => objs + [libfile("#{build_dir}/lib/libmruby")] do |t|
-      gem_flags = gems.map { |g| g.linker.flags }
-      gem_flags_before_libraries = gems.map { |g| g.linker.flags_before_libraries }
-      gem_flags_after_libraries = gems.map { |g| g.linker.flags_after_libraries }
-      gem_libraries = gems.map { |g| g.linker.libraries }
-      gem_library_paths = gems.map { |g| g.linker.library_paths }
-      linker.run t.name, t.prerequisites, gem_libraries, gem_library_paths, gem_flags, gem_flags_before_libraries
-    end
-  end
-end