1.1 --- a/common/autoconf/jdk-options.m4 Mon Oct 07 13:11:40 2013 +0200
1.2 +++ b/common/autoconf/jdk-options.m4 Mon Oct 07 18:19:15 2013 +0200
1.3 @@ -426,6 +426,14 @@
1.4 JDK_UPDATE_VERSION="$with_update_version"
1.5 fi
1.6
1.7 +AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix],
1.8 + [Add a custom string to the version string if build number isn't set.@<:@username_builddateb00@:>@])])
1.9 +if test "x$with_user_release_suffix" = xyes; then
1.10 + AC_MSG_ERROR([Release suffix must have a value])
1.11 +elif test "x$with_user_release_suffix" != x; then
1.12 + USER_RELEASE_SUFFIX="$with_user_release_suffix"
1.13 +fi
1.14 +
1.15 AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number],
1.16 [Set build number value for build @<:@b00@:>@])])
1.17 if test "x$with_build_number" = xyes; then
1.18 @@ -433,25 +441,19 @@
1.19 elif test "x$with_build_number" != x; then
1.20 JDK_BUILD_NUMBER="$with_build_number"
1.21 fi
1.22 +# Define default USER_RELEASE_SUFFIX if BUILD_NUMBER and USER_RELEASE_SUFFIX are not set
1.23 if test "x$JDK_BUILD_NUMBER" = x; then
1.24 JDK_BUILD_NUMBER=b00
1.25 + if test "x$USER_RELEASE_SUFFIX" = x; then
1.26 + BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
1.27 + # Avoid [:alnum:] since it depends on the locale.
1.28 + CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'`
1.29 + USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.30 + fi
1.31 fi
1.32
1.33 -AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix],
1.34 - [Add a custom string to the version string if build number isn't set.@<:@username_builddateb00@:>@])])
1.35 -if test "x$with_user_release_suffix" = xyes; then
1.36 - AC_MSG_ERROR([Release suffix must have a value])
1.37 -elif test "x$with_user_release_suffix" != x; then
1.38 - USER_RELEASE_SUFFIX="$with_user_release_suffix"
1.39 -else
1.40 - BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
1.41 - # Avoid [:alnum:] since it depends on the locale.
1.42 - CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'`
1.43 - USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.44 -fi
1.45 +# Now set the JDK version, milestone, build number etc.
1.46 AC_SUBST(USER_RELEASE_SUFFIX)
1.47 -
1.48 -# Now set the JDK version, milestone, build number etc.
1.49 AC_SUBST(JDK_MAJOR_VERSION)
1.50 AC_SUBST(JDK_MINOR_VERSION)
1.51 AC_SUBST(JDK_MICRO_VERSION)
