1.1 --- a/make/common/MakeBase.gmk Thu Sep 05 18:40:51 2019 +0800
1.2 +++ b/make/common/MakeBase.gmk Thu Sep 05 18:49:45 2019 +0800
1.3 @@ -293,8 +293,8 @@
1.4
1.5 endef
1.6
1.7 -# The source tips can come from the Mercurial repository, or in the files
1.8 -# $(HGTIP_FILENAME) which contains the tip but is also positioned in the same
1.9 +# The source ids can come from the Mercurial repository, or in the files
1.10 +# $(HGTIP_FILENAME) which contains the id but is also positioned in the same
1.11 # directory as the original $(HGDIR) directory.
1.12 # These should not be := assignments, only used from the root Makefile.
1.13 HG_VERSION = $(shell $(HG) version 2> /dev/null)
1.14 @@ -306,7 +306,7 @@
1.15 $(LS) $(HG_SEARCH:%/REPO=%/$(HGTIP_FILENAME)) ) \
1.16 2> /dev/null)))))
1.17
1.18 -# Emit the repo:tip pairs to $@
1.19 +# Emit the repo:id pairs to $@
1.20 define GetSourceTips
1.21 $(CD) $(SRC_ROOT) ; \
1.22 for i in $(REPO_LIST) IGNORE ; do \
1.23 @@ -314,7 +314,7 @@
1.24 continue; \
1.25 elif [ -d $${i}/$(HG_DIRECTORY) -a "$(HG_VERSION)" != "" ] ; then \
1.26 $(PRINTF) " %s:%s" \
1.27 - "$${i}" `$(HG) tip --repository $${i} --template '{node|short}\n'` ; \
1.28 + "$${i}" `$(HG) id -i --repository $${i}` ; \
1.29 elif [ -f $${i}/$(HGTIP_FILENAME) ] ; then \
1.30 $(PRINTF) " %s:%s" \
1.31 "$${i}" `$(CAT) $${i}/$(HGTIP_FILENAME)` ; \
1.32 @@ -325,7 +325,7 @@
1.33
1.34 # Create the HGTIP_FILENAME file. Called from jdk/make/closed/bundles.gmk
1.35 define CreateHgTip
1.36 - $(HG) tip --repository $1 --template '{node|short}\n' > $1/$(HGTIP_FILENAME); \
1.37 + $(HG) id -i --repository $1' > $1/$(HGTIP_FILENAME); \
1.38 $(ECHO) $1/$(HGTIP_FILENAME)
1.39 endef
1.40
