nobu	2014-10-31 12:54:45 +0900 (Fri, 31 Oct 2014)

  New Revision: 48205

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

  Log:
    common.mk: fix Unicode table dependency
    
    * common.mk (.unicode-tables.time): needs Unicode files always,
      and should update after downloading these files.
      [ruby-core:66026] [Bug #10461]

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 48204)
+++ ChangeLog	(revision 48205)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Oct 31 12:54:43 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk (.unicode-tables.time): needs Unicode files always,
+	  and should update after downloading these files.
+	  [ruby-core:66026] [Bug #10461]
+
 Fri Oct 31 10:16:42 2014  SHIBATA Hiroshi  <shibata.hiroshi@g...>
 
 	* .travis.yml: reverted r48199, it's unlated configuration.
Index: common.mk
===================================================================
--- common.mk	(revision 48204)
+++ common.mk	(revision 48205)
@@ -1112,12 +1112,13 @@ UNICODE_FILES = $(srcdir)/enc/unicode/da https://github.com/ruby/ruby/blob/trunk/common.mk#L1112
 		$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/NormalizationTest.txt
 
 update-unicode: $(UNICODE_FILES) PHONY
-$(UNICODE_FILES): ./.unicode-$(UNICODE_VERSION).time
 
-UPDATE_UNICODE_FILES_DEPS = $(ALWAYS_UPDATE_UNICODE:yes=PHONY)
+UNICODE_FILES_DEPS0 = $(UPDATE_LIBRARIES:yes=download-unicode-data)
+UNICODE_FILES_DEPS = $(UNICODE_FILES_DEPS0:no=)
+$(UNICODE_FILES): $(UNICODE_FILES_DEPS)
 
-$(UPDATE_LIBRARIES:yes=.)/.unicode-tables.time: $(UNICODE_FILES)
-./.unicode-$(UNICODE_VERSION).time: $(UPDATE_UNICODE_FILES_DEPS:no=)
+download-unicode-data: ./.unicode-$(UNICODE_VERSION).time
+./.unicode-$(UNICODE_VERSION).time: PHONY
 	$(ECHO) Downloading Unicode $(UNICODE_VERSION) data files...
 	$(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)"
 	$(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \
@@ -1126,11 +1127,12 @@ $(UPDATE_LIBRARIES:yes=.)/.unicode-table https://github.com/ruby/ruby/blob/trunk/common.mk#L1127
 	    $(UNICODE_VERSION)/ucd/UnicodeData.txt \
 	    $(UNICODE_VERSION)/ucd/CompositionExclusions.txt \
 	    $(UNICODE_VERSION)/ucd/NormalizationTest.txt
-	@exit > .update-unicode.time
+	@exit > $@
 
 $(srcdir)/lib/unicode_normalize/tables.rb: ./.unicode-tables.time
 
 ./.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \
+		$(UNICODE_FILES) $(UNICODE_FILES_DEPS) \
 		$(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/