* ext/extmk.rb: Re-generate extmk.mk and dummy makefiles only if

really required.
  This fixes a problem to run multiple test-all concurrently as:
  make test-all & make test-all & make test-all & ...


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45591 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2014-04-15 10:29:01 +00:00
Родитель d9a177521f
Коммит 07b12e1ee2
2 изменённых файлов: 21 добавлений и 2 удалений

Просмотреть файл

@ -1,3 +1,10 @@
Tue Apr 15 19:26:05 2014 Tanaka Akira <akr@fsij.org>
* ext/extmk.rb: Re-generate extmk.mk and dummy makefiles only if
really required.
This fixes a problem to run multiple test-all concurrently as:
make test-all & make test-all & make test-all & ...
Tue Apr 15 12:49:53 2014 Sam Rawlins <sam.rawlins@gmail.com> Tue Apr 15 12:49:53 2014 Sam Rawlins <sam.rawlins@gmail.com>
* enum.c (enum_each_slice, enum_each_cons): make more efficient by * enum.c (enum_each_slice, enum_each_cons): make more efficient by

Просмотреть файл

@ -69,6 +69,18 @@ def system(*args)
super super
end end
def atomic_write_open(filename)
filename_new = filename + ".new.#$$"
open(filename_new, "wb") do |f|
yield f
end
if File.binread(filename_new) != (File.binread(filename) rescue nil)
File.rename(filename_new, filename)
else
File.unlink(filename_new)
end
end
def extract_makefile(makefile, keep = true) def extract_makefile(makefile, keep = true)
m = File.read(makefile) m = File.read(makefile)
if !(target = m[/^TARGET[ \t]*=[ \t]*(\S*)/, 1]) if !(target = m[/^TARGET[ \t]*=[ \t]*(\S*)/, 1])
@ -229,7 +241,7 @@ def extmake(target)
f.truncate(f.pos) f.truncate(f.pos)
end unless $static end unless $static
else else
open(makefile, "wb") do |f| atomic_write_open(makefile) do |f|
f.puts "# " + DUMMY_SIGNATURE f.puts "# " + DUMMY_SIGNATURE
f.print(*dummy_makefile(CONFIG["srcdir"])) f.print(*dummy_makefile(CONFIG["srcdir"]))
end end
@ -636,7 +648,7 @@ $mflags.unshift("topdir=#$topdir")
ENV.delete("RUBYOPT") ENV.delete("RUBYOPT")
if $configure_only and $command_output if $configure_only and $command_output
exts.map! {|d| "ext/#{d}/."} exts.map! {|d| "ext/#{d}/."}
open($command_output, "wb") do |mf| atomic_write_open($command_output) do |mf|
mf.puts "V = 0" mf.puts "V = 0"
mf.puts "Q1 = $(V:1=)" mf.puts "Q1 = $(V:1=)"
mf.puts "Q = $(Q1:0=@)" mf.puts "Q = $(Q1:0=@)"