mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Prefer File
class methods to write a string
This commit is contained in:
parent
f3becd73e3
commit
762fca9b12
1 changed files with 10 additions and 13 deletions
|
@ -345,7 +345,7 @@ def package(vcs, rev, destdir, tmp = nil)
|
|||
v = v[0]
|
||||
end
|
||||
|
||||
open("#{v}/revision.h", "wb") {|f|
|
||||
File.open("#{v}/revision.h", "wb") {|f|
|
||||
short = vcs.short_revision(revision)
|
||||
f.puts "#define RUBY_REVISION #{short.inspect}"
|
||||
unless short == revision
|
||||
|
@ -391,6 +391,7 @@ def package(vcs, rev, destdir, tmp = nil)
|
|||
return
|
||||
end
|
||||
def (clean = []).add(n) push(n); n end
|
||||
def clean.create(file, content = "") File.binwrite(add(file), content) end
|
||||
Dir.chdir(v) do
|
||||
unless File.exist?("ChangeLog")
|
||||
vcs.export_changelog(url, nil, revision, "ChangeLog")
|
||||
|
@ -438,14 +439,12 @@ def package(vcs, rev, destdir, tmp = nil)
|
|||
rescue Errno::ENOENT
|
||||
# use fallback file
|
||||
end
|
||||
File.open(clean.add("config.status"), "w") {|f|
|
||||
f.print status
|
||||
}
|
||||
clean.create("config.status", status)
|
||||
FileUtils.mkpath(hdrdir = "#{extout}/include/ruby")
|
||||
File.open("#{hdrdir}/config.h", "w") {}
|
||||
File.binwrite("#{hdrdir}/config.h", "")
|
||||
FileUtils.mkpath(defaults = "#{extout}/rubygems/defaults")
|
||||
File.open("#{defaults}/operating_system.rb", "w") {}
|
||||
File.open("#{defaults}/ruby.rb", "w") {}
|
||||
File.binwrite("#{defaults}/operating_system.rb", "")
|
||||
File.binwrite("#{defaults}/ruby.rb", "")
|
||||
miniruby = ENV['MINIRUBY'] + " -I. -I#{extout} -rcross"
|
||||
baseruby = ENV["BASERUBY"]
|
||||
mk = (IO.read("template/Makefile.in") rescue IO.read("Makefile.in")).
|
||||
|
@ -481,11 +480,9 @@ update-gems:
|
|||
$(UNICODE_SRC_DATA_DIR)/.unicode-tables.time:
|
||||
touch-unicode-files:
|
||||
APPEND
|
||||
open(clean.add("Makefile"), "w") do |f|
|
||||
f.puts mk
|
||||
end
|
||||
File.open(clean.add("revision.tmp"), "w") {}
|
||||
File.open(clean.add(".revision.time"), "w") {}
|
||||
clean.create("Makefile", mk)
|
||||
clean.create("revision.tmp")
|
||||
clean.create(".revision.time")
|
||||
ENV["CACHE_SAVE"] = "no"
|
||||
make = MAKE.new(args)
|
||||
return unless make.run("update-download")
|
||||
|
@ -619,7 +616,7 @@ revisions.collect {|rev| package(vcs, rev, destdir, tmp)}.flatten.each do |name|
|
|||
success = false
|
||||
next
|
||||
end
|
||||
str = open(name, "rb") {|f| f.read}
|
||||
str = File.binread(name)
|
||||
pathname = Pathname(name)
|
||||
basename = pathname.basename.to_s
|
||||
extname = pathname.extname.sub(/\A\./, '')
|
||||
|
|
Loading…
Reference in a new issue