From 551bf0c635ca5dda1741a39a92de528dc82e90d6 Mon Sep 17 00:00:00 2001
From: KOBAYASHI Shuji <shuujii@gmail.com>
Date: Sat, 21 Nov 2020 15:36:46 +0900
Subject: Move some `.rake` files to `tasks` directory for consistency

---
 Rakefile            |  4 ++--
 mrblib/mrblib.rake  | 30 ------------------------------
 src/mruby_core.rake | 17 -----------------
 tasks/core.rake     | 17 +++++++++++++++++
 tasks/mrblib.rake   | 30 ++++++++++++++++++++++++++++++
 5 files changed, 49 insertions(+), 49 deletions(-)
 delete mode 100644 mrblib/mrblib.rake
 delete mode 100644 src/mruby_core.rake
 create mode 100644 tasks/core.rake
 create mode 100644 tasks/mrblib.rake

diff --git a/Rakefile b/Rakefile
index db6cbf91a..a2c4a7294 100644
--- a/Rakefile
+++ b/Rakefile
@@ -22,8 +22,8 @@ MRuby.each_target do |build|
 end
 
 # load custom rules
-load "#{MRUBY_ROOT}/src/mruby_core.rake"
-load "#{MRUBY_ROOT}/mrblib/mrblib.rake"
+load "#{MRUBY_ROOT}/tasks/core.rake"
+load "#{MRUBY_ROOT}/tasks/mrblib.rake"
 
 load "#{MRUBY_ROOT}/tasks/mrbgems.rake"
 load "#{MRUBY_ROOT}/tasks/libmruby.rake"
diff --git a/mrblib/mrblib.rake b/mrblib/mrblib.rake
deleted file mode 100644
index 7231b63bc..000000000
--- a/mrblib/mrblib.rake
+++ /dev/null
@@ -1,30 +0,0 @@
-MRuby.each_target do
-  src = "#{build_dir}/mrblib/mrblib.c"
-  obj = objfile(src.ext)
-  rbfiles = Dir["#{MRUBY_ROOT}/mrblib/*.rb"].sort!
-
-  self.libmruby_objs << obj
-
-  file obj => src
-  file src => [mrbcfile, __FILE__, *rbfiles] do |t|
-    mkdir_p File.dirname(t.name)
-    File.open(t.name, 'w') do |f|
-      _pp "GEN", "mrblib/*.rb", "#{t.name.relative_path}"
-      f.puts %Q[/*]
-      f.puts %Q[ * This file is loading the mrblib]
-      f.puts %Q[ *]
-      f.puts %Q[ * IMPORTANT:]
-      f.puts %Q[ *   This file was generated!]
-      f.puts %Q[ *   All manual changes will get lost.]
-      f.puts %Q[ */]
-      mrbc.run f, rbfiles, 'mrblib_proc'
-      f.puts <<INIT_END
-void
-mrb_init_mrblib(mrb_state *mrb)
-{
-  mrb_load_proc(mrb, mrblib_proc);
-}
-INIT_END
-    end
-  end
-end
diff --git a/src/mruby_core.rake b/src/mruby_core.rake
deleted file mode 100644
index c4816d4ce..000000000
--- a/src/mruby_core.rake
+++ /dev/null
@@ -1,17 +0,0 @@
-as_cxx_srcs = %w[vm error gc].map{|name| "#{MRUBY_ROOT}/src/#{name}.c"}
-
-MRuby.each_target do
-  objs = Dir.glob("#{MRUBY_ROOT}/src/*.c").map do |src|
-    dst = src.pathmap("#{build_dir}/src/%n")
-    if cxx_exception_enabled? && as_cxx_srcs.include?(src)
-      compile_as_cxx(src, "#{dst}.cxx")
-    else
-      objfile(dst)
-    end
-  end
-  self.libmruby_objs << objs
-
-  file libmruby_core_static => objs do |t|
-    archiver.run t.name, t.prerequisites
-  end
-end
diff --git a/tasks/core.rake b/tasks/core.rake
new file mode 100644
index 000000000..c4816d4ce
--- /dev/null
+++ b/tasks/core.rake
@@ -0,0 +1,17 @@
+as_cxx_srcs = %w[vm error gc].map{|name| "#{MRUBY_ROOT}/src/#{name}.c"}
+
+MRuby.each_target do
+  objs = Dir.glob("#{MRUBY_ROOT}/src/*.c").map do |src|
+    dst = src.pathmap("#{build_dir}/src/%n")
+    if cxx_exception_enabled? && as_cxx_srcs.include?(src)
+      compile_as_cxx(src, "#{dst}.cxx")
+    else
+      objfile(dst)
+    end
+  end
+  self.libmruby_objs << objs
+
+  file libmruby_core_static => objs do |t|
+    archiver.run t.name, t.prerequisites
+  end
+end
diff --git a/tasks/mrblib.rake b/tasks/mrblib.rake
new file mode 100644
index 000000000..7231b63bc
--- /dev/null
+++ b/tasks/mrblib.rake
@@ -0,0 +1,30 @@
+MRuby.each_target do
+  src = "#{build_dir}/mrblib/mrblib.c"
+  obj = objfile(src.ext)
+  rbfiles = Dir["#{MRUBY_ROOT}/mrblib/*.rb"].sort!
+
+  self.libmruby_objs << obj
+
+  file obj => src
+  file src => [mrbcfile, __FILE__, *rbfiles] do |t|
+    mkdir_p File.dirname(t.name)
+    File.open(t.name, 'w') do |f|
+      _pp "GEN", "mrblib/*.rb", "#{t.name.relative_path}"
+      f.puts %Q[/*]
+      f.puts %Q[ * This file is loading the mrblib]
+      f.puts %Q[ *]
+      f.puts %Q[ * IMPORTANT:]
+      f.puts %Q[ *   This file was generated!]
+      f.puts %Q[ *   All manual changes will get lost.]
+      f.puts %Q[ */]
+      mrbc.run f, rbfiles, 'mrblib_proc'
+      f.puts <<INIT_END
+void
+mrb_init_mrblib(mrb_state *mrb)
+{
+  mrb_load_proc(mrb, mrblib_proc);
+}
+INIT_END
+    end
+  end
+end
-- 
cgit v1.2.3