diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2019-02-17 22:12:19 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-02-17 22:12:19 +0900 |
| commit | a3e8b750ef5a7515e2a19b947c9b14261fff1e7a (patch) | |
| tree | b8c95ba77444edd8738f432bafdd8fe5c9b54eb3 | |
| parent | 391b5aa0d8a19e1fefcbb8dc2497b29ec3bbc930 (diff) | |
| parent | b3e0a1398945faa5375809f75fb9727f4982b4dc (diff) | |
| download | mruby-a3e8b750ef5a7515e2a19b947c9b14261fff1e7a.tar.gz mruby-a3e8b750ef5a7515e2a19b947c9b14261fff1e7a.zip | |
Merge pull request #4280 from shuujii/refine-deps-for-mruby-config
Refine dependencies for `mruby-config`
| -rw-r--r-- | mrbgems/mruby-bin-config/mrbgem.rake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mrbgems/mruby-bin-config/mrbgem.rake b/mrbgems/mruby-bin-config/mrbgem.rake index f293c1b9b..3a0a1b897 100644 --- a/mrbgems/mruby-bin-config/mrbgem.rake +++ b/mrbgems/mruby-bin-config/mrbgem.rake @@ -8,13 +8,14 @@ unless MRuby::Build.current.kind_of?(MRuby::CrossBuild) mruby_config = name + (ENV['OS'] == 'Windows_NT' ? '.bat' : '') mruby_config_path = "#{build.build_dir}/bin/#{mruby_config}" make_cfg = "#{build.build_dir}/lib/libmruby.flags.mak" + tmplt_path = "#{__dir__}/#{mruby_config}" build.bins << mruby_config - file mruby_config_path => [build.libmruby_static, make_cfg] do |t| - config = Hash[File.readlines(make_cfg).map(&:chomp).map {|l| + file mruby_config_path => [make_cfg, tmplt_path] do |t| + config = Hash[File.readlines(make_cfg).map!(&:chomp).map! {|l| l.gsub('\\"', '"').split(' = ', 2).map! {|s| s.sub(/^(?=.)/, 'echo ')} }] - tmplt = File.read("#{__dir__}/#{mruby_config}") + tmplt = File.read(tmplt_path) File.write(t.name, tmplt.gsub(/(#{Regexp.union(*config.keys)})\b/, config)) FileUtils.chmod(0755, t.name) end |