summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorduerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-24 09:13:30 +0000
committerduerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-24 09:13:30 +0000
commit615d99b7e7cd2865a5b70d0ebd84f0eb890a8612 (patch)
treecfd5f95d75ad9f903769b2f235828675cdbd1471
parentb58fac9a97bc2cb7256b9ae37dfb82a352e6f85e (diff)
* common.mk: Simplifying Unicode data file download logic to make
it more reliable (including additional fix not in r53633) [Bug #12007] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53643 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--common.mk11
2 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 50292df..d887edd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jan 24 18:12:36 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
+
+ * common.mk: Simplifying Unicode data file download logic to make
+ it more reliable (including additional fix not in r53633) [Bug #12007]
+
Sun Jan 24 16:54:11 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/io/wait/wait.c (io_wait_readwrite): [EXPERIMENTAL] allow to
diff --git a/common.mk b/common.mk
index 1d8a362..4c156b9 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,13 +1023,12 @@ $(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
$(srcdir)/.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \
- $(UNICODE_FILES_DEPS) \
+ $(UNICODE_FILES) \
$(srcdir)/template/unicode_norm_gen.tmpl
$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb \
-c -t$@ -o $(srcdir)/lib/unicode_normalize/tables.rb \