mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
fix GraphemeBreakProperty.txt
* tool/downloader.rb: download to the file given in ARGV. * tool/enc-unicode.rb (parse_GraphemeBreakProperty): fix data file path as $(UNICODE_PROPERTY_FILES) in common.mk. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58069 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
de41817351
commit
81ab413288
3 changed files with 19 additions and 10 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -127,6 +127,7 @@ y.tab.c
|
|||
/enc/*.exp
|
||||
/enc/*.lib
|
||||
/enc/unicode/data/*/*.txt
|
||||
/enc/unicode/data/*/*/*.txt
|
||||
|
||||
# /enc/trans/
|
||||
/enc/trans/*.c
|
||||
|
|
|
@ -127,17 +127,17 @@ class Downloader
|
|||
options.delete(:verify)
|
||||
file = under(dir, name)
|
||||
dryrun = options.delete(:dryrun)
|
||||
if dryrun
|
||||
puts "Download #{url} into #{file}"
|
||||
return false
|
||||
end
|
||||
if since.nil? and File.exist?(file)
|
||||
if $VERBOSE
|
||||
$stdout.puts "#{name} already exists"
|
||||
$stdout.puts "#{file} already exists"
|
||||
$stdout.flush
|
||||
end
|
||||
return true
|
||||
end
|
||||
if dryrun
|
||||
puts "Download #{url} into #{file}"
|
||||
return false
|
||||
end
|
||||
if !https? and url.start_with?("https:")
|
||||
warn "*** using http instead of https ***"
|
||||
url = url.sub(/\Ahttps/, 'http')
|
||||
|
@ -237,14 +237,22 @@ if $0 == __FILE__
|
|||
dl = Downloader.const_get(dl)
|
||||
ARGV.shift
|
||||
ARGV.each do |name|
|
||||
dir = destdir
|
||||
if prefix
|
||||
if name.include?('/auxiliary/')
|
||||
name = "#{prefix}/auxiliary/#{File.basename(name)}"
|
||||
name = name.sub(/\A\.\//, '')
|
||||
if name.start_with?(destdir+"/")
|
||||
name = name[(destdir.size+1)..-1]
|
||||
if (dir = File.dirname(name)) == '.'
|
||||
dir = destdir
|
||||
else
|
||||
dir = File.join(destdir, dir)
|
||||
end
|
||||
else
|
||||
name = "#{prefix}/#{File.basename(name)}"
|
||||
name = File.basename(name)
|
||||
end
|
||||
name = "#{prefix}/#{name}"
|
||||
end
|
||||
dl.download(name, destdir, since, options)
|
||||
dl.download(name, dir, since, options)
|
||||
end
|
||||
else
|
||||
abort "usage: #{$0} url name" unless ARGV.size == 2
|
||||
|
|
|
@ -212,7 +212,7 @@ def parse_GraphemeBreakProperty(data)
|
|||
current = nil
|
||||
cps = []
|
||||
ages = []
|
||||
data_foreach('GraphemeBreakProperty.txt') do |line|
|
||||
data_foreach('auxiliary/GraphemeBreakProperty.txt') do |line|
|
||||
if /^# Total code points: / =~ line
|
||||
constname = constantize_Grapheme_Cluster_Break(current)
|
||||
data[constname] = cps
|
||||
|
|
Loading…
Reference in a new issue