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

ruby-changes:36036

From: nobu <ko1@a...>
Date: Thu, 23 Oct 2014 23:58:45 +0900 (JST)
Subject: [ruby-changes:36036] nobu:r48117 (trunk): common.mk: timestamp for update-unicode

nobu	2014-10-23 23:58:29 +0900 (Thu, 23 Oct 2014)

  New Revision: 48117

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

  Log:
    common.mk: timestamp for update-unicode
    
    * common.mk (.update-unicode.time): timestamp not to download same
      files twice at one build.  [Bug #10415]

  Modified files:
    trunk/common.mk
Index: common.mk
===================================================================
--- common.mk	(revision 48116)
+++ common.mk	(revision 48117)
@@ -182,7 +182,8 @@ $(EXTS_MK): $(MKFILES) all-incs $(PREP) https://github.com/ruby/ruby/blob/trunk/common.mk#L182
 configure-ext: $(EXTS_MK)
 
 build-ext: $(EXTS_MK)
-	$(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) ENCOBJS="$(ENCOBJS)" $(EXTSTATIC)
+	$(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \
+	    ENCOBJS="$(ENCOBJS)" ALWAYS_UPDATE_UNICODE=no $(EXTSTATIC)
 
 prog: program wprogram
 
@@ -1106,14 +1107,18 @@ UNICODE_FILES = $(srcdir)/enc/unicode/da https://github.com/ruby/ruby/blob/trunk/common.mk#L1107
 		$(srcdir)/enc/unicode/data/CompositionExclusions.txt \
 		$(srcdir)/enc/unicode/data/NormalizationTest.txt
 
-$(UNICODE_FILES): update-unicode
+update-unicode: $(UNICODE_FILES) PHONY
+$(UNICODE_FILES): ./.update-unicode.time
 
-update-unicode: PHONY
+UPDATE_UNICODE_FILES_DEPS = $(ALWAYS_UPDATE_UNICODE:yes=PHONY)
+
+./.update-unicode.time: $(UPDATE_UNICODE_FILES_DEPS:no=)
 	$(ECHO) Downloading Unicode data files...
 	$(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data"
 	$(Q) $(BASERUBY) -C "$(srcdir)/enc/unicode/data" \
 	    ../../../tool/downloader.rb -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode \
 	    UnicodeData.txt CompositionExclusions.txt NormalizationTest.txt
+	@exit > .update-unicode.time
 
 $(srcdir)/lib/unicode_normalize/tables.rb: \
 		$(srcdir)/tool/unicode_norm_gen.rb $(UNICODE_FILES)

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

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