Mercurial > hg > icedtea8-forest
changeset 2550:84adf64edebb jdk8u222-b01
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
| author | stooke |
|---|---|
| date | Fri, 26 Apr 2019 17:11:43 +0100 |
| parents | 892833503e6f |
| children | abf5011267ae 9d00e3f144e0 |
| files | make/common/MakeBase.gmk |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/MakeBase.gmk Thu Apr 25 05:11:57 2019 +0100 +++ b/make/common/MakeBase.gmk Fri Apr 26 17:11:43 2019 +0100 @@ -293,8 +293,8 @@ 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 @@ $(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 @@ 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 @@ # 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