stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8170385: JDK-8031567 broke source bundles

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie 2016-11-28 10:13:18 +01:00
parent b58f0c97b9
commit bac0ea6842
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
make/SourceRevision.gmk
View File

@ -65,8 +65,8 @@ ifneq ($(and $(HG), $(wildcard $(TOPDIR)/.hg)), )
$1_FILENAME := $$(call MakeFilenameFromRepo, $1) $1_FILENAME := $$(call MakeFilenameFromRepo, $1)
$$(SUPPORT_OUTPUTDIR)/src-rev/$$($1_FILENAME): FRC $$(SUPPORT_OUTPUTDIR)/src-rev/$$($1_FILENAME): FRC
$(call MakeDir $$(@D)) $$(call MakeDir, $$(@D))
$(ECHO) $$(strip $1):`$(HG) id -i --repository $$($1_REPO_PATH)` > $$@ $$(ECHO) $$(strip $1):`$$(HG) id -i --repository $$($1_REPO_PATH)` > $$@
REPO_REVISIONS += $$(SUPPORT_OUTPUTDIR)/src-rev/$$($1_FILENAME) REPO_REVISIONS += $$(SUPPORT_OUTPUTDIR)/src-rev/$$($1_FILENAME)
endef endef
@ -81,7 +81,7 @@ ifneq ($(and $(HG), $(wildcard $(TOPDIR)/.hg)), )
# Param 1: The output file # Param 1: The output file
define CreateSourceRevisionFile define CreateSourceRevisionFile
$1: $$(REPO_REVISIONS) $1: $$(REPO_REVISIONS)
$(call MakeDir $$(@D)) $$(call MakeDir, $$(@D))
$$(ECHO) `$$(CAT) $$(REPO_REVISIONS)` > $$@.tmp $$(ECHO) `$$(CAT) $$(REPO_REVISIONS)` > $$@.tmp
if [ ! -f $$@ ] || [ "`$$(CAT) $$@`" != "`$$(CAT) $$@.tmp`" ]; then \ if [ ! -f $$@ ] || [ "`$$(CAT) $$@`" != "`$$(CAT) $$@.tmp`" ]; then \
$$(MV) $$@.tmp $$@ ; \ $$(MV) $$@.tmp $$@ ; \