archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 17:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

common.mk: fix Unicode table dependency

Browse source 
* 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
This commit is contained in:
nobu 2014-10-31 03:54:45 +00:00
parent c2228158c9
commit aa631f9a7e
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Fri Oct 31 12:54:43 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (.unicode-tables.time): needs Unicode files always,
and should update after downloading these files.
[ruby-core:66026] [Bug #10461]
Fri Oct 31 10:16:42 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> Fri Oct 31 10:16:42 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* .travis.yml: reverted r48199, it's unlated configuration. * .travis.yml: reverted r48199, it's unlated configuration.

12
common.mk
View file

@ -1112,12 +1112,13 @@ UNICODE_FILES = $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/UnicodeData.txt \
$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/NormalizationTest.txt $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/NormalizationTest.txt
update-unicode: $(UNICODE_FILES) PHONY 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) download-unicode-data: ./.unicode-$(UNICODE_VERSION).time
./.unicode-$(UNICODE_VERSION).time: $(UPDATE_UNICODE_FILES_DEPS:no=) ./.unicode-$(UNICODE_VERSION).time: PHONY
$(ECHO) Downloading Unicode $(UNICODE_VERSION) data files... $(ECHO) Downloading Unicode $(UNICODE_VERSION) data files...
$(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)" $(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)"
$(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \ $(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/UnicodeData.txt \
$(UNICODE_VERSION)/ucd/CompositionExclusions.txt \ $(UNICODE_VERSION)/ucd/CompositionExclusions.txt \
$(UNICODE_VERSION)/ucd/NormalizationTest.txt $(UNICODE_VERSION)/ucd/NormalizationTest.txt
@exit > .update-unicode.time @exit > $@
$(srcdir)/lib/unicode_normalize/tables.rb: ./.unicode-tables.time $(srcdir)/lib/unicode_normalize/tables.rb: ./.unicode-tables.time
./.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \ ./.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \
$(UNICODE_FILES) $(UNICODE_FILES_DEPS) \
$(srcdir)/template/unicode_norm_gen.tmpl $(srcdir)/template/unicode_norm_gen.tmpl
$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb \ $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb \
-c -t$@ -o $(srcdir)/lib/unicode_normalize/tables.rb \ -c -t$@ -o $(srcdir)/lib/unicode_normalize/tables.rb \