1.1 --- a/common/autoconf/jdk-options.m4 Sun Dec 30 12:15:02 2012 +0100
1.2 +++ b/common/autoconf/jdk-options.m4 Tue Jan 01 14:13:18 2013 +0100
1.3 @@ -376,6 +376,25 @@
1.4 if test "x$OPENJDK" = "xfalse"; then
1.5 . $AUTOCONF_DIR/closed.version.numbers
1.6 fi
1.7 +
1.8 +AC_ARG_WITH(milestone, [AS_HELP_STRING([--with-milestone],
1.9 + [Set milestone value for build @<:@internal@:>@])])
1.10 +if test "x$with_milestone" = xyes; then
1.11 + AC_MSG_ERROR([Milestone must have a value])
1.12 +elif test "x$with_milestone" != x; then
1.13 + MILESTONE="$with_milestone"
1.14 +else
1.15 + MILESTONE=internal
1.16 +fi
1.17 +
1.18 +AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number],
1.19 + [Set build number value for build @<:@b00@:>@])])
1.20 +if test "x$with_build_number" = xyes; then
1.21 + AC_MSG_ERROR([Build number must have a value])
1.22 +elif test "x$with_build_number" != x; then
1.23 + JDK_BUILD_NUMBER="$with_build_number"
1.24 +fi
1.25 +
1.26 # Now set the JDK version, milestone, build number etc.
1.27 AC_SUBST(JDK_MAJOR_VERSION)
1.28 AC_SUBST(JDK_MINOR_VERSION)
1.29 @@ -404,24 +423,12 @@
1.30 fi
1.31 AC_SUBST(JDK_VERSION)
1.32
1.33 -if test "x$MILESTONE" != x; then
1.34 - RELEASE="${JDK_VERSION}-${MILESTONE}${BUILD_VARIANT_RELEASE}"
1.35 -else
1.36 - RELEASE="${JDK_VERSION}${BUILD_VARIANT_RELEASE}"
1.37 -fi
1.38 -AC_SUBST(RELEASE)
1.39 +BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
1.40 +# Avoid [:alnum:] since it depends on the locale.
1.41 +CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'`
1.42 +USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.43 +AC_SUBST(USER_RELEASE_SUFFIX)
1.44
1.45 -if test "x$JDK_BUILD_NUMBER" != x; then
1.46 - FULL_VERSION="${RELEASE}-${JDK_BUILD_NUMBER}"
1.47 -else
1.48 - JDK_BUILD_NUMBER=b00
1.49 - BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
1.50 - # Avoid [:alnum:] since it depends on the locale.
1.51 - CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'`
1.52 - USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.53 - FULL_VERSION="${RELEASE}-${USER_RELEASE_SUFFIX}-${JDK_BUILD_NUMBER}"
1.54 -fi
1.55 -AC_SUBST(FULL_VERSION)
1.56 COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
1.57 AC_SUBST(COOKED_BUILD_NUMBER)
1.58 ])
