Merge pull request #491 from pshipton/closedj9

Add support to build with closedj9 when present

Author: keithc-ca

closed/OpenJ9.gmk

@@ -65,6 +65,7 @@ $(call GetVersion, openjdk,  OPENJDK_SHA,   $(TOPDIR),           required)
 $(call GetVersion, openj9,   OPENJ9_SHA,    $(OPENJ9_TOPDIR),    required)
 $(call GetVersion, omr,      OPENJ9OMR_SHA, $(OPENJ9OMR_TOPDIR), required)
 $(call GetVersion, openssl,  OPENSSL_SHA,   $(OPENSSL_DIR))
+$(call GetVersion, closedj9, CLOSEDJ9_SHA,  $(CLOSEDJ9_TOPDIR))
 
 # 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)
@@ -197,6 +198,7 @@ $(foreach file, \
 		$(eval $(call openj9_test_image_rules, $(file)))))
 
 OPENJ9_VERSION_VARS := \
+	CLOSEDJ9_SHA \
 	COMPANY_NAME \
 	CXX_VERSION_STRING \
 	DEBUG_LEVEL \
@@ -216,6 +218,7 @@ OPENJ9_VERSION_VARS := \
 	#
 
 OPENJ9_VERSION_SCRIPT := \
+	$(if $(CLOSEDJ9_SHA),,-e '/ VENDOR_SHA /d') \
 	$(foreach var,$(OPENJ9_VERSION_VARS),-e 's|@$(var)@|$(value $(var))|g')
 
 $(OPENJ9_VM_BUILD_DIR)/include/openj9_version_info.h : $(TOPDIR)/closed/openj9_version_info.h.in
@@ -258,6 +261,10 @@ CMAKE_ARGS := \
 	-DOPENJ9_SHA=$(OPENJ9_SHA) \
 	#
 
+ifneq (,$(CLOSEDJ9_SHA))
+  CMAKE_ARGS += -DJ9VM_VENDOR_DIR=$(CLOSEDJ9_TOPDIR)
+endif
+
 ifeq ($(call isTargetOs, windows), true)
   CMAKE_ARGS += -DOPENJDK_VERSION_NUMBER_FOUR_POSITIONS=$(VERSION_NUMBER_FOUR_POSITIONS)
 else

closed/autoconf/custom-hook.m4

@@ -21,6 +21,7 @@
 AC_DEFUN_ONCE([CUSTOM_EARLY_HOOK],
 [
   # Where are the OpenJ9 sources.
+  CLOSEDJ9_TOPDIR="$TOPDIR/closedj9"
   OPENJ9OMR_TOPDIR="$TOPDIR/omr"
   OPENJ9_TOPDIR="$TOPDIR/openj9"
 
@@ -32,9 +33,9 @@ AC_DEFUN_ONCE([CUSTOM_EARLY_HOOK],
     AC_MSG_ERROR(["Cannot locate the path to OMR sources: $OPENJ9OMR_TOPDIR! Try 'bash get_source.sh' and restart configure"])
   fi
 
+  AC_SUBST(CLOSEDJ9_TOPDIR)
   AC_SUBST(OPENJ9OMR_TOPDIR)
   AC_SUBST(OPENJ9_TOPDIR)
-  AC_SUBST(CONFIG_SHELL)
 
   OPENJ9_BASIC_SETUP_FUNDAMENTAL_TOOLS
   OPENJ9_PLATFORM_SETUP

closed/autoconf/custom-spec.gmk.in

@@ -32,6 +32,7 @@ define IncludeCustomExtension
   endif
 endef
 
+CLOSEDJ9_TOPDIR         := @CLOSEDJ9_TOPDIR@
 OPENJ9_TOPDIR           := @OPENJ9_TOPDIR@
 OPENJ9OMR_TOPDIR        := @OPENJ9OMR_TOPDIR@
 

closed/custom/ReleaseFile.gmk

@@ -1,5 +1,5 @@
 # ===========================================================================
-# (c) Copyright IBM Corp. 2017, 2024 All Rights Reserved
+# (c) Copyright IBM Corp. 2017, 2025 All Rights Reserved
 # ===========================================================================
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
@@ -24,3 +24,7 @@ SOURCE_REVISION += OMR:$(shell $(GIT) -C $(OPENJ9OMR_TOPDIR) rev-parse --short H
 ifeq (true,$(BUILD_OPENJCEPLUS))
   SOURCE_REVISION += OpenJCEPlus:$(shell $(GIT) -C $(OPENJCEPLUS_TOPDIR) rev-parse --short HEAD)
 endif
+
+ifneq (,$(wildcard $(CLOSEDJ9_TOPDIR)))
+  SOURCE_REVISION += IBM:$(shell $(GIT) -C $(CLOSEDJ9_TOPDIR) rev-parse --short HEAD)
+endif

closed/openj9_version_info.h.in

@@ -36,6 +36,7 @@
 #define OPENJ9_TAG                "@OPENJ9_TAG@"
 #define J9JDK_EXT_VERSION         "@J9JDK_EXT_VERSION@"
 #define J9JDK_EXT_NAME            "@J9JDK_EXT_NAME@"
+#define VENDOR_SHA                "@CLOSEDJ9_SHA@"
 #define JAVA_VENDOR               "@COMPANY_NAME@"
 
 #define JDK_DEBUG_LEVEL           "@DEBUG_LEVEL@"