aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--common.mk9
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e5337ea313..0b651f6f6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jan 23 20:54:26 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org>
+
+ * common.mk: revert r53633. It broke rubyci and travis.
+ https://travis-ci.org/ruby/ruby/builds/104259623
+
Sat Jan 23 20:10:29 2016 Shugo Maeda <shugo@ruby-lang.org>
* range.c (range_eqq): revert r51585 because rb_call_super() is
diff --git a/common.mk b/common.mk
index 8e0a690a8f..1d8a362235 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 should be updated completely on every update ('make up',...).
+### the Unicode data files are updated every minute.
# ALWAYS_UPDATE_UNICODE = yes
UNICODE_FILES = $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/UnicodeData.txt \
@@ -1013,9 +1013,11 @@ 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
-update-unicode: $(UNICODE_FILES)
+UNICODE_FILES_DEPS = $(srcdir)/.unicode-$(UNICODE_VERSION).time
-$(UNICODE_FILES):
+update-unicode: $(srcdir)/.unicode-$(UNICODE_VERSION).time PHONY
+
+$(UNICODE_FILES_DEPS):
$(ECHO) Downloading Unicode $(UNICODE_VERSION) data files...
$(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)"
$(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \
@@ -1023,6 +1025,7 @@ $(UNICODE_FILES):
-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