duerst	2016-01-24 18:13:30 +0900 (Sun, 24 Jan 2016)

  New Revision: 53643

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

  Log:
    * common.mk: Simplifying Unicode data file download logic to make
      it more reliable (including additional fix not in r53633) [Bug #12007]

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 53642)
+++ ChangeLog	(revision 53643)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Jan 24 18:12:36 2016  Martin Duerst  <duerst@i...>
+
+	* common.mk: Simplifying Unicode data file download logic to make
+	  it more reliable (including additional fix not in r53633) [Bug #12007]
+
 Sun Jan 24 16:54:11 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/io/wait/wait.c (io_wait_readwrite): [EXPERIMENTAL] allow to
Index: common.mk
===================================================================
--- common.mk	(revision 53642)
+++ common.mk	(revision 53643)
@@ -1005,7 +1005,7 @@ extract-gems: PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L1005
 	    bundled_gems
 
 ### set the following environment variable or uncomment the line if
-### the Unicode data files are updated every minute.
+### the Unicode data files should be updated completely on every update ('make up',...).
 # ALWAYS_UPDATE_UNICODE = yes
 
 UNICODE_FILES = $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/UnicodeData.txt \
@@ -1013,11 +1013,9 @@ UNICODE_FILES = $(srcdir)/enc/unicode/da https://github.com/ruby/ruby/blob/trunk/common.mk#L1013
 		$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/NormalizationTest.txt \
 		$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/CaseFolding.txt
 
-UNICODE_FILES_DEPS = $(srcdir)/.unicode-$(UNICODE_VERSION).time
+update-unicode: $(UNICODE_FILES)
 
-update-unicode: $(srcdir)/.unicode-$(UNICODE_VERSION).time PHONY
-
-$(UNICODE_FILES_DEPS):
+$(UNICODE_FILES):
 	$(ECHO) Downloading Unicode $(UNICODE_VERSION) data files...
 	$(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)"
 	$(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \
@@ -1025,13 +1023,12 @@ $(UNICODE_FILES_DEPS): https://github.com/ruby/ruby/blob/trunk/common.mk#L1023
 	    -p $(UNICODE_VERSION)/ucd \
 	    -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode \
 	    $(UNICODE_FILES)
-	@exit > $@
 
 $(srcdir)/$(HAVE_BASERUBY:yes=lib/unicode_normalize/tables.rb): \
 	$(srcdir)/.unicode-tables.time
 
 $(srcdir)/.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \
-		$(UNICODE_FILES_DEPS) \
+		$(UNICODE_FILES) \
 		$(srcdir)/template/unicode_norm_gen.tmpl
 	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb \
 		-c -t$@ -o $(srcdir)/lib/unicode_normalize/tables.rb \

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