* tool/make-snapshot: fix for enc.mk.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18542 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
f65719e5c6
commit
12096f588f
@ -1,3 +1,7 @@
|
|||||||
|
Tue Aug 12 19:11:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* tool/make-snapshot: fix for enc.mk.
|
||||||
|
|
||||||
Tue Aug 12 19:08:42 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Tue Aug 12 19:08:42 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* string.c (rb_str_drop_bytes): new function to drop first bytes.
|
* string.c (rb_str_drop_bytes): new function to drop first bytes.
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#!/usr/bin/ruby
|
#!/usr/bin/ruby -s
|
||||||
require 'uri'
|
require 'uri'
|
||||||
require 'digest/md5'
|
require 'digest/md5'
|
||||||
require 'digest/sha2'
|
require 'digest/sha2'
|
||||||
@ -17,6 +17,7 @@ ENV["RUBY"] ||= "ruby"
|
|||||||
ENV["MV"] ||= "mv"
|
ENV["MV"] ||= "mv"
|
||||||
ENV["MINIRUBY"] ||= "ruby"
|
ENV["MINIRUBY"] ||= "ruby"
|
||||||
|
|
||||||
|
$patch_file &&= File.expand_path($patch_file)
|
||||||
path = ENV["PATH"].split(File::PATH_SEPARATOR)
|
path = ENV["PATH"].split(File::PATH_SEPARATOR)
|
||||||
%w[YACC BASERUBY RUBY MV MINIRUBY].each do |var|
|
%w[YACC BASERUBY RUBY MV MINIRUBY].each do |var|
|
||||||
cmd = ENV[var]
|
cmd = ENV[var]
|
||||||
@ -31,15 +32,17 @@ end
|
|||||||
unless destdir = ARGV.shift
|
unless destdir = ARGV.shift
|
||||||
abort "usage: #{File.basename $0} new-directory-to-save [version ...]"
|
abort "usage: #{File.basename $0} new-directory-to-save [version ...]"
|
||||||
end
|
end
|
||||||
FileUtils.mkpath(destdir)
|
|
||||||
destdir = File.expand_path(destdir)
|
|
||||||
revisions = ARGV.empty? ? ["trunk"] : ARGV
|
revisions = ARGV.empty? ? ["trunk"] : ARGV
|
||||||
tmp = Dir.mktmpdir("ruby-snapshot")
|
unless tmp = $exported
|
||||||
FileUtils.mkpath(tmp)
|
FileUtils.mkpath(destdir)
|
||||||
at_exit {
|
destdir = File.expand_path(destdir)
|
||||||
Dir.chdir "/"
|
tmp = Dir.mktmpdir("ruby-snapshot")
|
||||||
FileUtils.rm_rf(tmp)
|
FileUtils.mkpath(tmp)
|
||||||
}
|
at_exit {
|
||||||
|
Dir.chdir "/"
|
||||||
|
FileUtils.rm_rf(tmp)
|
||||||
|
} unless $keep_temp
|
||||||
|
end
|
||||||
Dir.chdir tmp
|
Dir.chdir tmp
|
||||||
|
|
||||||
def package(rev, destdir)
|
def package(rev, destdir)
|
||||||
@ -70,43 +73,72 @@ def package(rev, destdir)
|
|||||||
end
|
end
|
||||||
revision = `svn info #{url}`[/Last Changed Rev: (\d+)/, 1]
|
revision = `svn info #{url}`[/Last Changed Rev: (\d+)/, 1]
|
||||||
end
|
end
|
||||||
puts "Exporting #{rev}@#{revision}"
|
unless $exported
|
||||||
IO.popen("svn export #{url} ruby") do |pipe|
|
puts "Exporting #{rev}@#{revision}"
|
||||||
pipe.each {|line| /^A/ =~ line or print line}
|
IO.popen("svn export #{url} ruby") do |pipe|
|
||||||
|
pipe.each {|line| /^A/ =~ line or print line}
|
||||||
|
end
|
||||||
|
unless $?.success?
|
||||||
|
warn("Export failed")
|
||||||
|
return
|
||||||
|
end
|
||||||
end
|
end
|
||||||
unless $?.success?
|
|
||||||
warn("Export failed")
|
v = "ruby-#{version}-#{tag}"
|
||||||
return
|
File.directory?(v) or File.rename "ruby", v
|
||||||
end
|
system("patch -d #{v} -p0 -i #{$patch_file}") if $patch_file
|
||||||
open("ruby/revision.h", "wb") {|f| f.puts "#define RUBY_REVISION #{revision}"}
|
open("#{v}/revision.h", "wb") {|f| f.puts "#define RUBY_REVISION #{revision}"}
|
||||||
version ||= (versionhdr = IO.read("ruby/version.h"))[RUBY_VERSION_PATTERN, 1]
|
version ||= (versionhdr = IO.read("#{v}/version.h"))[RUBY_VERSION_PATTERN, 1]
|
||||||
version or return
|
version or return
|
||||||
if patchlevel
|
if patchlevel
|
||||||
versionhdr ||= IO.read("ruby/version.h")
|
versionhdr ||= IO.read("#{v}/version.h")
|
||||||
patchlevel = versionhdr[/^\#define\s+RUBY_PATCHLEVEL\s+(\d+)/, 1]
|
patchlevel = versionhdr[/^\#define\s+RUBY_PATCHLEVEL\s+(\d+)/, 1]
|
||||||
tag = (patchlevel ? "p#{patchlevel}" : "r#{revision}")
|
tag = (patchlevel ? "p#{patchlevel}" : "r#{revision}")
|
||||||
else
|
else
|
||||||
tag = "r#{revision}"
|
tag = "r#{revision}"
|
||||||
end
|
end
|
||||||
v = "ruby-#{version}-#{tag}"
|
|
||||||
File.rename "ruby", v
|
|
||||||
Dir.chdir(v) do
|
Dir.chdir(v) do
|
||||||
print "creating configure..."
|
File.open("cross.rb", "w") {|f| f.puts "CROSS_COMPILING=true"}
|
||||||
unless system("autoconf")
|
unless File.exist?("configure")
|
||||||
puts " failed"
|
print "creating configure..."
|
||||||
return
|
unless system("autoconf")
|
||||||
|
puts " failed"
|
||||||
|
return
|
||||||
|
end
|
||||||
|
puts " done"
|
||||||
end
|
end
|
||||||
puts " done"
|
|
||||||
FileUtils.rm_rf("autom4te.cache")
|
FileUtils.rm_rf("autom4te.cache")
|
||||||
print "creating prerequisites..."
|
print "creating prerequisites..."
|
||||||
if File.file?("common.mk") && /^prereq/ =~ commonmk = IO.read("common.mk")
|
if File.file?("common.mk") && /^prereq/ =~ commonmk = IO.read("common.mk")
|
||||||
IO.popen("make -f - prereq srcdir=. IFCHANGE=tool/ifchange", "w") do |f|
|
puts
|
||||||
|
File.open("config.status", "w") {|f|
|
||||||
|
f.puts "s,@configure_args@,|#_!!_#|,g"
|
||||||
|
f.puts "s,@EXTOUT@,|#_!!_#|..,g"
|
||||||
|
f.puts "s,@bindir@,|#_!!_#|,g"
|
||||||
|
f.puts "s,@ruby_install_name@,|#_!!_#|,g"
|
||||||
|
f.puts "s,@ARCH_FLAG@,|#_!!_#|,g"
|
||||||
|
f.puts "s,@CFLAGS@,|#_!!_#|,g"
|
||||||
|
f.puts "s,@CPPFLAGS@,|#_!!_#|,g"
|
||||||
|
f.puts "s,@LDFLAGS@,|#_!!_#|,g"
|
||||||
|
f.puts "s,@DLDFLAGS@,|#_!!_#|,g"
|
||||||
|
f.puts "s,@LIBEXT@,|#_!!_#|a,g"
|
||||||
|
f.puts "s,@OBJEXT@,|#_!!_#|o,g"
|
||||||
|
f.puts "s,@LIBRUBY@,|#_!!_#|liburyb.a,g"
|
||||||
|
f.puts "s,@LIBRUBY_A@,|#_!!_#|liburyb.a,g"
|
||||||
|
}
|
||||||
|
FileUtils.mkpath("../include/ruby")
|
||||||
|
File.open("../include/ruby/config.h", "w") {}
|
||||||
|
miniruby = ENV['MINIRUBY'] + " -rcross"
|
||||||
|
IO.popen("make -f - prereq srcdir=. IFCHANGE=tool/ifchange 'MINIRUBY=#{miniruby}'", "w") do |f|
|
||||||
f.puts(IO.read("Makefile.in")[/^lex\.c.*?^$/m])
|
f.puts(IO.read("Makefile.in")[/^lex\.c.*?^$/m])
|
||||||
f.puts(commonmk.gsub(/\{[^{}]*\}/, ""))
|
f.puts(commonmk.gsub(/\{[^{}]*\}/, ""))
|
||||||
end
|
end
|
||||||
|
FileUtils.rm_rf("config.status", "../include")
|
||||||
|
print "prerequisites"
|
||||||
else
|
else
|
||||||
system("#{YACC} -o parse.c parse.y")
|
system("#{YACC} -o parse.c parse.y")
|
||||||
end
|
end
|
||||||
|
File.unlink("cross.rb")
|
||||||
unless $?.success?
|
unless $?.success?
|
||||||
puts " failed"
|
puts " failed"
|
||||||
return
|
return
|
||||||
@ -129,10 +161,11 @@ def package(rev, destdir)
|
|||||||
end
|
end
|
||||||
end.compact
|
end.compact
|
||||||
ensure
|
ensure
|
||||||
FileUtils.rm_rf(v) if v
|
FileUtils.rm_rf(v) if v and !$exported and !$keep_temp
|
||||||
end
|
end
|
||||||
|
|
||||||
revisions.collect {|rev| package(rev, destdir)}.flatten.each do |name|
|
revisions.collect {|rev| package(rev, destdir)}.flatten.each do |name|
|
||||||
|
name or next
|
||||||
str = open(name, "rb") {|f| f.read}
|
str = open(name, "rb") {|f| f.read}
|
||||||
md5 = Digest::MD5.hexdigest str
|
md5 = Digest::MD5.hexdigest str
|
||||||
sha = Digest::SHA256.hexdigest str
|
sha = Digest::SHA256.hexdigest str
|
||||||
|
Loading…
x
Reference in New Issue
Block a user