kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

common.mk: get rid of repeating same names

Browse source 
* common.mk (download-unicode-data): strip directory paths from
  the target names, to get rid of repeating same file names.

* tool/downloader.rb: add -p option for prefix.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53574 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-01-18 10:21:03 +00:00
parent 45acdf4df4
commit f78ab819bf
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common.mk
View file

@ -1017,10 +1017,9 @@ download-unicode-data: ./.unicode-$(UNICODE_VERSION).time
$(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)" $(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)"
$(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \ $(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \
-d enc/unicode/data/$(UNICODE_VERSION) \ -d enc/unicode/data/$(UNICODE_VERSION) \
-p $(UNICODE_VERSION)/ucd \
-e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode \ -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode \
$(UNICODE_VERSION)/ucd/UnicodeData.txt \ $(UNICODE_FILES)
$(UNICODE_VERSION)/ucd/CompositionExclusions.txt \
$(UNICODE_VERSION)/ucd/NormalizationTest.txt
@exit > $@ @exit > $@
$(srcdir)/$(HAVE_BASERUBY:yes=lib/unicode_normalize/tables.rb): \ $(srcdir)/$(HAVE_BASERUBY:yes=lib/unicode_normalize/tables.rb): \

6
tool/downloader.rb
View file

@ -186,6 +186,11 @@ if $0 == __FILE__
when '-d' when '-d'
destdir = ARGV[1] destdir = ARGV[1]
ARGV.shift ARGV.shift
when '-p'
# strip directory names from the name to download, and add the
# prefix instead.
prefix = ARGV[1]
ARGV.shift
when '-e' when '-e'
ims = nil ims = nil
when '-a' when '-a'
@ -205,6 +210,7 @@ if $0 == __FILE__
dl = Downloader.const_get(dl) dl = Downloader.const_get(dl)
ARGV.shift ARGV.shift
ARGV.each do |name| ARGV.each do |name|
name = "#{prefix}/#{File.basename(name)}" if prefix
dl.download(name, destdir, ims) dl.download(name, destdir, ims)
end end
else else