diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-04-13 22:18:20 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-04-13 22:18:20 +0000 |
| commit | 1371865130ee432d44683222982720e5ba3fd66e (patch) | |
| tree | 9d36aa0e4b0b7b41b6a84bb1bcfd738048398f79 | |
| parent | f020dffd377fa889d01cd9aeda5a9d56ad06cc8e (diff) | |
merge revision(s) 66720:
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/branches/ruby_2_6@67529 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | common.mk | 14 | ||||
| -rw-r--r-- | version.h | 2 |
2 files changed, 14 insertions, 2 deletions
@@ -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) @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.6.3" #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 58 +#define RUBY_PATCHLEVEL 59 #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 4 |