RFR: JDK-8170385 JDK-8031567 broke source bundles
Magnus Ihse Bursie
magnus.ihse.bursie at oracle.com
Mon Nov 28 09:11:44 UTC 2016
Unfortunately, the fix for JDK-8031567
<https://bugs.openjdk.java.net/browse/JDK-8031567> got some untested
last-minute changes which broke it. :-(
Bug: https://bugs.openjdk.java.net/browse/JDK-8170385
Patch inline:
diff --git a/make/SourceRevision.gmk b/make/SourceRevision.gmk
--- a/make/SourceRevision.gmk
+++ b/make/SourceRevision.gmk
@@ -65,8 +65,8 @@
$1_FILENAME := $$(call MakeFilenameFromRepo, $1)
$$(SUPPORT_OUTPUTDIR)/src-rev/$$($1_FILENAME): FRC
- $(call MakeDir $$(@D))
- $(ECHO) $$(strip $1):`$(HG) id -i --repository $$($1_REPO_PATH)`
> $$@
+ $$(call MakeDir, $$(@D))
+ $$(ECHO) $$(strip $1):`$$(HG) id -i --repository
$$($1_REPO_PATH)` > $$@
REPO_REVISIONS += $$(SUPPORT_OUTPUTDIR)/src-rev/$$($1_FILENAME)
endef
@@ -81,7 +81,7 @@
# Param 1: The output file
define CreateSourceRevisionFile
$1: $$(REPO_REVISIONS)
- $(call MakeDir $$(@D))
+ $$(call MakeDir, $$(@D))
$$(ECHO) `$$(CAT) $$(REPO_REVISIONS)` > $$@.tmp
if [ ! -f $$@ ] || [ "`$$(CAT) $$@`" != "`$$(CAT) $$@.tmp`" ];
then \
$$(MV) $$@.tmp $$@ ; \
/Magnus
More information about the build-dev
mailing list