diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-14 04:42:50 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-14 04:42:50 +0000 |
| commit | 8469a919b4524dd431e5b4932e4a4df2133349fb (patch) | |
| tree | 6b5d8a0c444a60db4e031211aeb6c15d0d527d70 | |
| parent | af807703a915a28af37cf423aa058d73322ef301 (diff) | |
| download | ruby-8469a919b4524dd431e5b4932e4a4df2133349fb.tar.gz | |
common.mk: rule for name2ctype.kwd
* common.mk (enc/unicode/name2ctype.kwd): rule to create from
Unicode data files, used only when the target does not exist.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55676 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | common.mk | 31 |
3 files changed, 34 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Thu Jul 14 13:42:48 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * common.mk (enc/unicode/name2ctype.kwd): rule to create from + Unicode data files, used only when the target does not exist. + Thu Jul 14 13:10:54 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/json/lib/json/ext: remove stale directory. bundled diff --git a/Makefile.in b/Makefile.in index 3550433690..38c5ba316f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -344,6 +344,9 @@ lex.c: defs/keywords NAME2CTYPE_OPTIONS = -7 -c -j1 -i1 -t -C -P -T -H uniname2ctype_hash -Q uniname2ctype_pool -N uniname2ctype_p +$(srcdir)/enc/unicode/$(NAME2CTYPE_KWD)name2ctype.kwd: + [ -f $@ ] || $(MAKE) NAME2CTYPE_KWD=$(@F) $@ + enc/unicode/name2ctype.h: enc/unicode/name2ctype.kwd $(MAKEDIRS) $(@D) @set +e; \ @@ -1043,16 +1043,33 @@ UNICODE_FILES = $(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \ $(UNICODE_SRC_DATA_DIR)/SpecialCasing.txt \ $(empty) +UNICODE_PROPERTY_FILES = \ + $(UNICODE_SRC_DATA_DIR)/Blocks.txt \ + $(UNICODE_SRC_DATA_DIR)/DerivedAge.txt \ + $(UNICODE_SRC_DATA_DIR)/DerivedCoreProperties.txt \ + $(UNICODE_SRC_DATA_DIR)/PropList.txt \ + $(UNICODE_SRC_DATA_DIR)/PropertyAliases.txt \ + $(UNICODE_SRC_DATA_DIR)/PropertyValueAliases.txt \ + $(UNICODE_SRC_DATA_DIR)/Scripts.txt \ + $(empty) + update-unicode: $(UNICODE_FILES) +UNICODE_DOWNLOAD = \ + $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \ + -d $(UNICODE_DATA_DIR) \ + -p $(UNICODE_VERSION)/ucd \ + -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode + +$(UNICODE_PROPERTY_FILES): + $(ECHO) Downloading Unicode $(UNICODE_VERSION) property files... + $(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)" + $(Q) $(UNICODE_DOWNLOAD) $(UNICODE_PROPERTY_FILES) + $(UNICODE_FILES): $(ECHO) Downloading Unicode $(UNICODE_VERSION) data files... $(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)" - $(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \ - -d $(UNICODE_DATA_DIR) \ - -p $(UNICODE_VERSION)/ucd \ - -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode \ - $(UNICODE_FILES) + $(Q) $(UNICODE_DOWNLOAD) $(UNICODE_FILES) $(srcdir)/$(HAVE_BASERUBY:yes=lib/unicode_normalize/tables.rb): \ $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time @@ -1068,6 +1085,10 @@ $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \ $(srcdir)/template/unicode_norm_gen.tmpl \ $(UNICODE_DATA_DIR) lib/unicode_normalize +$(srcdir)/enc/unicode/$(NAME2CTYPE_KWD): $(UNICODE_SRC_DATA_DIR)/UnicodeData.txt $(UNICODE_PROPERTY_FILES) + $(MAKEDIRS) $(@D) + $(BOOTSTRAPRUBY) $(srcdir)/tool/enc-unicode.rb $(UNICODE_SRC_DATA_DIR) > $@ + # the next non-comment line was: # $(srcdir)/enc/unicode/casefold.h: $(srcdir)/enc/unicode/case-folding.rb \ # but was changed to make sure CI works on systems that don't have gperf |