8193764: Cannot set COMPANY_NAME when configuring a build

Wed, 20 Mar 2019 16:32:54 +0000

author
mr
date
Wed, 20 Mar 2019 16:32:54 +0000
changeset 2405
e0b7721459ee
parent 2404
5dd7e8d925e8
child 2406
7480582c7fdc

8193764: Cannot set COMPANY_NAME when configuring a build
Reviewed-by: erikj, martin, tbell, aph

common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
common/autoconf/jdk-options.m4 file | annotate | diff | comparison | revisions
     1.1 --- a/common/autoconf/generated-configure.sh	Mon Mar 18 08:33:19 2019 +0100
     1.2 +++ b/common/autoconf/generated-configure.sh	Wed Mar 20 16:32:54 2019 +0000
     1.3 @@ -825,9 +825,9 @@
     1.4  COOKED_JDK_UPDATE_VERSION
     1.5  JDK_VERSION
     1.6  COPYRIGHT_YEAR
     1.7 +COMPANY_NAME
     1.8  MACOSX_BUNDLE_ID_BASE
     1.9  MACOSX_BUNDLE_NAME_BASE
    1.10 -COMPANY_NAME
    1.11  JDK_RC_PLATFORM_NAME
    1.12  PRODUCT_SUFFIX
    1.13  PRODUCT_NAME
    1.14 @@ -1057,6 +1057,7 @@
    1.15  with_update_version
    1.16  with_user_release_suffix
    1.17  with_build_number
    1.18 +with_vendor_name
    1.19  with_copyright_year
    1.20  with_boot_jdk
    1.21  with_boot_jdk_jvmargs
    1.22 @@ -1890,6 +1891,7 @@
    1.23                            Add a custom string to the version string if build
    1.24                            number isn't set.[username_builddateb00]
    1.25    --with-build-number     Set build number value for build [b00]
    1.26 +  --with-vendor-name      Set vendor name [not specified]
    1.27    --with-copyright-year   Set copyright year value for build [current year]
    1.28    --with-boot-jdk         path to Boot JDK (used to bootstrap build) [probed]
    1.29    --with-boot-jdk-jvmargs specify JVM arguments to be passed to all
    1.30 @@ -4358,7 +4360,7 @@
    1.31  #CUSTOM_AUTOCONF_INCLUDE
    1.32  
    1.33  # Do not change or remove the following line, it is needed for consistency checks:
    1.34 -DATE_WHEN_GENERATED=1552344461
    1.35 +DATE_WHEN_GENERATED=1552671404
    1.36  
    1.37  ###############################################################################
    1.38  #
    1.39 @@ -19871,6 +19873,21 @@
    1.40  
    1.41  
    1.42  
    1.43 +  # The vendor name, if any
    1.44 +
    1.45 +# Check whether --with-vendor-name was given.
    1.46 +if test "${with_vendor_name+set}" = set; then :
    1.47 +  withval=$with_vendor_name;
    1.48 +fi
    1.49 +
    1.50 +  if test "x$with_vendor_name" = xyes; then
    1.51 +    as_fn_error $? "--with-vendor-name must have a value" "$LINENO" 5
    1.52 +  elif  ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ; then
    1.53 +    as_fn_error $? "--with--vendor-name contains non-printing characters: $with_vendor_name" "$LINENO" 5
    1.54 +  else
    1.55 +    COMPANY_NAME="$with_vendor_name"
    1.56 +  fi
    1.57 +
    1.58  
    1.59  
    1.60  # Check whether --with-copyright-year was given.
     2.1 --- a/common/autoconf/jdk-options.m4	Mon Mar 18 08:33:19 2019 +0100
     2.2 +++ b/common/autoconf/jdk-options.m4	Wed Mar 20 16:32:54 2019 +0000
     2.3 @@ -509,10 +509,21 @@
     2.4    AC_SUBST(PRODUCT_NAME)
     2.5    AC_SUBST(PRODUCT_SUFFIX)
     2.6    AC_SUBST(JDK_RC_PLATFORM_NAME)
     2.7 -  AC_SUBST(COMPANY_NAME)
     2.8    AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
     2.9    AC_SUBST(MACOSX_BUNDLE_ID_BASE)
    2.10  
    2.11 +  # The vendor name, if any
    2.12 +  AC_ARG_WITH(vendor-name, [AS_HELP_STRING([--with-vendor-name],
    2.13 +      [Set vendor name @<:@not specified@:>@])])
    2.14 +  if test "x$with_vendor_name" = xyes; then
    2.15 +    AC_MSG_ERROR([--with-vendor-name must have a value])
    2.16 +  elif [ ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ]; then
    2.17 +    AC_MSG_ERROR([--with--vendor-name contains non-printing characters: $with_vendor_name])
    2.18 +  else
    2.19 +    COMPANY_NAME="$with_vendor_name"
    2.20 +  fi
    2.21 +  AC_SUBST(COMPANY_NAME)
    2.22 +
    2.23    AC_ARG_WITH(copyright-year, [AS_HELP_STRING([--with-copyright-year],
    2.24        [Set copyright year value for build @<:@current year@:>@])])
    2.25    if test "x$with_copyright_year" = xyes; then

mercurial