зеркало из https://github.com/github/ruby.git
common.mk: ifchange for mkconfig.rb
* common.mk (RBCONFIG): use ifchange tool to see if the content is changed and update the timestamp file. * tool/mkconfig.rb: remove ifchange features. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55338 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
9403716fb0
Коммит
2bd061f25e
|
@ -1,4 +1,9 @@
|
|||
Thu Jun 9 15:31:52 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
Thu Jun 9 15:32:17 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* common.mk (RBCONFIG): use ifchange tool to see if the content is
|
||||
changed and update the timestamp file.
|
||||
|
||||
* tool/mkconfig.rb: remove ifchange features.
|
||||
|
||||
* tool/ifchange: make target directory if it does not exist with
|
||||
its parent directories.
|
||||
|
|
|
@ -624,11 +624,12 @@ extconf: $(PREP)
|
|||
$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
|
||||
|
||||
$(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h
|
||||
$(Q)$(BOOTSTRAPRUBY) $(srcdir)/tool/mkconfig.rb -timestamp=$@ \
|
||||
$(Q)$(BOOTSTRAPRUBY) $(srcdir)/tool/mkconfig.rb \
|
||||
-cross_compiling=$(CROSS_COMPILING) \
|
||||
-arch=$(arch) -version=$(RUBY_PROGRAM_VERSION) \
|
||||
-install_name=$(RUBY_INSTALL_NAME) \
|
||||
-so_name=$(RUBY_SO_NAME) rbconfig.rb
|
||||
-so_name=$(RUBY_SO_NAME) | \
|
||||
$(srcdir)/tool/ifchange --timestamp=$@ rbconfig.rb -
|
||||
|
||||
test-rubyspec-precheck:
|
||||
|
||||
|
|
|
@ -19,17 +19,6 @@ $:.unshift(".")
|
|||
require "fileutils"
|
||||
mkconfig = File.basename($0)
|
||||
|
||||
rbconfig_rb = ARGV[0] || 'rbconfig.rb'
|
||||
unless File.directory?(dir = File.dirname(rbconfig_rb))
|
||||
FileUtils.makedirs(dir, :verbose => true)
|
||||
end
|
||||
|
||||
config = ""
|
||||
def config.write(arg)
|
||||
concat(arg.to_s)
|
||||
end
|
||||
$stdout = config
|
||||
|
||||
fast = {'prefix'=>TRUE, 'ruby_install_name'=>TRUE, 'INSTALL'=>TRUE, 'EXEEXT'=>TRUE}
|
||||
|
||||
win32 = /mswin/ =~ arch
|
||||
|
@ -287,21 +276,4 @@ end
|
|||
CROSS_COMPILING = nil unless defined? CROSS_COMPILING
|
||||
EOS
|
||||
|
||||
$stdout = STDOUT
|
||||
mode = IO::RDWR|IO::CREAT
|
||||
mode |= IO::BINARY if defined?(IO::BINARY)
|
||||
open(rbconfig_rb, mode) do |f|
|
||||
if $timestamp and f.stat.size == config.size and f.read == config
|
||||
puts "#{rbconfig_rb} unchanged"
|
||||
else
|
||||
puts "#{rbconfig_rb} updated"
|
||||
f.rewind
|
||||
f.truncate(0)
|
||||
f.print(config)
|
||||
end
|
||||
end
|
||||
if String === $timestamp
|
||||
FileUtils.touch($timestamp)
|
||||
end
|
||||
|
||||
# vi:set sw=2:
|
||||
|
|
Загрузка…
Ссылка в новой задаче