diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-30 07:39:51 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-30 07:39:51 +0000 |
| commit | 39713bd9277303d406ea43975b2f4d096a537dc4 (patch) | |
| tree | de6d3f761ba6fd00097a061494ef4cc504dc5254 /common.mk | |
| parent | 40cc9231a9b37bfb22571a68fa0493e0ba532405 (diff) | |
common.mk: separate Unicode files directory
* common.mk: download Unicode files into separate directory for the
version.
* tool/downloader.rb (Downloader::Unicode.download): strip version
directory.
* tool/downloader.rb (Downloader.download): strip directory name
if download directory is given.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48196 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 29 |
1 files changed, 18 insertions, 11 deletions
@@ -10,6 +10,8 @@ Q1 = $(V:1=) Q = $(Q1:0=@) ECHO = $(ECHO1:0=@echo) +UNICODE_VERSION = 7.0.0 + RUBYLIB = $(PATH_SEPARATOR) RUBYOPT = - RUN_OPTS = --disable-gems @@ -1103,21 +1105,25 @@ update-gems: PHONY ### the Unicode data files are updated every minute. # ALWAYS_UPDATE_UNICODE = yes -UNICODE_FILES = $(srcdir)/enc/unicode/data/UnicodeData.txt \ - $(srcdir)/enc/unicode/data/CompositionExclusions.txt \ - $(srcdir)/enc/unicode/data/NormalizationTest.txt +UNICODE_FILES = $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/UnicodeData.txt \ + $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/CompositionExclusions.txt \ + $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/NormalizationTest.txt update-unicode: $(UNICODE_FILES) PHONY -$(UNICODE_FILES): ./.update-unicode.time +$(UNICODE_FILES): ./.unicode-$(UNICODE_VERSION).time UPDATE_UNICODE_FILES_DEPS = $(ALWAYS_UPDATE_UNICODE:yes=PHONY) -./.update-unicode.time: $(UPDATE_UNICODE_FILES_DEPS:no=) - $(ECHO) Downloading Unicode data files... - $(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data" - $(Q) $(BASERUBY) -C "$(srcdir)/enc/unicode/data" \ - ../../../tool/downloader.rb -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode \ - UnicodeData.txt CompositionExclusions.txt NormalizationTest.txt +./.unicode-tables.time: ./.unicode-$(UNICODE_VERSION).time +./.unicode-$(UNICODE_VERSION).time: $(UPDATE_UNICODE_FILES_DEPS:no=) + $(ECHO) Downloading Unicode $(UNICODE_VERSION) data files... + $(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)" + $(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \ + -d enc/unicode/data/$(UNICODE_VERSION) \ + -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode \ + $(UNICODE_VERSION)/ucd/UnicodeData.txt \ + $(UNICODE_VERSION)/ucd/CompositionExclusions.txt \ + $(UNICODE_VERSION)/ucd/NormalizationTest.txt @exit > .update-unicode.time $(srcdir)/lib/unicode_normalize/tables.rb: ./.unicode-tables.time @@ -1127,7 +1133,8 @@ $(srcdir)/lib/unicode_normalize/tables.rb: ./.unicode-tables.time $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb \ -c -t$@ -o $(srcdir)/lib/unicode_normalize/tables.rb \ -I $(srcdir) \ - $(srcdir)/template/unicode_norm_gen.tmpl enc/unicode/data lib/unicode_normalize + $(srcdir)/template/unicode_norm_gen.tmpl \ + enc/unicode/data/$(UNICODE_VERSION) lib/unicode_normalize info: info-program info-libruby_a info-libruby_so info-arch info-program: PHONY |