diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-24 00:17:17 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-24 00:17:17 +0000 |
| commit | 7bfccd68b30b161701c3c9665fdf6d18c2c219f3 (patch) | |
| tree | 2bb4b62f1d0c08ab4f27bf54141d185bb76525bd /common.mk | |
| parent | 2e799193dcd8c0fb1807f2fcd17642540dfb72d4 (diff) | |
| download | ruby-7bfccd68b30b161701c3c9665fdf6d18c2c219f3.tar.gz | |
Updating casefold.h
* common.mk (lib/unicode_normalize/tables.rb): should not depend
on Unicode data files unless ALWAYS_UPDATE_UNICODE=yes, to get
rid of downloading Unicode data unnecessary. [ruby-dev:49681]
* common.mk (enc/unicode/casefold.h): update Unicode files in a
sub-make, not to let the header depend on the files always.
* enc/unicode/case-folding.rb: if gperf is not usable, assume the
existing file is OK.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55492 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 14 |
1 files changed, 11 insertions, 3 deletions
@@ -807,6 +807,7 @@ all-incs: incs {$(VPATH)}encdb.h {$(VPATH)}transdb.h incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}known_errors.inc \ {$(VPATH)}vm_call_iseq_optimized.inc $(srcdir)/revision.h \ $(REVISION_H) enc/unicode/name2ctype.h enc/jis/props.h \ + $(srcdir)/enc/unicode/casefold.h \ {$(VPATH)}id.h {$(VPATH)}probes.dmyh insns: $(INSNS) @@ -1051,9 +1052,11 @@ $(UNICODE_FILES): $(srcdir)/$(HAVE_BASERUBY:yes=lib/unicode_normalize/tables.rb): \ $(srcdir)/.unicode-tables.time +$(srcdir)/$(ALWAYS_UPDATE_UNICODE:yes=.unicode-tables.time): $(UNICODE_FILES) + $(srcdir)/.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \ - $(UNICODE_FILES) \ $(srcdir)/template/unicode_norm_gen.tmpl + $(Q) $(ALWAYS_UPDATE_UNICODE:yes=exit &&) $(MAKE) $(MFLAGS) Q=$(Q) update-unicode $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb \ -c -t$@ -o $(srcdir)/lib/unicode_normalize/tables.rb \ -I $(srcdir) \ @@ -1063,12 +1066,17 @@ $(srcdir)/.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \ # 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 -unicode-up: $(srcdir)/enc/unicode/case-folding.rb \ +unicode-up: $(srcdir)/enc/unicode/casefold.h + +$(srcdir)/$(ALWAYS_UPDATE_UNICODE:yes=enc/unicode/casefold.h): \ $(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \ $(UNICODE_SRC_DATA_DIR)/SpecialCasing.txt \ $(UNICODE_SRC_DATA_DIR)/CaseFolding.txt + +$(srcdir)/enc/unicode/casefold.h: $(srcdir)/enc/unicode/case-folding.rb + $(Q) $(ALWAYS_UPDATE_UNICODE:yes=exit &&) $(MAKE) $(MFLAGS) Q=$(Q) update-unicode $(Q) $(BASERUBY) $(srcdir)/enc/unicode/case-folding.rb \ - --output-file=$(srcdir)/enc/unicode/casefold.h \ + --output-file=$@ \ --mapping-data-directory=$(UNICODE_SRC_DATA_DIR) download-extlibs: |