summaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2019-12-27 18:35:19 +0900
committerGitHub <[email protected]>2019-12-27 18:35:19 +0900
commitd2f34a845514d45e9651a87d445e2d1bdabe680a (patch)
tree71e9536f151dc2e6303948a13d5d72b067406d19 /lib
parent03244b52a0624e823ae5e338ecf72a868da08ef2 (diff)
parent26e6e75ba6a59bc77c80a6ce5d207626cfed91a6 (diff)
downloadmruby-d2f34a845514d45e9651a87d445e2d1bdabe680a.tar.gz
mruby-d2f34a845514d45e9651a87d445e2d1bdabe680a.zip
Merge pull request #4910 from shuujii/use-Rake-DSL-instead-of-commands-of-FileUtils
Use Rake DSL instead of commands of `FileUtils`
Diffstat (limited to 'lib')
-rw-r--r--lib/mruby/build.rb2
-rw-r--r--lib/mruby/build/command.rb10
-rw-r--r--lib/mruby/build/load_gems.rb4
-rw-r--r--lib/mruby/gem.rb2
4 files changed, 9 insertions, 9 deletions
diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb
index c080857a0..749b7fe3f 100644
--- a/lib/mruby/build.rb
+++ b/lib/mruby/build.rb
@@ -173,7 +173,7 @@ module MRuby
obj = objfile(cxx_src) if obj.nil?
file cxx_src => [src, __FILE__] do |t|
- FileUtils.mkdir_p File.dirname t.name
+ mkdir_p File.dirname t.name
IO.write t.name, <<EOS
#define __STDC_CONSTANT_MACROS
#define __STDC_LIMIT_MACROS
diff --git a/lib/mruby/build/command.rb b/lib/mruby/build/command.rb
index 6eb4b6628..098eb77b0 100644
--- a/lib/mruby/build/command.rb
+++ b/lib/mruby/build/command.rb
@@ -89,7 +89,7 @@ module MRuby
end
def run(outfile, infile, _defines=[], _include_paths=[], _flags=[])
- FileUtils.mkdir_p File.dirname(outfile)
+ mkdir_p File.dirname(outfile)
_pp "CC", infile.relative_path, outfile.relative_path
if MRUBY_BUILD_HOST_IS_CYGWIN
_run compile_options, { :flags => all_flags(_defines, _include_paths, _flags),
@@ -205,7 +205,7 @@ module MRuby
end
def run(outfile, objfiles, _libraries=[], _library_paths=[], _flags=[], _flags_before_libraries=[], _flags_after_libraries=[])
- FileUtils.mkdir_p File.dirname(outfile)
+ mkdir_p File.dirname(outfile)
library_flags = [libraries, _libraries].flatten.map { |d| option_library % d }
_pp "LD", outfile.relative_path
@@ -235,7 +235,7 @@ module MRuby
end
def run(outfile, objfiles)
- FileUtils.mkdir_p File.dirname(outfile)
+ mkdir_p File.dirname(outfile)
_pp "AR", outfile.relative_path
if MRUBY_BUILD_HOST_IS_CYGWIN
_run archive_options, { :outfile => cygwin_filename(outfile), :objs => cygwin_filename(objfiles).join(' ') }
@@ -255,7 +255,7 @@ module MRuby
end
def run(outfile, infile)
- FileUtils.mkdir_p File.dirname(outfile)
+ mkdir_p File.dirname(outfile)
_pp "YACC", infile.relative_path, outfile.relative_path
_run compile_options, { :outfile => filename(outfile) , :infile => filename(infile) }
end
@@ -271,7 +271,7 @@ module MRuby
end
def run(outfile, infile)
- FileUtils.mkdir_p File.dirname(outfile)
+ mkdir_p File.dirname(outfile)
_pp "GPERF", infile.relative_path, outfile.relative_path
_run compile_options, { :outfile => filename(outfile) , :infile => filename(infile) }
end
diff --git a/lib/mruby/build/load_gems.rb b/lib/mruby/build/load_gems.rb
index 17035c459..522b8a17e 100644
--- a/lib/mruby/build/load_gems.rb
+++ b/lib/mruby/build/load_gems.rb
@@ -57,7 +57,7 @@ module MRuby
if File.exist? mgem_list_dir
git.run_pull mgem_list_dir, mgem_list_url if $pull_gems
else
- FileUtils.mkdir_p mgem_list_dir
+ mkdir_p mgem_list_dir
git.run_clone mgem_list_dir, mgem_list_url, "--depth 1"
end
@@ -99,7 +99,7 @@ module MRuby
options << "--recursive"
options << "--branch \"#{branch}\""
options << "--depth 1" unless params[:checksum_hash]
- FileUtils.mkdir_p "#{gem_clone_dir}"
+ mkdir_p "#{gem_clone_dir}"
git.run_clone gemdir, url, options
# Jump to the specified commit
diff --git a/lib/mruby/gem.rb b/lib/mruby/gem.rb
index a1cdb28af..4214ceb08 100644
--- a/lib/mruby/gem.rb
+++ b/lib/mruby/gem.rb
@@ -157,7 +157,7 @@ module MRuby
def define_gem_init_builder
file objfile("#{build_dir}/gem_init") => [ "#{build_dir}/gem_init.c", File.join(dir, "mrbgem.rake") ]
file "#{build_dir}/gem_init.c" => [build.mrbcfile, __FILE__] + [rbfiles].flatten do |t|
- FileUtils.mkdir_p build_dir
+ mkdir_p build_dir
generate_gem_init("#{build_dir}/gem_init.c")
end
end