diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | ext/extmk.rb | 12 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 |
3 files changed, 16 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Fri Sep 2 00:55:11 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/extmk.rb (timestamp_file): move extmk.rb specific tricks + from lib/mkmf.rb. keep RUBYCOMMONDIR prefix not to conflict + with a timestamp file in the toplevel. + Thu Sep 1 14:24:16 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/extmk.rb (gems): move dirty hacks for bundled gems from diff --git a/ext/extmk.rb b/ext/extmk.rb index 0a7c589063..2f320a6737 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -548,6 +548,12 @@ gems = Dir.glob(File.join(ext_prefix, ($extension || ''), '**/extconf.rb')).coll with_config(ext, &cond) }.sort +extend Module.new { + def timestamp_file(name, target_prefix = nil) + super.sub(%r[/\.extout\.(?:-\.)?], '/.') + end +} + dir = Dir.pwd FileUtils::makedirs('ext') Dir::chdir('ext') @@ -570,7 +576,7 @@ Dir.chdir('gems') extout = $extout unless gems.empty? def self.timestamp_file(name, target_prefix = nil) - name = @sodir if name == '$(TARGET_SO_DIR)' + name = "$(arch)/gems/#{@gemname}" if name == '$(TARGET_SO_DIR)' super end @@ -578,7 +584,7 @@ unless gems.empty? super(*args) do |conf| conf.find do |s| s.sub!(/^(TARGET_SO_DIR *= *)\$\(RUBYARCHDIR\)/) { - $1 + @sodir + "#{$1}$(extout)/gems/$(arch)/#{@gemname}" } end conf << %{ @@ -598,7 +604,7 @@ $(build_complete): $(TARGET_SO) end gems.each do |d| $extout = extout.dup - @sodir = "$(extout)/gems/$(arch)/#{d[%r{\A[^/]+}]}" + @gemname = d[%r{\A[^/]+}] extmake(d, 'gems') end $extout = extout diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 8eb2b29ba5..53f9fd96fa 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -2025,9 +2025,9 @@ preload = #{defined?($preload) && $preload ? $preload.join(' ') : ''} pat[n] = $` if /\$\(target_prefix\)\z/ =~ d end name = name.gsub(/\$\((#{pat.keys.join("|")})\)/) {pat[$1]+target_prefix} - name.sub!(/\A\$\((?:extout|RUBYCOMMONDIR)\)\/*/, '') name.sub!(/(\$\((?:site)?arch\))\/*/, '') arch = $1 || '' + name.chomp!('/') name = name.gsub(/(\$[({]|[})])|(\/+)|[^-.\w]+/) {$1 ? "" : $2 ? ".-." : "_"} File.join("$(TIMESTAMP_DIR)", arch, "#{name.sub(/\A(?=.)/, '.')}.time") end |