From ceab9f363c59d49034317b52c3d3740d0c6e9c0c Mon Sep 17 00:00:00 2001 From: k0kubun Date: Tue, 13 Nov 2018 02:06:51 +0000 Subject: [PATCH] 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 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65692 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- common.mk | 4 ++-- defs/gmake.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common.mk b/common.mk index 28979bcc48..a0c9042997 100644 --- a/common.mk +++ b/common.mk @@ -1052,7 +1052,7 @@ preludes: {$(srcdir)}golf_prelude.c $(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: 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 diff --git a/defs/gmake.mk b/defs/gmake.mk index eb8b560bd8..9807a26063 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -150,7 +150,7 @@ commit: $(if $(filter commit,$(MAKECMDGOALS)),$(filter-out commit,$(MAKECMDGOALS } | \ $(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)