diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-23 12:42:48 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-23 12:42:48 +0000 |
| commit | 2e799193dcd8c0fb1807f2fcd17642540dfb72d4 (patch) | |
| tree | 60f68f5ff08b91bd2fd46c643e1a01508af8e441 | |
| parent | bbd2fe45746334d807c96b229566aa44d2c98998 (diff) | |
| download | ruby-2e799193dcd8c0fb1807f2fcd17642540dfb72d4.tar.gz | |
Revert r55486,r55488,r55489
They breaks build:
http://rubyci.s3.amazonaws.com/debian/ruby-trunk/log/20160623T123002Z.fail.html.gz
Revert "Unicode files for casefold.h"
Revert "casefold.h dependency"
Revert "Get rid of downloading Unicode data"
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55491 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | common.mk | 14 |
2 files changed, 3 insertions, 25 deletions
@@ -1,17 +1,3 @@ -Thu Jun 23 14:27:33 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * common.mk (enc/unicode/casefold.h): update Unicode files in a - sub-make, not to let the header depend on the files always. - -Wed Jun 22 22:02:26 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * common.mk (enc/unicode/casefold.h): add dependency and update by - incs. - - * 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] - Tue Jun 21 19:44:54 2016 Martin Duerst <duerst@it.aoyama.ac.jp> * test/ruby/enc/test_regex_casefold.rb: Add Windows-1251, KOI8-R, and @@ -807,7 +807,6 @@ 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) @@ -1052,11 +1051,9 @@ $(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) \ @@ -1066,17 +1063,12 @@ $(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/casefold.h - -$(srcdir)/$(ALWAYS_UPDATE_UNICODE:yes=enc/unicode/casefold.h): \ +unicode-up: $(srcdir)/enc/unicode/case-folding.rb \ $(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=$@ \ + --output-file=$(srcdir)/enc/unicode/casefold.h \ --mapping-data-directory=$(UNICODE_SRC_DATA_DIR) download-extlibs: |