naruse	2016-06-23 21:42:48 +0900 (Thu, 23 Jun 2016)

  New Revision: 55491

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55491

  Log:
    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"

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
Index: common.mk
===================================================================
--- common.mk	(revision 55490)
+++ common.mk	(revision 55491)
@@ -807,7 +807,6 @@ all-incs: incs {$(VPATH)}encdb.h {$(VPAT https://github.com/ruby/ruby/blob/trunk/common.mk#L807
 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): https://github.com/ruby/ruby/blob/trunk/common.mk#L1051
 $(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 https://github.com/ruby/ruby/blob/trunk/common.mk#L1063
 # 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:
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 55490)
+++ ChangeLog	(revision 55491)
@@ -1,17 +1,3 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
-Thu Jun 23 14:27:33 2016  Nobuyoshi Nakada  <nobu@r...>
-
-	* 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@r...>
-
-	* 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@i...>
 
 	* test/ruby/enc/test_regex_casefold.rb: Add Windows-1251, KOI8-R, and

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/