summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2017-07-20 23:14:34 +0900
committerGitHub <[email protected]>2017-07-20 23:14:34 +0900
commit04c21d9d6b137829c0884b106aca784e631a34d4 (patch)
tree55ab5904184a891a201f2290cfd01bccf478a842
parent25a0a6b038fb97fff504e3892586a6988ded2808 (diff)
parent5a9eedf5417266b82e3695ae0c29797182a5d04e (diff)
downloadmruby-04c21d9d6b137829c0884b106aca784e631a34d4.tar.gz
mruby-04c21d9d6b137829c0884b106aca784e631a34d4.zip
Merge pull request #3749 from christopheraue/fix_spec_rbfiles
Fixed setting custom rbfiles in gemspec
-rw-r--r--tasks/mrbgem_spec.rake6
1 files changed, 3 insertions, 3 deletions
diff --git a/tasks/mrbgem_spec.rake b/tasks/mrbgem_spec.rake
index 1f7cde529..27a1d358c 100644
--- a/tasks/mrbgem_spec.rake
+++ b/tasks/mrbgem_spec.rake
@@ -63,9 +63,6 @@ module MRuby
objfile(f.relative_path_from(@dir).to_s.pathmap("#{build_dir}/%X"))
end
- @generate_functions = !(@rbfiles.empty? && @objs.empty?)
- @objs << objfile("#{build_dir}/gem_init") if @generate_functions
-
@test_rbfiles = Dir.glob("#{dir}/test/**/*.rb")
@test_objs = Dir.glob("#{dir}/test/*.{c,cpp,cxx,cc,m,asm,s,S}").map do |f|
objfile(f.relative_path_from(dir).to_s.pathmap("#{build_dir}/%X"))
@@ -83,6 +80,9 @@ module MRuby
instance_eval(&@initializer)
+ @generate_functions = !(@rbfiles.empty? && @objs.empty?)
+ @objs << objfile("#{build_dir}/gem_init") if @generate_functions
+
if !name || !licenses || !authors
fail "#{name || dir} required to set name, license(s) and author(s)"
end