summaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2020-10-29 17:18:24 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2020-10-29 22:52:28 +0900
commit78f716250858f18797e9f40024a753ee1c59ad49 (patch)
tree83413e35d3067749e93348275f2f0b1db2722e09 /lib
parentccca5e521cb6b5e7dd0b31e0e5f263dbce385464 (diff)
downloadmruby-78f716250858f18797e9f40024a753ee1c59ad49.tar.gz
mruby-78f716250858f18797e9f40024a753ee1c59ad49.zip
Remove `mrblib_dir` and `objs_dir` configuration from gems.
Always use `mrblib` and 'src` for directory names.
Diffstat (limited to 'lib')
-rw-r--r--lib/mruby/gem.rb7
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/mruby/gem.rb b/lib/mruby/gem.rb
index d4b43b094..99e183f5e 100644
--- a/lib/mruby/gem.rb
+++ b/lib/mruby/gem.rb
@@ -17,7 +17,6 @@ module MRuby
attr_accessor :name, :dir, :build
alias mruby build
attr_accessor :build_config_initializer
- attr_accessor :mrblib_dir, :objs_dir
attr_accessor :version
attr_accessor :description, :summary
@@ -45,8 +44,6 @@ module MRuby
@name = name
@initializer = block
@version = "0.0.0"
- @mrblib_dir = "mrblib"
- @objs_dir = "src"
@dependencies = []
@conflicts = []
MRuby::Gem.current = self
@@ -61,8 +58,8 @@ module MRuby
end
@linker = LinkerConfig.new([], [], [], [], [])
- @rbfiles = Dir.glob("#{@dir}/#{@mrblib_dir}/**/*.rb").sort
- @objs = Dir.glob("#{@dir}/#{@objs_dir}/*.{c,cpp,cxx,cc,m,asm,s,S}").map do |f|
+ @rbfiles = Dir.glob("#{@dir}/mrblib/**/*.rb").sort
+ @objs = Dir.glob("#{@dir}/src/*.{c,cpp,cxx,cc,m,asm,s,S}").map do |f|
objfile(f.relative_path_from(@dir).to_s.pathmap("#{build_dir}/%X"))
end