提交 b29c71ad 编写于 作者: S stooke

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
上级 f8ade074
...@@ -293,8 +293,8 @@ define ListPathsSafelyNow ...@@ -293,8 +293,8 @@ define ListPathsSafelyNow
endef endef
# The source tips can come from the Mercurial repository, or in the files # The source ids can come from the Mercurial repository, or in the files
# $(HGTIP_FILENAME) which contains the tip but is also positioned in the same # $(HGTIP_FILENAME) which contains the id but is also positioned in the same
# directory as the original $(HGDIR) directory. # directory as the original $(HGDIR) directory.
# These should not be := assignments, only used from the root Makefile. # These should not be := assignments, only used from the root Makefile.
HG_VERSION = $(shell $(HG) version 2> /dev/null) HG_VERSION = $(shell $(HG) version 2> /dev/null)
...@@ -306,7 +306,7 @@ REPO_LIST = $(patsubst ./%,%,$(patsubst %/,%,$(sort $(dir \ ...@@ -306,7 +306,7 @@ REPO_LIST = $(patsubst ./%,%,$(patsubst %/,%,$(sort $(dir \
$(LS) $(HG_SEARCH:%/REPO=%/$(HGTIP_FILENAME)) ) \ $(LS) $(HG_SEARCH:%/REPO=%/$(HGTIP_FILENAME)) ) \
2> /dev/null))))) 2> /dev/null)))))
# Emit the repo:tip pairs to $@ # Emit the repo:id pairs to $@
define GetSourceTips define GetSourceTips
$(CD) $(SRC_ROOT) ; \ $(CD) $(SRC_ROOT) ; \
for i in $(REPO_LIST) IGNORE ; do \ for i in $(REPO_LIST) IGNORE ; do \
...@@ -314,7 +314,7 @@ define GetSourceTips ...@@ -314,7 +314,7 @@ define GetSourceTips
continue; \ continue; \
elif [ -d $${i}/$(HG_DIRECTORY) -a "$(HG_VERSION)" != "" ] ; then \ elif [ -d $${i}/$(HG_DIRECTORY) -a "$(HG_VERSION)" != "" ] ; then \
$(PRINTF) " %s:%s" \ $(PRINTF) " %s:%s" \
"$${i}" `$(HG) tip --repository $${i} --template '{node|short}\n'` ; \ "$${i}" `$(HG) id -i --repository $${i}` ; \
elif [ -f $${i}/$(HGTIP_FILENAME) ] ; then \ elif [ -f $${i}/$(HGTIP_FILENAME) ] ; then \
$(PRINTF) " %s:%s" \ $(PRINTF) " %s:%s" \
"$${i}" `$(CAT) $${i}/$(HGTIP_FILENAME)` ; \ "$${i}" `$(CAT) $${i}/$(HGTIP_FILENAME)` ; \
...@@ -325,7 +325,7 @@ endef ...@@ -325,7 +325,7 @@ endef
# Create the HGTIP_FILENAME file. Called from jdk/make/closed/bundles.gmk # Create the HGTIP_FILENAME file. Called from jdk/make/closed/bundles.gmk
define CreateHgTip 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) $(ECHO) $1/$(HGTIP_FILENAME)
endef endef
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册