diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-31 03:54:45 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-31 03:54:45 +0000 |
| commit | aa631f9a7e948d109f3f3fc84112e3352f7b408f (patch) | |
| tree | 1af2ec5955526702ef5fc6861136f797fb71653c /common.mk | |
| parent | c2228158c9f7ed5ca06b1abf76b694bc9c546f91 (diff) | |
| download | ruby-aa631f9a7e948d109f3f3fc84112e3352f7b408f.tar.gz | |
common.mk: fix Unicode table dependency
* common.mk (.unicode-tables.time): needs Unicode files always,
and should update after downloading these files.
[ruby-core:66026] [Bug #10461]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48205 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -1112,12 +1112,13 @@ UNICODE_FILES = $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/UnicodeData.txt \ $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/NormalizationTest.txt update-unicode: $(UNICODE_FILES) PHONY -$(UNICODE_FILES): ./.unicode-$(UNICODE_VERSION).time -UPDATE_UNICODE_FILES_DEPS = $(ALWAYS_UPDATE_UNICODE:yes=PHONY) +UNICODE_FILES_DEPS0 = $(UPDATE_LIBRARIES:yes=download-unicode-data) +UNICODE_FILES_DEPS = $(UNICODE_FILES_DEPS0:no=) +$(UNICODE_FILES): $(UNICODE_FILES_DEPS) -$(UPDATE_LIBRARIES:yes=.)/.unicode-tables.time: $(UNICODE_FILES) -./.unicode-$(UNICODE_VERSION).time: $(UPDATE_UNICODE_FILES_DEPS:no=) +download-unicode-data: ./.unicode-$(UNICODE_VERSION).time +./.unicode-$(UNICODE_VERSION).time: PHONY $(ECHO) Downloading Unicode $(UNICODE_VERSION) data files... $(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)" $(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \ @@ -1126,11 +1127,12 @@ $(UPDATE_LIBRARIES:yes=.)/.unicode-tables.time: $(UNICODE_FILES) $(UNICODE_VERSION)/ucd/UnicodeData.txt \ $(UNICODE_VERSION)/ucd/CompositionExclusions.txt \ $(UNICODE_VERSION)/ucd/NormalizationTest.txt - @exit > .update-unicode.time + @exit > $@ $(srcdir)/lib/unicode_normalize/tables.rb: ./.unicode-tables.time ./.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \ + $(UNICODE_FILES) $(UNICODE_FILES_DEPS) \ $(srcdir)/template/unicode_norm_gen.tmpl $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb \ -c -t$@ -o $(srcdir)/lib/unicode_normalize/tables.rb \ |