From 89e3d2f8d3db4ae43ee1f3a922136f30595f8467 Mon Sep 17 00:00:00 2001 From: duerst Date: Sat, 5 Jan 2019 09:47:55 +0000 Subject: separate downloading of Unicode property files and auxiliary files Separate downloading of Unicode property files in ucd and in ucd/auxiliary. This is needed because we need information from separate index.html files to discover the exact file names of property files during a beta period. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66720 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- common.mk | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/common.mk b/common.mk index e82fdb34ae..4e02287eff 100644 --- a/common.mk +++ b/common.mk @@ -1301,6 +1301,9 @@ UNICODE_PROPERTY_FILES = \ $(UNICODE_SRC_DATA_DIR)/PropertyAliases.txt \ $(UNICODE_SRC_DATA_DIR)/PropertyValueAliases.txt \ $(UNICODE_SRC_DATA_DIR)/Scripts.txt \ + $(empty) + +UNICODE_AUXILIARY_FILES = \ $(UNICODE_SRC_DATA_DIR)/auxiliary/GraphemeBreakProperty.txt \ $(UNICODE_SRC_DATA_DIR)/auxiliary/GraphemeBreakTest.txt \ $(empty) @@ -1323,6 +1326,13 @@ UNICODE_DOWNLOAD = \ -d $(UNICODE_SRC_DATA_DIR) \ -p $(UNICODE_VERSION)/ucd \ -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode +UNICODE_AUXILIARY_DOWNLOAD = \ + $(BASERUBY) $(srcdir)/tool/downloader.rb \ + --cache-dir=$(CACHE_DIR) \ + --unicode-beta $(UNICODE_BETA) \ + -d $(UNICODE_SRC_DATA_DIR)/auxiliary \ + -p $(UNICODE_VERSION)/ucd/auxiliary \ + -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode UNICODE_EMOJI_DOWNLOAD = \ $(BASERUBY) $(srcdir)/tool/downloader.rb \ --cache-dir=$(CACHE_DIR) \ @@ -1334,8 +1344,10 @@ UNICODE_EMOJI_DOWNLOAD = \ $(UNICODE_PROPERTY_FILES): update-unicode-property-files update-unicode-property-files: $(ECHO) Downloading Unicode $(UNICODE_VERSION) property files... - $(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)/auxiliary" $(Q) $(UNICODE_DOWNLOAD) $(UNICODE_PROPERTY_FILES) + $(ECHO) Downloading Unicode $(UNICODE_VERSION) auxiliary files... + $(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)/auxiliary" + $(Q) $(UNICODE_AUXILIARY_DOWNLOAD) $(UNICODE_AUXILIARY_FILES) $(ECHO) Downloading Unicode emoji $(UNICODE_EMOJI_VERSION) files... $(Q) $(MAKEDIRS) "$(UNICODE_SRC_EMOJI_DATA_DIR)" $(Q) $(UNICODE_EMOJI_DOWNLOAD) $(UNICODE_EMOJI_FILES) -- cgit v1.2.3