diff options
| author | mr <unknown> | 2019-03-20 16:32:54 +0000 |
|---|---|---|
| committer | bell-sw <liberica@bell-sw.com> | 2019-04-20 16:51:50 +0300 |
| commit | a05781daccc60c607bd6a36ced7c52c338120901 (patch) | |
| tree | 383d317525e836b0191de70db014c4d4e8d28c24 | |
| parent | 77a8f773e93b5895082e9e356e7e2c44d960d62f (diff) | |
| download | jdk8u-a05781daccc60c607bd6a36ced7c52c338120901.tar.gz | |
8193764: Cannot set COMPANY_NAME when configuring a build
Reviewed-by: erikj, martin, tbell, aph
| -rw-r--r-- | common/autoconf/generated-configure.sh | 21 | ||||
| -rw-r--r-- | common/autoconf/jdk-options.m4 | 13 |
2 files changed, 31 insertions, 3 deletions
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 7f76ade..a192c1e 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -825,9 +825,9 @@ COOKED_BUILD_NUMBER COOKED_JDK_UPDATE_VERSION JDK_VERSION COPYRIGHT_YEAR +COMPANY_NAME MACOSX_BUNDLE_ID_BASE MACOSX_BUNDLE_NAME_BASE -COMPANY_NAME JDK_RC_PLATFORM_NAME PRODUCT_SUFFIX PRODUCT_NAME @@ -1057,6 +1057,7 @@ with_milestone with_update_version with_user_release_suffix with_build_number +with_vendor_name with_copyright_year with_boot_jdk with_boot_jdk_jvmargs @@ -1890,6 +1891,7 @@ Optional Packages: Add a custom string to the version string if build number isn't set.[username_builddateb00] --with-build-number Set build number value for build [b00] + --with-vendor-name Set vendor name [not specified] --with-copyright-year Set copyright year value for build [current year] --with-boot-jdk path to Boot JDK (used to bootstrap build) [probed] --with-boot-jdk-jvmargs specify JVM arguments to be passed to all @@ -4358,7 +4360,7 @@ VS_SDK_PLATFORM_NAME_2017= #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1552344461 +DATE_WHEN_GENERATED=1552671404 ############################################################################### # @@ -19871,6 +19873,21 @@ fi + # The vendor name, if any + +# Check whether --with-vendor-name was given. +if test "${with_vendor_name+set}" = set; then : + withval=$with_vendor_name; +fi + + if test "x$with_vendor_name" = xyes; then + as_fn_error $? "--with-vendor-name must have a value" "$LINENO" 5 + elif ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ; then + as_fn_error $? "--with--vendor-name contains non-printing characters: $with_vendor_name" "$LINENO" 5 + else + COMPANY_NAME="$with_vendor_name" + fi + # Check whether --with-copyright-year was given. diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4 index 167e285..40dc98b 100644 --- a/common/autoconf/jdk-options.m4 +++ b/common/autoconf/jdk-options.m4 @@ -509,10 +509,21 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VERSION_NUMBERS], AC_SUBST(PRODUCT_NAME) AC_SUBST(PRODUCT_SUFFIX) AC_SUBST(JDK_RC_PLATFORM_NAME) - AC_SUBST(COMPANY_NAME) AC_SUBST(MACOSX_BUNDLE_NAME_BASE) AC_SUBST(MACOSX_BUNDLE_ID_BASE) + # The vendor name, if any + AC_ARG_WITH(vendor-name, [AS_HELP_STRING([--with-vendor-name], + [Set vendor name @<:@not specified@:>@])]) + if test "x$with_vendor_name" = xyes; then + AC_MSG_ERROR([--with-vendor-name must have a value]) + elif [ ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ]; then + AC_MSG_ERROR([--with--vendor-name contains non-printing characters: $with_vendor_name]) + else + COMPANY_NAME="$with_vendor_name" + fi + AC_SUBST(COMPANY_NAME) + AC_ARG_WITH(copyright-year, [AS_HELP_STRING([--with-copyright-year], [Set copyright year value for build @<:@current year@:>@])]) if test "x$with_copyright_year" = xyes; then |