1.1 --- a/common/autoconf/spec.gmk.in Wed Mar 20 16:32:54 2019 +0000
1.2 +++ b/common/autoconf/spec.gmk.in Fri Mar 29 15:08:03 2019 +0000
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
1.6 +# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 #
1.9 # This code is free software; you can redistribute it and/or modify it
1.10 @@ -150,6 +150,18 @@
1.11 NASHORN_TOPDIR:=@NASHORN_TOPDIR@
1.12 COPYRIGHT_YEAR:=@COPYRIGHT_YEAR@
1.13
1.14 +# Platform naming variables
1.15 +LAUNCHER_NAME:=@LAUNCHER_NAME@
1.16 +PRODUCT_NAME:=@PRODUCT_NAME@
1.17 +PRODUCT_SUFFIX:=@PRODUCT_SUFFIX@
1.18 +JDK_RC_PLATFORM_NAME:=@JDK_RC_PLATFORM_NAME@
1.19 +COMPANY_NAME:=@COMPANY_NAME@
1.20 +MACOSX_BUNDLE_NAME_BASE=@MACOSX_BUNDLE_NAME_BASE@
1.21 +MACOSX_BUNDLE_ID_BASE=@MACOSX_BUNDLE_ID_BASE@
1.22 +VENDOR_URL:=@VENDOR_URL@
1.23 +VENDOR_URL_BUG:=@VENDOR_URL_BUG@
1.24 +VENDOR_URL_VM_BUG:=@VENDOR_URL_VM_BUG@
1.25 +
1.26 # Location where build customization files may be found
1.27 CUSTOM_MAKE_DIR:=@CUSTOM_MAKE_DIR@
1.28
1.29 @@ -160,15 +172,33 @@
1.30 JDK_UPDATE_VERSION:=@JDK_UPDATE_VERSION@
1.31 JDK_BUILD_NUMBER:=@JDK_BUILD_NUMBER@
1.32 MILESTONE:=@MILESTONE@
1.33 -LAUNCHER_NAME:=@LAUNCHER_NAME@
1.34 -PRODUCT_NAME:=@PRODUCT_NAME@
1.35 -PRODUCT_SUFFIX:=@PRODUCT_SUFFIX@
1.36 -JDK_RC_PLATFORM_NAME:=@JDK_RC_PLATFORM_NAME@
1.37 -COMPANY_NAME:=@COMPANY_NAME@
1.38 -MACOSX_BUNDLE_NAME_BASE=@MACOSX_BUNDLE_NAME_BASE@
1.39 -MACOSX_BUNDLE_ID_BASE=@MACOSX_BUNDLE_ID_BASE@
1.40 USER_RELEASE_SUFFIX=@USER_RELEASE_SUFFIX@
1.41
1.42 +ifneq ($(COMPANY_NAME),)
1.43 + # COMPANY_NAME is set to "N/A" in $AUTOCONF_DIR/version-numbers by default,
1.44 + # but can be customized with the '--with-vendor-name' configure option.
1.45 + # Only export "VENDOR" to the build if COMPANY_NAME contains a real value.
1.46 + # Otherwise the default value for VENDOR, which is used to set the "java.vendor"
1.47 + # and "java.vm.vendor" properties is hard-coded into the source code (i.e. in
1.48 + # System.c in the jdk for "vm.vendor" and vm_version.cpp in the VM for "java.vm.vendor")
1.49 + ifneq ($(COMPANY_NAME), N/A)
1.50 + VERSION_CFLAGS += -DVENDOR='"$(COMPANY_NAME)"'
1.51 + endif
1.52 +endif
1.53 +
1.54 +# Only export VENDOR_URL, VENDOR_URL_BUG and VENDOR_VM_URL_BUG to the build if
1.55 +# they are not empty. Otherwise, default values which are defined in the sources
1.56 +# will be used.
1.57 +ifneq ($(VENDOR_URL),)
1.58 + VERSION_CFLAGS += -DVENDOR_URL='"$(VENDOR_URL)"'
1.59 +endif
1.60 +ifneq ($(VENDOR_URL_BUG),)
1.61 + VERSION_CFLAGS += -DVENDOR_URL_BUG='"$(VENDOR_URL_BUG)"'
1.62 +endif
1.63 +ifneq ($(VENDOR_URL_VM_BUG),)
1.64 + VERSION_CFLAGS += -DVENDOR_URL_VM_BUG='"$(VENDOR_URL_VM_BUG)"'
1.65 +endif
1.66 +
1.67 # Different version strings generated from the above information.
1.68 JDK_VERSION:=@JDK_VERSION@
1.69 RUNTIME_NAME=$(PRODUCT_NAME) $(PRODUCT_SUFFIX)
