Merge pull request #496 from pshipton/vendor

Rename CLOSEDJ9 variables to be called VENDOR

Author: keithc-ca

closed/OpenJ9.gmk

@@ -65,7 +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))
+$(call GetVersion, vendor,   VENDOR_SHA,    $(VENDOR_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)
@@ -198,7 +198,6 @@ $(foreach file, \
 		$(eval $(call openj9_test_image_rules, $(file)))))
 
 OPENJ9_VERSION_VARS := \
-	CLOSEDJ9_SHA \
 	COMPANY_NAME \
 	CXX_VERSION_STRING \
 	DEBUG_LEVEL \
@@ -214,11 +213,12 @@ OPENJ9_VERSION_VARS := \
 	PRODUCT_NAME \
 	PRODUCT_SUFFIX \
 	USERNAME \
+	VENDOR_SHA \
 	VERSION_STRING \
 	#
 
 OPENJ9_VERSION_SCRIPT := \
-	$(if $(CLOSEDJ9_SHA),,-e '/ VENDOR_SHA /d') \
+	$(if $(VENDOR_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
@@ -261,8 +261,8 @@ CMAKE_ARGS := \
 	-DOPENJ9_SHA=$(OPENJ9_SHA) \
 	#
 
-ifneq (,$(CLOSEDJ9_SHA))
-  CMAKE_ARGS += -DJ9VM_VENDOR_DIR=$(CLOSEDJ9_TOPDIR)
+ifneq (,$(VENDOR_TOPDIR))
+  CMAKE_ARGS += -DJ9VM_VENDOR_DIR=$(VENDOR_TOPDIR)
 endif
 
 ifeq ($(call isTargetOs, windows), true)

closed/autoconf/custom-hook.m4

@@ -21,21 +21,30 @@
 AC_DEFUN_ONCE([CUSTOM_EARLY_HOOK],
 [
   # Where are the OpenJ9 sources.
-  CLOSEDJ9_TOPDIR="$TOPDIR/closedj9"
   OPENJ9OMR_TOPDIR="$TOPDIR/omr"
   OPENJ9_TOPDIR="$TOPDIR/openj9"
 
+  AC_ARG_WITH(vendor-source, [AS_HELP_STRING([--with-vendor-source], [set the vendor source directory])])
+  if test "x$with_vendor_source" = x || test "x$with_vendor_source" = xno ; then
+    VENDOR_TOPDIR=
+  else
+    VENDOR_TOPDIR="$TOPDIR/$with_vendor_source"
+    if ! test -d "$VENDOR_TOPDIR" ; then
+      AC_MSG_ERROR(["Cannot locate vendor sources: $VENDOR_TOPDIR! Try 'bash get_source.sh' and restart configure."])
+    fi
+  fi
+
   if ! test -d "$OPENJ9_TOPDIR" ; then
-    AC_MSG_ERROR(["Cannot locate the path to OpenJ9 sources: $OPENJ9_TOPDIR! Try 'bash get_source.sh' and restart configure"])
+    AC_MSG_ERROR(["Cannot locate OpenJ9 sources: $OPENJ9_TOPDIR! Try 'bash get_source.sh' and restart configure."])
   fi
 
   if ! test -d "$OPENJ9OMR_TOPDIR" ; then
-    AC_MSG_ERROR(["Cannot locate the path to OMR sources: $OPENJ9OMR_TOPDIR! Try 'bash get_source.sh' and restart configure"])
+    AC_MSG_ERROR(["Cannot locate 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(VENDOR_TOPDIR)
 
   OPENJ9_BASIC_SETUP_FUNDAMENTAL_TOOLS
   OPENJ9_PLATFORM_SETUP

closed/autoconf/custom-spec.gmk.in

@@ -32,9 +32,9 @@ define IncludeCustomExtension
   endif
 endef
 
-CLOSEDJ9_TOPDIR         := @CLOSEDJ9_TOPDIR@
 OPENJ9_TOPDIR           := @OPENJ9_TOPDIR@
 OPENJ9OMR_TOPDIR        := @OPENJ9OMR_TOPDIR@
+VENDOR_TOPDIR           := @VENDOR_TOPDIR@
 
 # compiler overrides
 OPENJ9_CC               := @OPENJ9_CC@

closed/custom/ReleaseFile.gmk

@@ -25,6 +25,6 @@ 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)
+ifneq (,$(VENDOR_TOPDIR))
+  SOURCE_REVISION += IBM:$(shell $(GIT) -C $(VENDOR_TOPDIR) rev-parse --short HEAD)
 endif

closed/openj9_version_info.h.in

@@ -24,21 +24,20 @@
 #define OPENJ9_VERSION_INFO_H
 
 #define J9COMPILER_VERSION_STRING "@CXX_VERSION_STRING@"
+#define J9JDK_EXT_NAME            "@J9JDK_EXT_NAME@"
+#define J9JDK_EXT_VERSION         "@J9JDK_EXT_VERSION@"
+#define J9JVM_VERSION_STRING      "@OPENJ9_VERSION_STRING@"
 #define J9PRODUCT_NAME            "@PRODUCT_NAME@ @PRODUCT_SUFFIX@"
 #define J9TARGET_CPU_BITS         "@OPENJDK_TARGET_CPU_BITS@"
 #define J9TARGET_CPU_OSARCH       "@OPENJDK_TARGET_CPU_OSARCH@"
 #define J9TARGET_OS               "@OPENJDK_TARGET_OS@"
 #define J9USERNAME                "@USERNAME@"
 #define J9VERSION_STRING          "@VERSION_STRING@"
-#define OPENJDK_SHA               "@OPENJDK_SHA@"
-#define OPENJDK_TAG               "@OPENJDK_TAG@"
-#define J9JVM_VERSION_STRING      "@OPENJ9_VERSION_STRING@"
-#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@"
+#define OPENJ9_TAG                "@OPENJ9_TAG@"
+#define OPENJDK_SHA               "@OPENJDK_SHA@"
+#define OPENJDK_TAG               "@OPENJDK_TAG@"
+#define VENDOR_SHA                "@VENDOR_SHA@"
 
 #endif /* OPENJ9_VERSION_INFO_H */