nobu	2016-01-18 19:21:03 +0900 (Mon, 18 Jan 2016)

  New Revision: 53574

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=53574

  Log:
    common.mk: get rid of repeating same names
    
    * 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.

  Modified files:
    trunk/common.mk
    trunk/tool/downloader.rb
Index: tool/downloader.rb
===================================================================
--- tool/downloader.rb	(revision 53573)
+++ tool/downloader.rb	(revision 53574)
@@ -186,6 +186,11 @@ if $0 == __FILE__ https://github.com/ruby/ruby/blob/trunk/tool/downloader.rb#L186
     when '-d'
       destdir = ARGV[1]
       ARGV.shift
+    when '-p'
+      # strip directory names from the name to download, and add the
+      # prefix instead.
+      prefix = ARGV[1]
+      ARGV.shift
     when '-e'
       ims = nil
     when '-a'
@@ -205,6 +210,7 @@ if $0 == __FILE__ https://github.com/ruby/ruby/blob/trunk/tool/downloader.rb#L210
     dl = Downloader.const_get(dl)
     ARGV.shift
     ARGV.each do |name|
+      name = "#{prefix}/#{File.basename(name)}" if prefix
       dl.download(name, destdir, ims)
     end
   else
Index: common.mk
===================================================================
--- common.mk	(revision 53573)
+++ common.mk	(revision 53574)
@@ -1017,10 +1017,9 @@ download-unicode-data: ./.unicode-$(UNIC https://github.com/ruby/ruby/blob/trunk/common.mk#L1017
 	$(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)"
 	$(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \
 	    -d enc/unicode/data/$(UNICODE_VERSION) \
+	    -p $(UNICODE_VERSION)/ucd \
 	    -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode \
-	    $(UNICODE_VERSION)/ucd/UnicodeData.txt \
-	    $(UNICODE_VERSION)/ucd/CompositionExclusions.txt \
-	    $(UNICODE_VERSION)/ucd/NormalizationTest.txt
+	    $(UNICODE_FILES)
 	@exit > $@
 
 $(srcdir)/$(HAVE_BASERUBY:yes=lib/unicode_normalize/tables.rb): \

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/