From b29c71adf8448c390ba48a109e474f25388c9244 Mon Sep 17 00:00:00 2001 From: stooke Date: Fri, 26 Apr 2019 17:11:43 +0100 Subject: [PATCH] 8222975: Fix 'release' file to reflect actual repo checkin used to compile JDK Summary: Use 'hg id -i' instead of 'hg tip' for obtaining the source revision Reviewed-by: andrew --- make/common/MakeBase.gmk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk index 44bcca1..9e5e704 100644 --- a/make/common/MakeBase.gmk +++ b/make/common/MakeBase.gmk @@ -293,8 +293,8 @@ define ListPathsSafelyNow endef -# The source tips can come from the Mercurial repository, or in the files -# $(HGTIP_FILENAME) which contains the tip but is also positioned in the same +# The source ids can come from the Mercurial repository, or in the files +# $(HGTIP_FILENAME) which contains the id but is also positioned in the same # directory as the original $(HGDIR) directory. # These should not be := assignments, only used from the root Makefile. HG_VERSION = $(shell $(HG) version 2> /dev/null) @@ -306,7 +306,7 @@ REPO_LIST = $(patsubst ./%,%,$(patsubst %/,%,$(sort $(dir \ $(LS) $(HG_SEARCH:%/REPO=%/$(HGTIP_FILENAME)) ) \ 2> /dev/null))))) -# Emit the repo:tip pairs to $@ +# Emit the repo:id pairs to $@ define GetSourceTips $(CD) $(SRC_ROOT) ; \ for i in $(REPO_LIST) IGNORE ; do \ @@ -314,7 +314,7 @@ define GetSourceTips continue; \ elif [ -d $${i}/$(HG_DIRECTORY) -a "$(HG_VERSION)" != "" ] ; then \ $(PRINTF) " %s:%s" \ - "$${i}" `$(HG) tip --repository $${i} --template '{node|short}\n'` ; \ + "$${i}" `$(HG) id -i --repository $${i}` ; \ elif [ -f $${i}/$(HGTIP_FILENAME) ] ; then \ $(PRINTF) " %s:%s" \ "$${i}" `$(CAT) $${i}/$(HGTIP_FILENAME)` ; \ @@ -325,7 +325,7 @@ endef # Create the HGTIP_FILENAME file. Called from jdk/make/closed/bundles.gmk define CreateHgTip - $(HG) tip --repository $1 --template '{node|short}\n' > $1/$(HGTIP_FILENAME); \ + $(HG) id -i --repository $1' > $1/$(HGTIP_FILENAME); \ $(ECHO) $1/$(HGTIP_FILENAME) endef -- GitLab