nobu	2019-04-04 21:11:53 +0900 (Thu, 04 Apr 2019)

  New Revision: 67438

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

  Log:
    gmake.mk: get rid of unicode normalization table timestamp
    
    * common.mk, defs/gmake.mk: rid of unicode normalization tables
      timestamp.  update the target tables file only when only it
      exists.

  Modified files:
    trunk/common.mk
    trunk/defs/gmake.mk
Index: common.mk
===================================================================
--- common.mk	(revision 67437)
+++ common.mk	(revision 67438)
@@ -1371,12 +1371,14 @@ touch-unicode-files: https://github.com/ruby/ruby/blob/trunk/common.mk#L1371
 	$(MAKEDIRS) $(UNICODE_SRC_DATA_DIR)
 	touch $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time $(UNICODE_DATA_HEADERS)
 
+UNICODE_TABLES_TIMESTAMP = yes
 $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \
 		$(srcdir)/template/unicode_norm_gen.tmpl \
 		$(ALWAYS_UPDATE_UNICODE:yes=update-unicode)
 	$(Q) $(MAKE) $(@D)
 	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb \
-		-c -t$@ -o $(srcdir)/lib/unicode_normalize/tables.rb \
+		-c $(UNICODE_TABLES_TIMESTAMP:yes=-t$@) \
+                -o $(srcdir)/lib/unicode_normalize/tables.rb \
 		-I $(srcdir) \
 		$(srcdir)/template/unicode_norm_gen.tmpl \
 		$(UNICODE_DATA_DIR) lib/unicode_normalize
Index: defs/gmake.mk
===================================================================
--- defs/gmake.mk	(revision 67437)
+++ defs/gmake.mk	(revision 67438)
@@ -185,8 +185,13 @@ $(MJIT_MIN_HEADER): $(mjit_min_headers) https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L185
 
 endif
 
-ifneq ($(wildcard $(UNICODE_FILES) $(UNICODE_PROPERTY_FILES)),)
+ifeq ($(if $(wildcard $(UNICODE_FILES) $(UNICODE_PROPERTY_FILES)),,\
+	   $(wildcard $(srcdir)/lib/unicode_normalize/tables.rb)),)
+# Needs the dependency when any Unicode data file exists, or
+# normalization tables script doesn't.  Otherwise, when the target
+# only exists, use it as-is.
 .PHONY: $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time
+UNICODE_TABLES_TIMESTAMP =
 $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time: \
 	$(UNICODE_FILES) $(UNICODE_PROPERTY_FILES)
 endif

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