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

ruby-changes:53476

From: k0kubun <ko1@a...>
Date: Tue, 13 Nov 2018 11:06:55 +0900 (JST)
Subject: [ruby-changes:53476] k0kubun:r65692 (trunk): common.mk: force updating revision.h on each commit

k0kubun	2018-11-13 11:06:51 +0900 (Tue, 13 Nov 2018)

  New Revision: 65692

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

  Log:
    common.mk: force updating revision.h on each commit
    
    by making .revision.time PHONY. Prior to this commit, RUBY_DESCRIPTION
    has been updated only when version.h (or tool/file2lastrev.rb) is updated.
    
    .revision.time (REVISION_H) target internally has IFCHANGE to update
    revision.h. So it doesn't touch revision.h when it's not updated,
    and thus it's safe to run every time.
    
    defs/gmake.mk: drop obsoleted reference to REVISION_FORCE

  Modified files:
    trunk/common.mk
    trunk/defs/gmake.mk
Index: defs/gmake.mk
===================================================================
--- defs/gmake.mk	(revision 65691)
+++ defs/gmake.mk	(revision 65692)
@@ -150,7 +150,7 @@ commit: $(if $(filter commit,$(MAKECMDGO https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L150
 	} | \
 	$(MAKE) $(mflags) Q=$(Q) srcdir="$(srcdir)" srcs_vpath="$(srcdir)/" CHDIR="$(CHDIR)" \
 		BOOTSTRAPRUBY="$(BOOTSTRAPRUBY)" MINIRUBY="$(BASERUBY)" BASERUBY="$(BASERUBY)" \
-		VCSUP="" ENC_MK=.top-enc.mk REVISION_FORCE=PHONY CONFIGURE="$(CONFIGURE)" -f - \
+		VCSUP="" ENC_MK=.top-enc.mk CONFIGURE="$(CONFIGURE)" -f - \
 		update-src srcs all-incs
 
 ifeq ($(words $(filter update-gems extract-gems,$(MAKECMDGOALS))),2)
Index: common.mk
===================================================================
--- common.mk	(revision 65691)
+++ common.mk	(revision 65692)
@@ -1052,7 +1052,7 @@ preludes: {$(srcdir)}golf_prelude.c https://github.com/ruby/ruby/blob/trunk/common.mk#L1052
 $(srcdir)/revision.h:
 	@exit > $@
 
-$(REVISION_H): $(srcdir)/version.h $(srcdir)/tool/file2lastrev.rb $(REVISION_FORCE)
+$(REVISION_H): $(srcdir)/version.h $(srcdir)/tool/file2lastrev.rb PHONY
 	-$(Q) $(BASERUBY) $(srcdir)/tool/file2lastrev.rb -q --revision.h "$(srcdir)" > revision.tmp
 	$(Q)$(IFCHANGE) "--timestamp=$@" "$(srcdir)/revision.h" revision.tmp
 
@@ -1168,7 +1168,7 @@ dist: https://github.com/ruby/ruby/blob/trunk/common.mk#L1168
 up:: update-remote
 
 up::
-	-$(Q)$(MAKE) $(mflags) Q=$(Q) REVISION_FORCE=PHONY "$(REVISION_H)"
+	-$(Q)$(MAKE) $(mflags) Q=$(Q) "$(REVISION_H)"
 
 up::
 	-$(Q)$(MAKE) $(mflags) Q=$(Q) after-update

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

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