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 :
