Fri, 29 Mar 2019 15:08:03 +0000
8189761: COMPANY_NAME, IMPLEMENTOR, BUNDLE_VENDOR, VENDOR, but no configure flag
Reviewed-by: erikj, dholmes
1.1 --- a/common/autoconf/generated-configure.sh Wed Mar 20 16:32:54 2019 +0000 1.2 +++ b/common/autoconf/generated-configure.sh Fri Mar 29 15:08:03 2019 +0000 1.3 @@ -825,6 +825,9 @@ 1.4 COOKED_JDK_UPDATE_VERSION 1.5 JDK_VERSION 1.6 COPYRIGHT_YEAR 1.7 +VENDOR_URL_VM_BUG 1.8 +VENDOR_URL_BUG 1.9 +VENDOR_URL 1.10 COMPANY_NAME 1.11 MACOSX_BUNDLE_ID_BASE 1.12 MACOSX_BUNDLE_NAME_BASE 1.13 @@ -1058,6 +1061,9 @@ 1.14 with_user_release_suffix 1.15 with_build_number 1.16 with_vendor_name 1.17 +with_vendor_url 1.18 +with_vendor_bug_url 1.19 +with_vendor_vm_bug_url 1.20 with_copyright_year 1.21 with_boot_jdk 1.22 with_boot_jdk_jvmargs 1.23 @@ -1891,7 +1897,16 @@ 1.24 Add a custom string to the version string if build 1.25 number isn't set.[username_builddateb00] 1.26 --with-build-number Set build number value for build [b00] 1.27 - --with-vendor-name Set vendor name [not specified] 1.28 + --with-vendor-name Set vendor name. Among others, used to set the 1.29 + 'java.vendor' and 'java.vm.vendor' system 1.30 + properties. [not specified] 1.31 + --with-vendor-url Set the 'java.vendor.url' system property [not 1.32 + specified] 1.33 + --with-vendor-bug-url Set the 'java.vendor.url.bug' system property [not 1.34 + specified] 1.35 + --with-vendor-vm-bug-url 1.36 + Sets the bug URL which will be displayed when the VM 1.37 + crashes [not specified] 1.38 --with-copyright-year Set copyright year value for build [current year] 1.39 --with-boot-jdk path to Boot JDK (used to bootstrap build) [probed] 1.40 --with-boot-jdk-jvmargs specify JVM arguments to be passed to all 1.41 @@ -4360,7 +4375,7 @@ 1.42 #CUSTOM_AUTOCONF_INCLUDE 1.43 1.44 # Do not change or remove the following line, it is needed for consistency checks: 1.45 -DATE_WHEN_GENERATED=1552671404 1.46 +DATE_WHEN_GENERATED=1553405262 1.47 1.48 ############################################################################### 1.49 # 1.50 @@ -19883,12 +19898,62 @@ 1.51 if test "x$with_vendor_name" = xyes; then 1.52 as_fn_error $? "--with-vendor-name must have a value" "$LINENO" 5 1.53 elif ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ; then 1.54 - as_fn_error $? "--with--vendor-name contains non-printing characters: $with_vendor_name" "$LINENO" 5 1.55 - else 1.56 + as_fn_error $? "--with-vendor-name contains non-printing characters: $with_vendor_name" "$LINENO" 5 1.57 + elif test "x$with_vendor_name" != x; then 1.58 + # Only set COMPANY_NAME if '--with-vendor-name' was used and is not empty. 1.59 + # Otherwise we will use the value from "version-numbers" included above. 1.60 COMPANY_NAME="$with_vendor_name" 1.61 fi 1.62 1.63 1.64 + # The vendor URL, if any 1.65 + 1.66 +# Check whether --with-vendor-url was given. 1.67 +if test "${with_vendor_url+set}" = set; then : 1.68 + withval=$with_vendor_url; 1.69 +fi 1.70 + 1.71 + if test "x$with_vendor_url" = xyes; then 1.72 + as_fn_error $? "--with-vendor-url must have a value" "$LINENO" 5 1.73 + elif ! [[ $with_vendor_url =~ ^[[:print:]]*$ ]] ; then 1.74 + as_fn_error $? "--with-vendor-url contains non-printing characters: $with_vendor_url" "$LINENO" 5 1.75 + else 1.76 + VENDOR_URL="$with_vendor_url" 1.77 + fi 1.78 + 1.79 + 1.80 + # The vendor bug URL, if any 1.81 + 1.82 +# Check whether --with-vendor-bug-url was given. 1.83 +if test "${with_vendor_bug_url+set}" = set; then : 1.84 + withval=$with_vendor_bug_url; 1.85 +fi 1.86 + 1.87 + if test "x$with_vendor_bug_url" = xyes; then 1.88 + as_fn_error $? "--with-vendor-bug-url must have a value" "$LINENO" 5 1.89 + elif ! [[ $with_vendor_bug_url =~ ^[[:print:]]*$ ]] ; then 1.90 + as_fn_error $? "--with-vendor-bug-url contains non-printing characters: $with_vendor_bug_url" "$LINENO" 5 1.91 + else 1.92 + VENDOR_URL_BUG="$with_vendor_bug_url" 1.93 + fi 1.94 + 1.95 + 1.96 + # The vendor VM bug URL, if any 1.97 + 1.98 +# Check whether --with-vendor-vm-bug-url was given. 1.99 +if test "${with_vendor_vm_bug_url+set}" = set; then : 1.100 + withval=$with_vendor_vm_bug_url; 1.101 +fi 1.102 + 1.103 + if test "x$with_vendor_vm_bug_url" = xyes; then 1.104 + as_fn_error $? "--with-vendor-vm-bug-url must have a value" "$LINENO" 5 1.105 + elif ! [[ $with_vendor_vm_bug_url =~ ^[[:print:]]*$ ]] ; then 1.106 + as_fn_error $? "--with-vendor-vm-bug-url contains non-printing characters: $with_vendor_vm_bug_url" "$LINENO" 5 1.107 + else 1.108 + VENDOR_URL_VM_BUG="$with_vendor_vm_bug_url" 1.109 + fi 1.110 + 1.111 + 1.112 1.113 # Check whether --with-copyright-year was given. 1.114 if test "${with_copyright_year+set}" = set; then :
2.1 --- a/common/autoconf/jdk-options.m4 Wed Mar 20 16:32:54 2019 +0000 2.2 +++ b/common/autoconf/jdk-options.m4 Fri Mar 29 15:08:03 2019 +0000 2.3 @@ -1,5 +1,5 @@ 2.4 # 2.5 -# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. 2.6 +# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. 2.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.8 # 2.9 # This code is free software; you can redistribute it and/or modify it 2.10 @@ -514,16 +514,55 @@ 2.11 2.12 # The vendor name, if any 2.13 AC_ARG_WITH(vendor-name, [AS_HELP_STRING([--with-vendor-name], 2.14 - [Set vendor name @<:@not specified@:>@])]) 2.15 + [Set vendor name. Among others, used to set the 'java.vendor' 2.16 + and 'java.vm.vendor' system properties. @<:@not specified@:>@])]) 2.17 if test "x$with_vendor_name" = xyes; then 2.18 AC_MSG_ERROR([--with-vendor-name must have a value]) 2.19 elif [ ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ]; then 2.20 - AC_MSG_ERROR([--with--vendor-name contains non-printing characters: $with_vendor_name]) 2.21 - else 2.22 + AC_MSG_ERROR([--with-vendor-name contains non-printing characters: $with_vendor_name]) 2.23 + elif test "x$with_vendor_name" != x; then 2.24 + # Only set COMPANY_NAME if '--with-vendor-name' was used and is not empty. 2.25 + # Otherwise we will use the value from "version-numbers" included above. 2.26 COMPANY_NAME="$with_vendor_name" 2.27 fi 2.28 AC_SUBST(COMPANY_NAME) 2.29 2.30 + # The vendor URL, if any 2.31 + AC_ARG_WITH(vendor-url, [AS_HELP_STRING([--with-vendor-url], 2.32 + [Set the 'java.vendor.url' system property @<:@not specified@:>@])]) 2.33 + if test "x$with_vendor_url" = xyes; then 2.34 + AC_MSG_ERROR([--with-vendor-url must have a value]) 2.35 + elif [ ! [[ $with_vendor_url =~ ^[[:print:]]*$ ]] ]; then 2.36 + AC_MSG_ERROR([--with-vendor-url contains non-printing characters: $with_vendor_url]) 2.37 + else 2.38 + VENDOR_URL="$with_vendor_url" 2.39 + fi 2.40 + AC_SUBST(VENDOR_URL) 2.41 + 2.42 + # The vendor bug URL, if any 2.43 + AC_ARG_WITH(vendor-bug-url, [AS_HELP_STRING([--with-vendor-bug-url], 2.44 + [Set the 'java.vendor.url.bug' system property @<:@not specified@:>@])]) 2.45 + if test "x$with_vendor_bug_url" = xyes; then 2.46 + AC_MSG_ERROR([--with-vendor-bug-url must have a value]) 2.47 + elif [ ! [[ $with_vendor_bug_url =~ ^[[:print:]]*$ ]] ]; then 2.48 + AC_MSG_ERROR([--with-vendor-bug-url contains non-printing characters: $with_vendor_bug_url]) 2.49 + else 2.50 + VENDOR_URL_BUG="$with_vendor_bug_url" 2.51 + fi 2.52 + AC_SUBST(VENDOR_URL_BUG) 2.53 + 2.54 + # The vendor VM bug URL, if any 2.55 + AC_ARG_WITH(vendor-vm-bug-url, [AS_HELP_STRING([--with-vendor-vm-bug-url], 2.56 + [Sets the bug URL which will be displayed when the VM crashes @<:@not specified@:>@])]) 2.57 + if test "x$with_vendor_vm_bug_url" = xyes; then 2.58 + AC_MSG_ERROR([--with-vendor-vm-bug-url must have a value]) 2.59 + elif [ ! [[ $with_vendor_vm_bug_url =~ ^[[:print:]]*$ ]] ]; then 2.60 + AC_MSG_ERROR([--with-vendor-vm-bug-url contains non-printing characters: $with_vendor_vm_bug_url]) 2.61 + else 2.62 + VENDOR_URL_VM_BUG="$with_vendor_vm_bug_url" 2.63 + fi 2.64 + AC_SUBST(VENDOR_URL_VM_BUG) 2.65 + 2.66 AC_ARG_WITH(copyright-year, [AS_HELP_STRING([--with-copyright-year], 2.67 [Set copyright year value for build @<:@current year@:>@])]) 2.68 if test "x$with_copyright_year" = xyes; then
3.1 --- a/common/autoconf/spec.gmk.in Wed Mar 20 16:32:54 2019 +0000 3.2 +++ b/common/autoconf/spec.gmk.in Fri Mar 29 15:08:03 2019 +0000 3.3 @@ -1,5 +1,5 @@ 3.4 # 3.5 -# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. 3.6 +# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. 3.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3.8 # 3.9 # This code is free software; you can redistribute it and/or modify it 3.10 @@ -150,6 +150,18 @@ 3.11 NASHORN_TOPDIR:=@NASHORN_TOPDIR@ 3.12 COPYRIGHT_YEAR:=@COPYRIGHT_YEAR@ 3.13 3.14 +# Platform naming variables 3.15 +LAUNCHER_NAME:=@LAUNCHER_NAME@ 3.16 +PRODUCT_NAME:=@PRODUCT_NAME@ 3.17 +PRODUCT_SUFFIX:=@PRODUCT_SUFFIX@ 3.18 +JDK_RC_PLATFORM_NAME:=@JDK_RC_PLATFORM_NAME@ 3.19 +COMPANY_NAME:=@COMPANY_NAME@ 3.20 +MACOSX_BUNDLE_NAME_BASE=@MACOSX_BUNDLE_NAME_BASE@ 3.21 +MACOSX_BUNDLE_ID_BASE=@MACOSX_BUNDLE_ID_BASE@ 3.22 +VENDOR_URL:=@VENDOR_URL@ 3.23 +VENDOR_URL_BUG:=@VENDOR_URL_BUG@ 3.24 +VENDOR_URL_VM_BUG:=@VENDOR_URL_VM_BUG@ 3.25 + 3.26 # Location where build customization files may be found 3.27 CUSTOM_MAKE_DIR:=@CUSTOM_MAKE_DIR@ 3.28 3.29 @@ -160,15 +172,33 @@ 3.30 JDK_UPDATE_VERSION:=@JDK_UPDATE_VERSION@ 3.31 JDK_BUILD_NUMBER:=@JDK_BUILD_NUMBER@ 3.32 MILESTONE:=@MILESTONE@ 3.33 -LAUNCHER_NAME:=@LAUNCHER_NAME@ 3.34 -PRODUCT_NAME:=@PRODUCT_NAME@ 3.35 -PRODUCT_SUFFIX:=@PRODUCT_SUFFIX@ 3.36 -JDK_RC_PLATFORM_NAME:=@JDK_RC_PLATFORM_NAME@ 3.37 -COMPANY_NAME:=@COMPANY_NAME@ 3.38 -MACOSX_BUNDLE_NAME_BASE=@MACOSX_BUNDLE_NAME_BASE@ 3.39 -MACOSX_BUNDLE_ID_BASE=@MACOSX_BUNDLE_ID_BASE@ 3.40 USER_RELEASE_SUFFIX=@USER_RELEASE_SUFFIX@ 3.41 3.42 +ifneq ($(COMPANY_NAME),) 3.43 + # COMPANY_NAME is set to "N/A" in $AUTOCONF_DIR/version-numbers by default, 3.44 + # but can be customized with the '--with-vendor-name' configure option. 3.45 + # Only export "VENDOR" to the build if COMPANY_NAME contains a real value. 3.46 + # Otherwise the default value for VENDOR, which is used to set the "java.vendor" 3.47 + # and "java.vm.vendor" properties is hard-coded into the source code (i.e. in 3.48 + # System.c in the jdk for "vm.vendor" and vm_version.cpp in the VM for "java.vm.vendor") 3.49 + ifneq ($(COMPANY_NAME), N/A) 3.50 + VERSION_CFLAGS += -DVENDOR='"$(COMPANY_NAME)"' 3.51 + endif 3.52 +endif 3.53 + 3.54 +# Only export VENDOR_URL, VENDOR_URL_BUG and VENDOR_VM_URL_BUG to the build if 3.55 +# they are not empty. Otherwise, default values which are defined in the sources 3.56 +# will be used. 3.57 +ifneq ($(VENDOR_URL),) 3.58 + VERSION_CFLAGS += -DVENDOR_URL='"$(VENDOR_URL)"' 3.59 +endif 3.60 +ifneq ($(VENDOR_URL_BUG),) 3.61 + VERSION_CFLAGS += -DVENDOR_URL_BUG='"$(VENDOR_URL_BUG)"' 3.62 +endif 3.63 +ifneq ($(VENDOR_URL_VM_BUG),) 3.64 + VERSION_CFLAGS += -DVENDOR_URL_VM_BUG='"$(VENDOR_URL_VM_BUG)"' 3.65 +endif 3.66 + 3.67 # Different version strings generated from the above information. 3.68 JDK_VERSION:=@JDK_VERSION@ 3.69 RUNTIME_NAME=$(PRODUCT_NAME) $(PRODUCT_SUFFIX)