1.1 --- a/common/autoconf/jdk-options.m4 Tue Jan 08 13:14:22 2013 -0800
1.2 +++ b/common/autoconf/jdk-options.m4 Tue Jan 08 16:23:45 2013 -0800
1.3 @@ -382,24 +382,38 @@
1.4 AC_ARG_WITH(milestone, [AS_HELP_STRING([--with-milestone],
1.5 [Set milestone value for build @<:@internal@:>@])])
1.6 if test "x$with_milestone" = xyes; then
1.7 - AC_MSG_ERROR([Milestone must have a value])
1.8 + AC_MSG_ERROR([Milestone must have a value])
1.9 elif test "x$with_milestone" != x; then
1.10 MILESTONE="$with_milestone"
1.11 else
1.12 - MILESTONE=internal
1.13 + MILESTONE=internal
1.14 fi
1.15
1.16 AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number],
1.17 [Set build number value for build @<:@b00@:>@])])
1.18 if test "x$with_build_number" = xyes; then
1.19 - AC_MSG_ERROR([Build number must have a value])
1.20 + AC_MSG_ERROR([Build number must have a value])
1.21 elif test "x$with_build_number" != x; then
1.22 - JDK_BUILD_NUMBER="$with_build_number"
1.23 + JDK_BUILD_NUMBER="$with_build_number"
1.24 fi
1.25 if test "x$JDK_BUILD_NUMBER" = x; then
1.26 - JDK_BUILD_NUMBER=b00
1.27 + JDK_BUILD_NUMBER=b00
1.28 fi
1.29
1.30 +AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix],
1.31 + [Add a custom string to the version string if build number isn't set.@<:@username_builddateb00@:>@])])
1.32 +if test "x$with_user_release_suffix" = xyes; then
1.33 + AC_MSG_ERROR([Release suffix must have a value])
1.34 +elif test "x$with_user_release_suffix" != x; then
1.35 + USER_RELEASE_SUFFIX="$with_user_release_suffix"
1.36 +else
1.37 + BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
1.38 + # Avoid [:alnum:] since it depends on the locale.
1.39 + CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'`
1.40 + USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.41 +fi
1.42 +AC_SUBST(USER_RELEASE_SUFFIX)
1.43 +
1.44 # Now set the JDK version, milestone, build number etc.
1.45 AC_SUBST(JDK_MAJOR_VERSION)
1.46 AC_SUBST(JDK_MINOR_VERSION)
1.47 @@ -419,18 +433,12 @@
1.48 AC_SUBST(COPYRIGHT_YEAR)
1.49
1.50 if test "x$JDK_UPDATE_VERSION" != x; then
1.51 - JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
1.52 + JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
1.53 else
1.54 - JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
1.55 + JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
1.56 fi
1.57 AC_SUBST(JDK_VERSION)
1.58
1.59 -BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
1.60 -# Avoid [:alnum:] since it depends on the locale.
1.61 -CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'`
1.62 -USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.63 -AC_SUBST(USER_RELEASE_SUFFIX)
1.64 -
1.65 COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
1.66 AC_SUBST(COOKED_BUILD_NUMBER)
1.67 ])
1.68 @@ -443,7 +451,7 @@
1.69 # The name of the Service Agent jar.
1.70 SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}"
1.71 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.72 - SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}"
1.73 + SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}"
1.74 fi
1.75 AC_SUBST(SALIB_NAME)
1.76
