summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-04-17 07:35:27 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-04-17 07:35:27 +0000
commitc576f14039c920e40e6849657e6dd87772f6f7da (patch)
tree2f87371611ffa684f9580e8775d77967094e7af6 /common.mk
parentbd698312fa96a5a5232eb1f1943bf7eac997aa46 (diff)
common.mk: download data and property files together
* common.mk (update-unicode-files): download data and property files together, not to download index html twice. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67593 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk15
1 files changed, 5 insertions, 10 deletions
diff --git a/common.mk b/common.mk
index 72a999aaa8..401f816450 100644
--- a/common.mk
+++ b/common.mk
@@ -1346,10 +1346,11 @@ UNICODE_EMOJI_DOWNLOAD = \
-p emoji/$(UNICODE_EMOJI_VERSION) \
-e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode
-$(UNICODE_PROPERTY_FILES): update-unicode-property-files
-update-unicode-property-files:
- $(ECHO) Downloading Unicode $(UNICODE_VERSION) property files...
- $(Q) $(UNICODE_DOWNLOAD) $(UNICODE_PROPERTY_FILES)
+$(UNICODE_FILES) $(UNICODE_PROPERTY_FILES): update-unicode-files
+update-unicode-files:
+ $(ECHO) Downloading Unicode $(UNICODE_VERSION) data and property files...
+ $(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)"
+ $(Q) $(UNICODE_DOWNLOAD) $(UNICODE_FILES) $(UNICODE_PROPERTY_FILES)
$(UNICODE_AUXILIARY_FILES): update-unicode-auxiliary-files
update-unicode-auxiliary-files:
@@ -1363,12 +1364,6 @@ update-unicode-emoji-files:
$(Q) $(MAKEDIRS) "$(UNICODE_SRC_EMOJI_DATA_DIR)"
$(Q) $(UNICODE_EMOJI_DOWNLOAD) $(UNICODE_EMOJI_FILES)
-$(UNICODE_FILES): update-unicode-files
-update-unicode-files:
- $(ECHO) Downloading Unicode $(UNICODE_VERSION) data files...
- $(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)"
- $(Q) $(UNICODE_DOWNLOAD) $(UNICODE_FILES)
-
$(srcdir)/$(HAVE_BASERUBY:yes=lib/unicode_normalize/tables.rb): \
$(UNICODE_SRC_DATA_DIR)/.unicode-tables.time