[前][次][番号順一覧][スレッド一覧]

ruby-changes:45997

From: nobu <ko1@a...>
Date: Fri, 24 Mar 2017 00:47:35 +0900 (JST)
Subject: [ruby-changes:45997] nobu:r58067 (trunk): common.mk: updating name2ctype.h

nobu	2017-03-24 00:47:26 +0900 (Fri, 24 Mar 2017)

  New Revision: 58067

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

  Log:
    common.mk: updating name2ctype.h
    
    * common.mk (name2ctype.h): update if ALWAYS_UPDATE_UNICODE = yes,
      as well as casefold.h.

  Modified files:
    trunk/common.mk
Index: common.mk
===================================================================
--- common.mk	(revision 58066)
+++ common.mk	(revision 58067)
@@ -1162,14 +1162,12 @@ $(UNICODE_SRC_DATA_DIR)/.unicode-tables. https://github.com/ruby/ruby/blob/trunk/common.mk#L1162
 		$(srcdir)/template/unicode_norm_gen.tmpl \
 		$(UNICODE_DATA_DIR) lib/unicode_normalize
 
-# UPDATE_NAME2CTYPE=    : toplevel
-# UPDATE_NAME2CTYPE=yes : sub-make to update name2ctype.h
-$(UNICODE_HDR_DIR)/$(UPDATE_NAME2CTYPE:yes=.ignore.)name2ctype.h:
-	$(Q) $(MAKE) $(mflags) Q=$(Q) UPDATE_NAME2CTYPE=yes UNICODE_VERSION=$(UNICODE_VERSION) $@
-
-$(UNICODE_HDR_DIR)/$(UPDATE_NAME2CTYPE:yes=name2ctype.h): \
+$(UNICODE_HDR_DIR)/$(ALWAYS_UPDATE_UNICODE:yes=name2ctype.h): \
 		$(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \
 		$(UNICODE_PROPERTY_FILES)
+
+$(UNICODE_HDR_DIR)/name2ctype.h: $(srcdir)/tool/enc-unicode.rb \
+		$(ALWAYS_UPDATE_UNICODE:yes=update-unicode)
 	$(MAKEDIRS) $(@D)
 	$(BOOTSTRAPRUBY) $(srcdir)/tool/enc-unicode.rb --header $(UNICODE_SRC_DATA_DIR) > $@
 
@@ -1183,8 +1181,8 @@ $(UNICODE_HDR_DIR)/$(ALWAYS_UPDATE_UNICO https://github.com/ruby/ruby/blob/trunk/common.mk#L1181
 		$(UNICODE_SRC_DATA_DIR)/SpecialCasing.txt \
 		$(UNICODE_SRC_DATA_DIR)/CaseFolding.txt
 
-$(UNICODE_HDR_DIR)/casefold.h: $(srcdir)/enc/unicode/case-folding.rb
-	$(Q) $(ALWAYS_UPDATE_UNICODE:yes=exit &&) $(MAKE) $(mflags) Q=$(Q) UNICODE_VERSION=$(UNICODE_VERSION) update-unicode
+$(UNICODE_HDR_DIR)/casefold.h: $(srcdir)/enc/unicode/case-folding.rb \
+		$(ALWAYS_UPDATE_UNICODE:yes=update-unicode)
 	$(MAKEDIRS) $(@D)
 	$(Q) $(BASERUBY) $(srcdir)/enc/unicode/case-folding.rb \
 		--output-file=$@ \

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

[前][次][番号順一覧][スレッド一覧]