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

ruby-changes:43623

From: nobu <ko1@a...>
Date: Sat, 16 Jul 2016 06:26:34 +0900 (JST)
Subject: [ruby-changes:43623] nobu:r55696 (trunk): common.mk: directory timestamps

nobu	2016-07-16 06:26:02 +0900 (Sat, 16 Jul 2016)

  New Revision: 55696

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

  Log:
    common.mk: directory timestamps
    
    * common.mk, enc/Makefile.in: moved timestamp files for
      directories under the specific directory, to get rid of match
      with files under the source directory.

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
    trunk/enc/Makefile.in
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 55695)
+++ ChangeLog	(revision 55696)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Jul 16 06:26:00 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk, enc/Makefile.in: moved timestamp files for
+	  directories under the specific directory, to get rid of match
+	  with files under the source directory.
+
 Fri Jul 15 22:05:13 2016  Naohisa Goto  <ngotogenome@g...>
 
 	* string.c (str_buf_cat): Fix potential interger overflow of capa.
Index: common.mk
===================================================================
--- common.mk	(revision 55695)
+++ common.mk	(revision 55696)
@@ -35,11 +35,12 @@ DOCLIE_GIT_REF = v1.1.5 https://github.com/ruby/ruby/blob/trunk/common.mk#L35
 
 STATIC_RUBY   = static-ruby
 
+TIMESTAMPDIR  = $(EXTOUT)/.timestamp
 EXTCONF       = extconf.rb
 LIBRUBY_EXTS  = ./.libruby-with-ext.time
 REVISION_H    = ./.revision.time
-PLATFORM_D    = ./$(PLATFORM_DIR)/.time
-ENC_TRANS_D   = ./enc/trans/.time
+PLATFORM_D    = $(TIMESTAMPDIR)/.$(PLATFORM_DIR).time
+ENC_TRANS_D   = $(TIMESTAMPDIR)/.enc-trans.time
 RDOCOUT       = $(EXTOUT)/rdoc
 HTMLOUT       = $(EXTOUT)/html
 CAPIOUT       = doc/capi
@@ -693,13 +694,13 @@ PHONY: https://github.com/ruby/ruby/blob/trunk/common.mk#L694
 	$(Q)$(RM) y.tab.c y.tab.h
 
 $(PLATFORM_D):
-	$(Q) $(MAKEDIRS) $(PLATFORM_DIR)
+	$(Q) $(MAKEDIRS) $(PLATFORM_DIR) $(@D)
 	@exit > $@
 
 $(BUILTIN_ENCOBJS) $(BUILTIN_TRANSOBJS): $(ENC_TRANS_D)
 
 $(ENC_TRANS_D):
-	$(Q) $(MAKEDIRS) enc/trans
+	$(Q) $(MAKEDIRS) enc/trans $(@D)
 	@exit > $@
 
 ###
Index: enc/Makefile.in
===================================================================
--- enc/Makefile.in	(revision 55695)
+++ enc/Makefile.in	(revision 55696)
@@ -20,8 +20,9 @@ TRANSSODIR = $(ENCSODIR)/trans https://github.com/ruby/ruby/blob/trunk/enc/Makefile.in#L20
 DLEXT = @DLEXT@
 OBJEXT = @OBJEXT@
 LIBEXT = @LIBEXT@
-ENC_TRANS_D   = ./enc/trans/.time
-ENC_TRANS_SO_D = ./enc/trans/.so.time
+TIMESTAMPDIR  = $(EXTOUT)/.timestamp
+ENC_TRANS_D   = $(TIMESTAMPDIR)/.enc-trans.time
+ENC_TRANS_SO_D = $(TIMESTAMPDIR)/.enc-trans.so.time
 
 BUILTIN_ENCS	= enc/ascii.c enc/us_ascii.c\
 		  enc/unicode.c enc/utf_8.c

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

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