From db2dfb4869d0f7e78f5bc374058a7c31b4aef3df Mon Sep 17 00:00:00 2001 From: erikj Date: Tue, 4 Jun 2013 10:23:37 +0200 Subject: [PATCH] 8015784: Add configure parameter --with-update-version Reviewed-by: tbell, katleman, erikj Contributed-by: tristan.yan@oracle.com --- common/autoconf/generated-configure.sh | 16 +++++++++++++++- common/autoconf/jdk-options.m4 | 8 ++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 6922b15..b60cf9f 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -988,6 +988,7 @@ enable_hotspot_test_in_build with_cacerts_file enable_unlimited_crypto with_milestone +with_update_version with_build_number with_user_release_suffix with_boot_jdk @@ -1727,6 +1728,7 @@ Optional Packages: group --with-cacerts-file specify alternative cacerts file --with-milestone Set milestone value for build [internal] + --with-update-version Set update version value for build [b00] --with-build-number Set build number value for build [b00] --with-user-release-suffix Add a custom string to the version string if build @@ -3780,7 +3782,7 @@ fi #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1370001995 +DATE_WHEN_GENERATED=1370333982 ############################################################################### # @@ -10841,6 +10843,18 @@ if test "x$MILESTONE" = x; then fi +# Check whether --with-update-version was given. +if test "${with_update_version+set}" = set; then : + withval=$with_update_version; +fi + +if test "x$with_update_version" = xyes; then + as_fn_error $? "Update version must have a value" "$LINENO" 5 +elif test "x$with_update_version" != x; then + JDK_UPDATE_VERSION="$with_update_version" +fi + + # Check whether --with-build-number was given. if test "${with_build_number+set}" = set; then : withval=$with_build_number; diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4 index 268bd84..7f74673 100644 --- a/common/autoconf/jdk-options.m4 +++ b/common/autoconf/jdk-options.m4 @@ -422,6 +422,14 @@ if test "x$MILESTONE" = x; then MILESTONE=internal fi +AC_ARG_WITH(update-version, [AS_HELP_STRING([--with-update-version], + [Set update version value for build @<:@b00@:>@])]) +if test "x$with_update_version" = xyes; then + AC_MSG_ERROR([Update version must have a value]) +elif test "x$with_update_version" != x; then + JDK_UPDATE_VERSION="$with_update_version" +fi + AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number], [Set build number value for build @<:@b00@:>@])]) if test "x$with_build_number" = xyes; then -- GitLab