From 0d3d8a8cda9436627573b1ad2160a30b17b679fd Mon Sep 17 00:00:00 2001 From: duerst Date: Sat, 23 Jan 2016 09:32:44 +0000 Subject: git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53633 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ common.mk | 9 +++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 961d62e3e5..4d0f7a7441 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Jan 23 16:29:42 2016 Martin Duerst + + * common.mk: Simplifying Unicode data file download logic to make + it more reliable + Sat Jan 23 16:29:42 2016 Martin Duerst * tool/downloader.rb: Fixed a logical error, improved documentation diff --git a/common.mk b/common.mk index 1d8a362235..8e0a690a8f 100644 --- a/common.mk +++ b/common.mk @@ -1005,7 +1005,7 @@ extract-gems: PHONY bundled_gems ### set the following environment variable or uncomment the line if -### the Unicode data files are updated every minute. +### the Unicode data files should be updated completely on every update ('make up',...). # ALWAYS_UPDATE_UNICODE = yes UNICODE_FILES = $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/UnicodeData.txt \ @@ -1013,11 +1013,9 @@ UNICODE_FILES = $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/UnicodeData.txt \ $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/NormalizationTest.txt \ $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/CaseFolding.txt -UNICODE_FILES_DEPS = $(srcdir)/.unicode-$(UNICODE_VERSION).time +update-unicode: $(UNICODE_FILES) -update-unicode: $(srcdir)/.unicode-$(UNICODE_VERSION).time PHONY - -$(UNICODE_FILES_DEPS): +$(UNICODE_FILES): $(ECHO) Downloading Unicode $(UNICODE_VERSION) data files... $(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)" $(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \ @@ -1025,7 +1023,6 @@ $(UNICODE_FILES_DEPS): -p $(UNICODE_VERSION)/ucd \ -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode \ $(UNICODE_FILES) - @exit > $@ $(srcdir)/$(HAVE_BASERUBY:yes=lib/unicode_normalize/tables.rb): \ $(srcdir)/.unicode-tables.time -- cgit v1.2.3