nobu	2016-07-14 13:42:50 +0900 (Thu, 14 Jul 2016)

  New Revision: 55676

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

  Log:
    common.mk: rule for name2ctype.kwd
    
    * common.mk (enc/unicode/name2ctype.kwd): rule to create from
      Unicode data files, used only when the target does not exist.

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/common.mk
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 55675)
+++ ChangeLog	(revision 55676)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Jul 14 13:42:48 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk (enc/unicode/name2ctype.kwd): rule to create from
+	  Unicode data files, used only when the target does not exist.
+
 Thu Jul 14 13:10:54 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/json/lib/json/ext: remove stale directory.  bundled
Index: common.mk
===================================================================
--- common.mk	(revision 55675)
+++ common.mk	(revision 55676)
@@ -1043,16 +1043,33 @@ UNICODE_FILES = $(UNICODE_SRC_DATA_DIR)/ https://github.com/ruby/ruby/blob/trunk/common.mk#L1043
 		$(UNICODE_SRC_DATA_DIR)/SpecialCasing.txt \
 		$(empty)
 
+UNICODE_PROPERTY_FILES =  \
+		$(UNICODE_SRC_DATA_DIR)/Blocks.txt \
+		$(UNICODE_SRC_DATA_DIR)/DerivedAge.txt \
+		$(UNICODE_SRC_DATA_DIR)/DerivedCoreProperties.txt \
+		$(UNICODE_SRC_DATA_DIR)/PropList.txt \
+		$(UNICODE_SRC_DATA_DIR)/PropertyAliases.txt \
+		$(UNICODE_SRC_DATA_DIR)/PropertyValueAliases.txt \
+		$(UNICODE_SRC_DATA_DIR)/Scripts.txt \
+		$(empty)
+
 update-unicode: $(UNICODE_FILES)
 
+UNICODE_DOWNLOAD = \
+	$(BASERUBY) -C "$(srcdir)" tool/downloader.rb \
+	    -d $(UNICODE_DATA_DIR) \
+	    -p $(UNICODE_VERSION)/ucd \
+	    -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode
+
+$(UNICODE_PROPERTY_FILES):
+	$(ECHO) Downloading Unicode $(UNICODE_VERSION) property files...
+	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)"
+	$(Q) $(UNICODE_DOWNLOAD) $(UNICODE_PROPERTY_FILES)
+
 $(UNICODE_FILES):
 	$(ECHO) Downloading Unicode $(UNICODE_VERSION) data files...
 	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)"
-	$(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \
-	    -d $(UNICODE_DATA_DIR) \
-	    -p $(UNICODE_VERSION)/ucd \
-	    -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode \
-	    $(UNICODE_FILES)
+	$(Q) $(UNICODE_DOWNLOAD) $(UNICODE_FILES)
 
 $(srcdir)/$(HAVE_BASERUBY:yes=lib/unicode_normalize/tables.rb): \
 	$(UNICODE_SRC_DATA_DIR)/.unicode-tables.time
@@ -1068,6 +1085,10 @@ $(UNICODE_SRC_DATA_DIR)/.unicode-tables. https://github.com/ruby/ruby/blob/trunk/common.mk#L1085
 		$(srcdir)/template/unicode_norm_gen.tmpl \
 		$(UNICODE_DATA_DIR) lib/unicode_normalize
 
+$(srcdir)/enc/unicode/$(NAME2CTYPE_KWD): $(UNICODE_SRC_DATA_DIR)/UnicodeData.txt $(UNICODE_PROPERTY_FILES)
+	$(MAKEDIRS) $(@D)
+	$(BOOTSTRAPRUBY) $(srcdir)/tool/enc-unicode.rb $(UNICODE_SRC_DATA_DIR) > $@
+
 # 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
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 55675)
+++ Makefile.in	(revision 55676)
@@ -344,6 +344,9 @@ lex.c: defs/keywords https://github.com/ruby/ruby/blob/trunk/Makefile.in#L344
 
 NAME2CTYPE_OPTIONS = -7 -c -j1 -i1 -t -C -P -T -H uniname2ctype_hash -Q uniname2ctype_pool -N uniname2ctype_p
 
+$(srcdir)/enc/unicode/$(NAME2CTYPE_KWD)name2ctype.kwd:
+	[ -f $@ ] || $(MAKE) NAME2CTYPE_KWD=$(@F) $@
+
 enc/unicode/name2ctype.h: enc/unicode/name2ctype.kwd
 	$(MAKEDIRS) $(@D)
 	@set +e; \

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