summaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
authorKOBAYASHI Shuji <[email protected]>2020-11-28 12:38:46 +0900
committerKOBAYASHI Shuji <[email protected]>2020-11-28 12:38:46 +0900
commit8da2c112435a1ac9e796d696ab8da111763c4d46 (patch)
tree552f07e9e502e231d169d0b6555ae27998c15d6f /lib
parent6d07d9b3d7a64834bda8644ab6c4ed1fabe217a4 (diff)
downloadmruby-8da2c112435a1ac9e796d696ab8da111763c4d46.tar.gz
mruby-8da2c112435a1ac9e796d696ab8da111763c4d46.zip
Remove unused Rake rules
Currently, the source file language in the core is C only, and C++, Objective-C, and Assembly are not used, so Rake rules for them are removed.
Diffstat (limited to 'lib')
-rw-r--r--lib/mruby/build.rb2
-rw-r--r--lib/mruby/gem.rb15
2 files changed, 8 insertions, 9 deletions
diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb
index 1ada8b657..1e3590b28 100644
--- a/lib/mruby/build.rb
+++ b/lib/mruby/build.rb
@@ -277,8 +277,8 @@ EOS
compiler.defines += %w(MRB_NO_GEMS)
end
compiler.defines |= %w(MRB_USE_DEBUG_HOOK) if use_mrdb
- compiler.define_rules build_dir, File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
end
+ cc.define_rules(build_dir, MRUBY_ROOT)
end
def filename(name)
diff --git a/lib/mruby/gem.rb b/lib/mruby/gem.rb
index e01dffe84..eb94c9eda 100644
--- a/lib/mruby/gem.rb
+++ b/lib/mruby/gem.rb
@@ -51,7 +51,7 @@ module MRuby
def setup
return if defined?(@linker) # return if already set up
-
+
MRuby::Gem.current = self
MRuby::Build::COMMANDS.each do |command|
instance_variable_set("@#{command}", @build.send(command).clone)
@@ -81,12 +81,7 @@ module MRuby
@generate_functions = !(@rbfiles.empty? && @objs.empty?)
@objs << objfile("#{build_dir}/gem_init") if @generate_functions
- mgem = MRUBY_ROOT+"/mrbgems"
- if @dir[0,mgem.size] == mgem
- @cdump = true # OK to cdump core mrbgems
- else
- @cdump = false # use mrb dump by default
- end
+ @cdump = core? # by default core gems use cdump and others use mrb dump
if !name || !licenses || !authors
fail "#{name || dir} required to set name, license(s) and author(s)"
@@ -101,7 +96,7 @@ module MRuby
end
def setup_compilers
- compilers.each do |compiler|
+ (core? ? [cc] : compilers).each do |compiler|
compiler.define_rules build_dir, "#{dir}"
compiler.defines << %Q[MRBGEM_#{funcname.upcase}_VERSION=#{version}]
compiler.include_paths << "#{dir}/include" if File.directory? "#{dir}/include"
@@ -127,6 +122,10 @@ module MRuby
@cdump
end
+ def core?
+ @dir.start_with?("#{MRUBY_ROOT}/mrbgems/")
+ end
+
def add_dependency(name, *requirements)
default_gem = requirements.last.kind_of?(Hash) ? requirements.pop : nil
requirements = ['>= 0.0.0'] if requirements.empty?