53 lines
1.9 KiB
Diff
53 lines
1.9 KiB
Diff
diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk
|
|
index 8b7990a0cb..8559b989a0 100644
|
|
--- a/closed/OpenJ9.gmk
|
|
+++ b/closed/OpenJ9.gmk
|
|
@@ -32,20 +32,20 @@ ifeq (,$(BUILD_ID))
|
|
BUILD_ID := 000000
|
|
endif
|
|
|
|
-OPENJDK_SHA := $(shell $(GIT) -C $(TOPDIR) rev-parse --short HEAD)
|
|
+OPENJDK_SHA := @OPENJDK_SHA@
|
|
ifeq (,$(OPENJDK_SHA))
|
|
$(error Could not determine OpenJDK SHA)
|
|
endif
|
|
|
|
-OPENJ9_SHA := $(shell $(GIT) -C $(OPENJ9_TOPDIR) rev-parse --short HEAD)
|
|
+OPENJ9_SHA := @OPENJ9_SHA@
|
|
ifeq (,$(OPENJ9_SHA))
|
|
$(error Could not determine OpenJ9 SHA)
|
|
endif
|
|
|
|
# Find OpenJ9 tag associated with current commit (suppressing stderr in case there is no such tag).
|
|
-OPENJ9_TAG := $(shell $(GIT) -C $(OPENJ9_TOPDIR) describe --exact-match HEAD 2>/dev/null)
|
|
+OPENJ9_TAG := @OPENJ9_TAG@
|
|
ifeq (,$(OPENJ9_TAG))
|
|
- OPENJ9_BRANCH := $(shell $(GIT) -C $(OPENJ9_TOPDIR) rev-parse --abbrev-ref HEAD)
|
|
+ OPENJ9_BRANCH := @OPENJ9_BRANCH@
|
|
ifeq (,$(OPENJ9_BRANCH))
|
|
$(error Could not determine OpenJ9 branch)
|
|
endif
|
|
@@ -54,7 +54,7 @@ else
|
|
OPENJ9_VERSION_STRING := $(OPENJ9_TAG)
|
|
endif
|
|
|
|
-OPENJ9OMR_SHA := $(shell $(GIT) -C $(OPENJ9OMR_TOPDIR) rev-parse --short HEAD)
|
|
+OPENJ9OMR_SHA := @OPENJ9OMR_SHA@
|
|
ifeq (,$(OPENJ9OMR_SHA))
|
|
$(error Could not determine OMR SHA)
|
|
endif
|
|
diff --git a/closed/custom/ReleaseFile.gmk b/closed/custom/ReleaseFile.gmk
|
|
index 8512c7702f..767b199992 100644
|
|
--- a/closed/custom/ReleaseFile.gmk
|
|
+++ b/closed/custom/ReleaseFile.gmk
|
|
@@ -18,6 +18,6 @@
|
|
# 2 along with this work; if not, see <http://www.gnu.org/licenses/>.
|
|
# ===========================================================================
|
|
|
|
-SOURCE_REVISION := OpenJDK:$(shell $(GIT) -C $(TOPDIR) rev-parse --short HEAD)
|
|
-SOURCE_REVISION += OpenJ9:$(shell $(GIT) -C $(OPENJ9_TOPDIR) rev-parse --short HEAD)
|
|
-SOURCE_REVISION += OMR:$(shell $(GIT) -C $(OPENJ9OMR_TOPDIR) rev-parse --short HEAD)
|
|
+SOURCE_REVISION := OpenJDK:@OPENJ9_SHA@
|
|
+SOURCE_REVISION += OpenJ9:@OPENJ9_SHA@
|
|
+SOURCE_REVISION += OMR:@OPENJ9OMR_SHA@
|