Tue, 04 Jun 2013 10:23:37 +0200
8015784: Add configure parameter --with-update-version
Reviewed-by: tbell, katleman, erikj
Contributed-by: tristan.yan@oracle.com
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 Fri May 31 14:07:42 2013 +0200 1.2 +++ b/common/autoconf/generated-configure.sh Tue Jun 04 10:23:37 2013 +0200 1.3 @@ -988,6 +988,7 @@ 1.4 with_cacerts_file 1.5 enable_unlimited_crypto 1.6 with_milestone 1.7 +with_update_version 1.8 with_build_number 1.9 with_user_release_suffix 1.10 with_boot_jdk 1.11 @@ -1727,6 +1728,7 @@ 1.12 group 1.13 --with-cacerts-file specify alternative cacerts file 1.14 --with-milestone Set milestone value for build [internal] 1.15 + --with-update-version Set update version value for build [b00] 1.16 --with-build-number Set build number value for build [b00] 1.17 --with-user-release-suffix 1.18 Add a custom string to the version string if build 1.19 @@ -3780,7 +3782,7 @@ 1.20 #CUSTOM_AUTOCONF_INCLUDE 1.21 1.22 # Do not change or remove the following line, it is needed for consistency checks: 1.23 -DATE_WHEN_GENERATED=1370001995 1.24 +DATE_WHEN_GENERATED=1370333982 1.25 1.26 ############################################################################### 1.27 # 1.28 @@ -10841,6 +10843,18 @@ 1.29 fi 1.30 1.31 1.32 +# Check whether --with-update-version was given. 1.33 +if test "${with_update_version+set}" = set; then : 1.34 + withval=$with_update_version; 1.35 +fi 1.36 + 1.37 +if test "x$with_update_version" = xyes; then 1.38 + as_fn_error $? "Update version must have a value" "$LINENO" 5 1.39 +elif test "x$with_update_version" != x; then 1.40 + JDK_UPDATE_VERSION="$with_update_version" 1.41 +fi 1.42 + 1.43 + 1.44 # Check whether --with-build-number was given. 1.45 if test "${with_build_number+set}" = set; then : 1.46 withval=$with_build_number;
2.1 --- a/common/autoconf/jdk-options.m4 Fri May 31 14:07:42 2013 +0200 2.2 +++ b/common/autoconf/jdk-options.m4 Tue Jun 04 10:23:37 2013 +0200 2.3 @@ -422,6 +422,14 @@ 2.4 MILESTONE=internal 2.5 fi 2.6 2.7 +AC_ARG_WITH(update-version, [AS_HELP_STRING([--with-update-version], 2.8 + [Set update version value for build @<:@b00@:>@])]) 2.9 +if test "x$with_update_version" = xyes; then 2.10 + AC_MSG_ERROR([Update version must have a value]) 2.11 +elif test "x$with_update_version" != x; then 2.12 + JDK_UPDATE_VERSION="$with_update_version" 2.13 +fi 2.14 + 2.15 AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number], 2.16 [Set build number value for build @<:@b00@:>@])]) 2.17 if test "x$with_build_number" = xyes; then