< prev index next >

make/autoconf/generated-configure.sh

Print this page
rev 48341 : 8193764: Cannot set COMPANY_NAME when configuring a build

*** 899,912 **** VERSION_PRE VERSION_PATCH VERSION_UPDATE VERSION_INTERIM VERSION_FEATURE MACOSX_BUNDLE_ID_BASE MACOSX_BUNDLE_NAME_BASE HOTSPOT_VM_DISTRO - COMPANY_NAME JDK_RC_PLATFORM_NAME PRODUCT_SUFFIX PRODUCT_NAME LAUNCHER_NAME JLINK_KEEP_PACKAGED_MODULES --- 899,912 ---- VERSION_PRE VERSION_PATCH VERSION_UPDATE VERSION_INTERIM VERSION_FEATURE + COMPANY_NAME MACOSX_BUNDLE_ID_BASE MACOSX_BUNDLE_NAME_BASE HOTSPOT_VM_DISTRO JDK_RC_PLATFORM_NAME PRODUCT_SUFFIX PRODUCT_NAME LAUNCHER_NAME JLINK_KEEP_PACKAGED_MODULES
*** 1145,1154 **** --- 1145,1155 ---- with_user_release_suffix with_build_number with_version_major with_version_minor with_version_security + with_vendor_name with_version_string with_version_pre with_version_opt with_version_build with_version_feature
*** 2081,2090 **** --- 2082,2092 ---- compatibility and is ignored --with-version-minor Deprecated. Option is kept for backwards compatibility and is ignored --with-version-security Deprecated. Option is kept for backwards compatibility and is ignored + --with-vendor-name Set vendor name [not specified] --with-version-string Set version string [calculated] --with-version-pre Set the base part of the version 'PRE' field (pre-release identifier) ['internal'] --with-version-opt Set version 'OPT' field (build metadata) [<timestamp>.<user>.<dirname>]
*** 5183,5193 **** # definitions. It is replaced with custom functionality when building # custom sources. #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: ! DATE_WHEN_GENERATED=1513206608 ############################################################################### # # Initialization / Boot-strapping # --- 5185,5195 ---- # definitions. It is replaced with custom functionality when building # custom sources. #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: ! DATE_WHEN_GENERATED=1513630820 ############################################################################### # # Initialization / Boot-strapping #
*** 25053,25062 **** --- 25055,25079 ---- + # 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 + # Override version from arguments # If --with-version-string is set, process it first. It is possible to # override parts with more specific flags, since these are processed later.
< prev index next >