< prev index next >

make/autoconf/generated-configure.sh

Print this page

        

*** 885,906 **** JAVAC JAVA BOOT_JDK JAVA_CHECK JAVAC_CHECK VERSION_IS_GA VERSION_SHORT VERSION_STRING VERSION_NUMBER_FOUR_POSITIONS VERSION_NUMBER VERSION_OPT VERSION_BUILD VERSION_PRE VERSION_PATCH ! VERSION_SECURITY ! VERSION_MINOR ! VERSION_MAJOR MACOSX_BUNDLE_ID_BASE MACOSX_BUNDLE_NAME_BASE HOTSPOT_VM_DISTRO COMPANY_NAME JDK_RC_PLATFORM_NAME --- 885,908 ---- JAVAC JAVA BOOT_JDK JAVA_CHECK JAVAC_CHECK + VENDOR_VERSION_STRING + VERSION_DATE VERSION_IS_GA VERSION_SHORT VERSION_STRING VERSION_NUMBER_FOUR_POSITIONS VERSION_NUMBER VERSION_OPT VERSION_BUILD 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
*** 1091,1100 **** --- 1093,1103 ---- htmldir infodir docdir oldincludedir includedir + runstatedir localstatedir sharedstatedir sysconfdir datadir datarootdir
*** 1141,1158 **** enable_keep_packaged_modules with_milestone with_update_version with_user_release_suffix with_build_number with_version_string with_version_pre with_version_opt with_version_build ! with_version_major ! with_version_minor ! with_version_security with_version_patch with_boot_jdk with_build_jdk with_import_modules enable_static_build with_toolchain_type --- 1144,1166 ---- enable_keep_packaged_modules with_milestone with_update_version with_user_release_suffix with_build_number + with_version_major + with_version_minor + with_version_security with_version_string with_version_pre with_version_opt with_version_build ! with_version_feature ! with_version_interim ! with_version_update with_version_patch + with_version_date + with_vendor_version_string with_boot_jdk with_build_jdk with_import_modules enable_static_build with_toolchain_type
*** 1375,1384 **** --- 1383,1393 ---- datarootdir='${prefix}/share' datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' + runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' infodir='${datarootdir}/info' htmldir='${docdir}'
*** 1627,1636 **** --- 1636,1654 ---- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ | --sbi=* | --sb=*) sbindir=$ac_optarg ;;
*** 1764,1774 **** # Check all directory arguments for consistency. for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ ! libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. case $ac_val in */ ) --- 1782,1792 ---- # Check all directory arguments for consistency. for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ ! libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. case $ac_val in */ )
*** 1917,1926 **** --- 1935,1945 ---- --sbindir=DIR system admin executables [EPREFIX/sbin] --libexecdir=DIR program executables [EPREFIX/libexec] --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
*** 2058,2082 **** --with-user-release-suffix Deprecated. Option is kept for backwards compatibility and is ignored --with-build-number Deprecated. Option is kept for backwards compatibility and is ignored --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>] --with-version-build Set version 'BUILD' field (build number) [not specified] ! --with-version-major Set version 'MAJOR' field (first number) [current source value] ! --with-version-minor Set version 'MINOR' field (second number) [current source value] ! --with-version-security Set version 'SECURITY' field (third number) [current source value] --with-version-patch Set version 'PATCH' field (fourth number) [not specified] --with-boot-jdk path to Boot JDK (used to bootstrap build) [probed] --with-build-jdk path to JDK of same version as is being built[the newly built JDK] --with-import-modules import a set of prebuilt modules either as a zip file or an exploded directory --- 2077,2110 ---- --with-user-release-suffix Deprecated. Option is kept for backwards compatibility and is ignored --with-build-number Deprecated. Option is kept for backwards compatibility and is ignored + --with-version-major Deprecated. Option is kept for backwards + 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-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>] --with-version-build Set version 'BUILD' field (build number) [not specified] ! --with-version-feature Set version 'FEATURE' field (first number) [current source value] ! --with-version-interim Set version 'INTERIM' field (second number) [current source value] ! --with-version-update Set version 'UPDATE' field (third number) [current source value] --with-version-patch Set version 'PATCH' field (fourth number) [not specified] + --with-version-date Set version date [current source value] + --with-vendor-version-string + Set vendor version string [not specified] --with-boot-jdk path to Boot JDK (used to bootstrap build) [probed] --with-build-jdk path to JDK of same version as is being built[the newly built JDK] --with-import-modules import a set of prebuilt modules either as a zip file or an exploded directory
*** 5157,5167 **** # 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=1512410983 ############################################################################### # # 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=1512489240 ############################################################################### # # Initialization / Boot-strapping #
*** 25002,25011 **** --- 25030,25066 ---- $as_echo "$as_me: WARNING: Option --with-build-number is deprecated and will be ignored." >&2;} fi + + # Check whether --with-version-major was given. + if test "${with_version_major+set}" = set; then : + withval=$with_version_major; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-version-major is deprecated and will be ignored." >&5 + $as_echo "$as_me: WARNING: Option --with-version-major is deprecated and will be ignored." >&2;} + fi + + + + + # Check whether --with-version-minor was given. + if test "${with_version_minor+set}" = set; then : + withval=$with_version_minor; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-version-minor is deprecated and will be ignored." >&5 + $as_echo "$as_me: WARNING: Option --with-version-minor is deprecated and will be ignored." >&2;} + fi + + + + + # Check whether --with-version-security was given. + if test "${with_version_security+set}" = set; then : + withval=$with_version_security; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-version-security is deprecated and will be ignored." >&5 + $as_echo "$as_me: WARNING: Option --with-version-security is deprecated and will be ignored." >&2;} + fi + + + # Source the version numbers file . $AUTOCONF_DIR/version-numbers # Some non-version number information is set in that file
*** 25030,25053 **** if test "x$with_version_string" = xyes; then as_fn_error $? "--with-version-string must have a value" "$LINENO" 5 elif test "x$with_version_string" != x; then # Additional [] needed to keep m4 from mangling shell constructs. if [[ $with_version_string =~ ^([0-9]+)(\.([0-9]+))?(\.([0-9]+))?(\.([0-9]+))?(-([a-zA-Z]+))?((\+)([0-9]+)?(-([-a-zA-Z0-9.]+))?)?$ ]] ; then ! VERSION_MAJOR=${BASH_REMATCH[1]} ! VERSION_MINOR=${BASH_REMATCH[3]} ! VERSION_SECURITY=${BASH_REMATCH[5]} VERSION_PATCH=${BASH_REMATCH[7]} VERSION_PRE=${BASH_REMATCH[9]} version_plus_separator=${BASH_REMATCH[11]} VERSION_BUILD=${BASH_REMATCH[12]} VERSION_OPT=${BASH_REMATCH[14]} # Unspecified numerical fields are interpreted as 0. ! if test "x$VERSION_MINOR" = x; then ! VERSION_MINOR=0 fi ! if test "x$VERSION_SECURITY" = x; then ! VERSION_SECURITY=0 fi if test "x$VERSION_PATCH" = x; then VERSION_PATCH=0 fi if test "x$version_plus_separator" != x \ --- 25085,25108 ---- if test "x$with_version_string" = xyes; then as_fn_error $? "--with-version-string must have a value" "$LINENO" 5 elif test "x$with_version_string" != x; then # Additional [] needed to keep m4 from mangling shell constructs. if [[ $with_version_string =~ ^([0-9]+)(\.([0-9]+))?(\.([0-9]+))?(\.([0-9]+))?(-([a-zA-Z]+))?((\+)([0-9]+)?(-([-a-zA-Z0-9.]+))?)?$ ]] ; then ! VERSION_FEATURE=${BASH_REMATCH[1]} ! VERSION_INTERIM=${BASH_REMATCH[3]} ! VERSION_UPDATE=${BASH_REMATCH[5]} VERSION_PATCH=${BASH_REMATCH[7]} VERSION_PRE=${BASH_REMATCH[9]} version_plus_separator=${BASH_REMATCH[11]} VERSION_BUILD=${BASH_REMATCH[12]} VERSION_OPT=${BASH_REMATCH[14]} # Unspecified numerical fields are interpreted as 0. ! if test "x$VERSION_INTERIM" = x; then ! VERSION_INTERIM=0 fi ! if test "x$VERSION_UPDATE" = x; then ! VERSION_UPDATE=0 fi if test "x$VERSION_PATCH" = x; then VERSION_PATCH=0 fi if test "x$version_plus_separator" != x \
*** 25172,25313 **** VERSION_BUILD=0 fi fi ! # Check whether --with-version-major was given. ! if test "${with_version_major+set}" = set; then : ! withval=$with_version_major; with_version_major_present=true else ! with_version_major_present=false fi ! if test "x$with_version_major_present" = xtrue; then ! if test "x$with_version_major" = xyes; then ! as_fn_error $? "--with-version-major must have a value" "$LINENO" 5 else # Additional [] needed to keep m4 from mangling shell constructs. ! if ! [[ "$with_version_major" =~ ^0*([1-9][0-9]*)|(0)$ ]] ; then ! as_fn_error $? "\"$with_version_major\" is not a valid numerical value for VERSION_MAJOR" "$LINENO" 5 fi # Extract the version number without leading zeros. cleaned_value=${BASH_REMATCH[1]} if test "x$cleaned_value" = x; then # Special case for zero cleaned_value=${BASH_REMATCH[2]} fi if test $cleaned_value -gt 255; then ! as_fn_error $? "VERSION_MAJOR is given as $with_version_major. This is greater than 255 which is not allowed." "$LINENO" 5 fi ! if test "x$cleaned_value" != "x$with_version_major"; then ! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Value for VERSION_MAJOR has been sanitized from '$with_version_major' to '$cleaned_value'" >&5 ! $as_echo "$as_me: WARNING: Value for VERSION_MAJOR has been sanitized from '$with_version_major' to '$cleaned_value'" >&2;} fi ! VERSION_MAJOR=$cleaned_value fi else if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then # Default is to get value from version-numbers ! VERSION_MAJOR="$DEFAULT_VERSION_MAJOR" fi fi ! # Check whether --with-version-minor was given. ! if test "${with_version_minor+set}" = set; then : ! withval=$with_version_minor; with_version_minor_present=true else ! with_version_minor_present=false fi ! if test "x$with_version_minor_present" = xtrue; then ! if test "x$with_version_minor" = xyes; then ! as_fn_error $? "--with-version-minor must have a value" "$LINENO" 5 ! elif test "x$with_version_minor" = xno; then # Interpret --without-* as empty string (i.e. 0) instead of the literal "no" ! VERSION_MINOR=0 ! elif test "x$with_version_minor" = x; then ! VERSION_MINOR=0 else # Additional [] needed to keep m4 from mangling shell constructs. ! if ! [[ "$with_version_minor" =~ ^0*([1-9][0-9]*)|(0)$ ]] ; then ! as_fn_error $? "\"$with_version_minor\" is not a valid numerical value for VERSION_MINOR" "$LINENO" 5 fi # Extract the version number without leading zeros. cleaned_value=${BASH_REMATCH[1]} if test "x$cleaned_value" = x; then # Special case for zero cleaned_value=${BASH_REMATCH[2]} fi if test $cleaned_value -gt 255; then ! as_fn_error $? "VERSION_MINOR is given as $with_version_minor. This is greater than 255 which is not allowed." "$LINENO" 5 fi ! if test "x$cleaned_value" != "x$with_version_minor"; then ! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Value for VERSION_MINOR has been sanitized from '$with_version_minor' to '$cleaned_value'" >&5 ! $as_echo "$as_me: WARNING: Value for VERSION_MINOR has been sanitized from '$with_version_minor' to '$cleaned_value'" >&2;} fi ! VERSION_MINOR=$cleaned_value fi else if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then # Default is 0, if unspecified ! VERSION_MINOR=$DEFAULT_VERSION_MINOR fi fi ! # Check whether --with-version-security was given. ! if test "${with_version_security+set}" = set; then : ! withval=$with_version_security; with_version_security_present=true else ! with_version_security_present=false fi ! if test "x$with_version_security_present" = xtrue; then ! if test "x$with_version_security" = xyes; then ! as_fn_error $? "--with-version-security must have a value" "$LINENO" 5 ! elif test "x$with_version_security" = xno; then # Interpret --without-* as empty string (i.e. 0) instead of the literal "no" ! VERSION_SECURITY=0 ! elif test "x$with_version_security" = x; then ! VERSION_SECURITY=0 else # Additional [] needed to keep m4 from mangling shell constructs. ! if ! [[ "$with_version_security" =~ ^0*([1-9][0-9]*)|(0)$ ]] ; then ! as_fn_error $? "\"$with_version_security\" is not a valid numerical value for VERSION_SECURITY" "$LINENO" 5 fi # Extract the version number without leading zeros. cleaned_value=${BASH_REMATCH[1]} if test "x$cleaned_value" = x; then # Special case for zero cleaned_value=${BASH_REMATCH[2]} fi if test $cleaned_value -gt 255; then ! as_fn_error $? "VERSION_SECURITY is given as $with_version_security. This is greater than 255 which is not allowed." "$LINENO" 5 fi ! if test "x$cleaned_value" != "x$with_version_security"; then ! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Value for VERSION_SECURITY has been sanitized from '$with_version_security' to '$cleaned_value'" >&5 ! $as_echo "$as_me: WARNING: Value for VERSION_SECURITY has been sanitized from '$with_version_security' to '$cleaned_value'" >&2;} fi ! VERSION_SECURITY=$cleaned_value fi else if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then # Default is 0, if unspecified ! VERSION_SECURITY=$DEFAULT_VERSION_SECURITY fi fi # Check whether --with-version-patch was given. --- 25227,25368 ---- VERSION_BUILD=0 fi fi ! # Check whether --with-version-feature was given. ! if test "${with_version_feature+set}" = set; then : ! withval=$with_version_feature; with_version_feature_present=true else ! with_version_feature_present=false fi ! if test "x$with_version_feature_present" = xtrue; then ! if test "x$with_version_feature" = xyes; then ! as_fn_error $? "--with-version-feature must have a value" "$LINENO" 5 else # Additional [] needed to keep m4 from mangling shell constructs. ! if ! [[ "$with_version_feature" =~ ^0*([1-9][0-9]*)|(0)$ ]] ; then ! as_fn_error $? "\"$with_version_feature\" is not a valid numerical value for VERSION_FEATURE" "$LINENO" 5 fi # Extract the version number without leading zeros. cleaned_value=${BASH_REMATCH[1]} if test "x$cleaned_value" = x; then # Special case for zero cleaned_value=${BASH_REMATCH[2]} fi if test $cleaned_value -gt 255; then ! as_fn_error $? "VERSION_FEATURE is given as $with_version_feature. This is greater than 255 which is not allowed." "$LINENO" 5 fi ! if test "x$cleaned_value" != "x$with_version_feature"; then ! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Value for VERSION_FEATURE has been sanitized from '$with_version_feature' to '$cleaned_value'" >&5 ! $as_echo "$as_me: WARNING: Value for VERSION_FEATURE has been sanitized from '$with_version_feature' to '$cleaned_value'" >&2;} fi ! VERSION_FEATURE=$cleaned_value fi else if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then # Default is to get value from version-numbers ! VERSION_FEATURE="$DEFAULT_VERSION_FEATURE" fi fi ! # Check whether --with-version-interim was given. ! if test "${with_version_interim+set}" = set; then : ! withval=$with_version_interim; with_version_interim_present=true else ! with_version_interim_present=false fi ! if test "x$with_version_interim_present" = xtrue; then ! if test "x$with_version_interim" = xyes; then ! as_fn_error $? "--with-version-interim must have a value" "$LINENO" 5 ! elif test "x$with_version_interim" = xno; then # Interpret --without-* as empty string (i.e. 0) instead of the literal "no" ! VERSION_INTERIM=0 ! elif test "x$with_version_interim" = x; then ! VERSION_INTERIM=0 else # Additional [] needed to keep m4 from mangling shell constructs. ! if ! [[ "$with_version_interim" =~ ^0*([1-9][0-9]*)|(0)$ ]] ; then ! as_fn_error $? "\"$with_version_interim\" is not a valid numerical value for VERSION_INTERIM" "$LINENO" 5 fi # Extract the version number without leading zeros. cleaned_value=${BASH_REMATCH[1]} if test "x$cleaned_value" = x; then # Special case for zero cleaned_value=${BASH_REMATCH[2]} fi if test $cleaned_value -gt 255; then ! as_fn_error $? "VERSION_INTERIM is given as $with_version_interim. This is greater than 255 which is not allowed." "$LINENO" 5 fi ! if test "x$cleaned_value" != "x$with_version_interim"; then ! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Value for VERSION_INTERIM has been sanitized from '$with_version_interim' to '$cleaned_value'" >&5 ! $as_echo "$as_me: WARNING: Value for VERSION_INTERIM has been sanitized from '$with_version_interim' to '$cleaned_value'" >&2;} fi ! VERSION_INTERIM=$cleaned_value fi else if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then # Default is 0, if unspecified ! VERSION_INTERIM=$DEFAULT_VERSION_INTERIM fi fi ! # Check whether --with-version-update was given. ! if test "${with_version_update+set}" = set; then : ! withval=$with_version_update; with_version_update_present=true else ! with_version_update_present=false fi ! if test "x$with_version_update_present" = xtrue; then ! if test "x$with_version_update" = xyes; then ! as_fn_error $? "--with-version-update must have a value" "$LINENO" 5 ! elif test "x$with_version_update" = xno; then # Interpret --without-* as empty string (i.e. 0) instead of the literal "no" ! VERSION_UPDATE=0 ! elif test "x$with_version_update" = x; then ! VERSION_UPDATE=0 else # Additional [] needed to keep m4 from mangling shell constructs. ! if ! [[ "$with_version_update" =~ ^0*([1-9][0-9]*)|(0)$ ]] ; then ! as_fn_error $? "\"$with_version_update\" is not a valid numerical value for VERSION_UPDATE" "$LINENO" 5 fi # Extract the version number without leading zeros. cleaned_value=${BASH_REMATCH[1]} if test "x$cleaned_value" = x; then # Special case for zero cleaned_value=${BASH_REMATCH[2]} fi if test $cleaned_value -gt 255; then ! as_fn_error $? "VERSION_UPDATE is given as $with_version_update. This is greater than 255 which is not allowed." "$LINENO" 5 fi ! if test "x$cleaned_value" != "x$with_version_update"; then ! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Value for VERSION_UPDATE has been sanitized from '$with_version_update' to '$cleaned_value'" >&5 ! $as_echo "$as_me: WARNING: Value for VERSION_UPDATE has been sanitized from '$with_version_update' to '$cleaned_value'" >&2;} fi ! VERSION_UPDATE=$cleaned_value fi else if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then # Default is 0, if unspecified ! VERSION_UPDATE=$DEFAULT_VERSION_UPDATE fi fi # Check whether --with-version-patch was given.
*** 25364,25374 **** else VERSION_IS_GA=false fi # VERSION_NUMBER but always with exactly 4 positions, with 0 for empty positions. ! VERSION_NUMBER_FOUR_POSITIONS=$VERSION_MAJOR.$VERSION_MINOR.$VERSION_SECURITY.$VERSION_PATCH stripped_version_number=$VERSION_NUMBER_FOUR_POSITIONS # Strip trailing zeroes from stripped_version_number for i in 1 2 3 ; do stripped_version_number=${stripped_version_number%.0} ; done VERSION_NUMBER=$stripped_version_number --- 25419,25429 ---- else VERSION_IS_GA=false fi # VERSION_NUMBER but always with exactly 4 positions, with 0 for empty positions. ! VERSION_NUMBER_FOUR_POSITIONS=$VERSION_FEATURE.$VERSION_INTERIM.$VERSION_UPDATE.$VERSION_PATCH stripped_version_number=$VERSION_NUMBER_FOUR_POSITIONS # Strip trailing zeroes from stripped_version_number for i in 1 2 3 ; do stripped_version_number=${stripped_version_number%.0} ; done VERSION_NUMBER=$stripped_version_number
*** 25382,25391 **** --- 25437,25480 ---- fi # The short version string, just VERSION_NUMBER and PRE, if present. VERSION_SHORT=$VERSION_NUMBER${VERSION_PRE:+-$VERSION_PRE} + # The version date + + # Check whether --with-version-date was given. + if test "${with_version_date+set}" = set; then : + withval=$with_version_date; + fi + + if test "x$with_version_date" = xyes; then + as_fn_error $? "--with-version-date must have a value" "$LINENO" 5 + elif test "x$with_version_date" != x; then + if ! [[ $with_version_date =~ ^[0-9]{4}-[0-9]{2}-[0-9]{2}$ ]] ; then + as_fn_error $? "\"$with_version_date\" is not a valid version date" "$LINENO" 5 + else + VERSION_DATE="$with_version_date" + fi + else + VERSION_DATE="$DEFAULT_VERSION_DATE" + fi + + # The vendor version string, if any + + # Check whether --with-vendor-version-string was given. + if test "${with_vendor_version_string+set}" = set; then : + withval=$with_vendor_version_string; + fi + + if test "x$with_vendor_version_string" = xyes; then + as_fn_error $? "--with-vendor-version-string must have a value" "$LINENO" 5 + elif ! [[ $with_vendor_version_string =~ ^[[:graph:]]*$ ]] ; then + as_fn_error $? "--with--vendor-version-string contains non-graphical characters: $with_vendor_version_string" "$LINENO" 5 + else + VENDOR_VERSION_STRING="$with_vendor_version_string" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version string" >&5 $as_echo_n "checking for version string... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VERSION_STRING" >&5 $as_echo "$VERSION_STRING" >&6; }
*** 25401,25410 **** --- 25490,25501 ---- + + ############################################################################### # # Setup BootJDK, used to bootstrap the build. # ###############################################################################
*** 50667,50677 **** -D\"JDK_VERSION_STRING=\$(VERSION_STRING)\" \ -D\"JDK_COMPANY=\$(COMPANY_NAME)\" \ -D\"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \ -D\"JDK_VER=\$(VERSION_NUMBER)\" \ -D\"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \ ! -D\"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(VERSION_MAJOR)\" \ -D\"JDK_FVER=\$(subst .,\$(COMMA),\$(VERSION_NUMBER_FOUR_POSITIONS))\"" JVM_RCFLAGS="$JVM_RCFLAGS \ -D\"HS_BUILD_ID=\$(VERSION_STRING)\" \ -D\"HS_COMPANY=\$(COMPANY_NAME)\" \ --- 50758,50768 ---- -D\"JDK_VERSION_STRING=\$(VERSION_STRING)\" \ -D\"JDK_COMPANY=\$(COMPANY_NAME)\" \ -D\"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \ -D\"JDK_VER=\$(VERSION_NUMBER)\" \ -D\"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \ ! -D\"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(VERSION_FEATURE)\" \ -D\"JDK_FVER=\$(subst .,\$(COMMA),\$(VERSION_NUMBER_FOUR_POSITIONS))\"" JVM_RCFLAGS="$JVM_RCFLAGS \ -D\"HS_BUILD_ID=\$(VERSION_STRING)\" \ -D\"HS_COMPANY=\$(COMPANY_NAME)\" \
< prev index next >