Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8170392: JDK-8031567 broke builds from source bundles
authorerikj
Mon, 28 Nov 2016 15:19:08 +0100
changeset 42284 38f8784217d0
parent 42283 eb9bd075b879
child 42285 864475e2cf63
8170392: JDK-8031567 broke builds from source bundles Reviewed-by: sla
make/Images.gmk file | annotate | diff | comparison | revisions
make/SourceRevision.gmk file | annotate | diff | comparison | revisions 
--- a/make/Images.gmk	Mon Nov 28 10:13:18 2016 +0100
+++ b/make/Images.gmk	Mon Nov 28 15:19:08 2016 +0100
@@ -100,7 +100,8 @@
       $(CAT) $(SOURCE_REVISION_TRACKER) ; \
     fi)
 
-$(BASE_RELEASE_FILE): $(INFO_FILE_VARDEPS) $(SOURCE_REVISION_TRACKER)
+# The SOURCE_REVISION_TRACKER file may not exist. Only depend on it if it does.
+$(BASE_RELEASE_FILE): $(INFO_FILE_VARDEPS) $(wildcard $(SOURCE_REVISION_TRACKER))
 	$(info-file)
 
 ################################################################################
--- a/make/SourceRevision.gmk	Mon Nov 28 10:13:18 2016 +0100
+++ b/make/SourceRevision.gmk	Mon Nov 28 15:19:08 2016 +0100
@@ -119,8 +119,7 @@
 	exit 2
 
     create-source-revision-tracker:
-	$(call LogWarn, Error: No mercurial configuration present and no .src-rev)
-	exit 2
+	$(call LogWarn, Warning: No mercurial configuration present and no .src-rev)
   endif
 
 endif
jdk-sandbox