1.1 --- a/common/autoconf/jdk-options.m4 Tue Jan 01 14:13:18 2013 +0100
1.2 +++ b/common/autoconf/jdk-options.m4 Wed Jan 02 11:29:29 2013 +0100
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 #
1.9 # This code is free software; you can redistribute it and/or modify it
1.10 @@ -369,14 +369,16 @@
1.11 AC_SUBST(COMPRESS_JARS)
1.12 ])
1.13
1.14 +###############################################################################
1.15 +#
1.16 +# Setup version numbers
1.17 +#
1.18 AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VERSION_NUMBERS],
1.19 [
1.20 # Source the version numbers
1.21 -. $AUTOCONF_DIR/version.numbers
1.22 -if test "x$OPENJDK" = "xfalse"; then
1.23 - . $AUTOCONF_DIR/closed.version.numbers
1.24 -fi
1.25 +. $AUTOCONF_DIR/version-numbers
1.26
1.27 +# Get the settings from parameters
1.28 AC_ARG_WITH(milestone, [AS_HELP_STRING([--with-milestone],
1.29 [Set milestone value for build @<:@internal@:>@])])
1.30 if test "x$with_milestone" = xyes; then
1.31 @@ -394,6 +396,9 @@
1.32 elif test "x$with_build_number" != x; then
1.33 JDK_BUILD_NUMBER="$with_build_number"
1.34 fi
1.35 +if test "x$JDK_BUILD_NUMBER" = x; then
1.36 + JDK_BUILD_NUMBER=b00
1.37 +fi
1.38
1.39 # Now set the JDK version, milestone, build number etc.
1.40 AC_SUBST(JDK_MAJOR_VERSION)
1.41 @@ -413,9 +418,6 @@
1.42 COPYRIGHT_YEAR=`date +'%Y'`
1.43 AC_SUBST(COPYRIGHT_YEAR)
1.44
1.45 -RUNTIME_NAME="$PRODUCT_NAME $PRODUCT_SUFFIX"
1.46 -AC_SUBST(RUNTIME_NAME)
1.47 -
1.48 if test "x$JDK_UPDATE_VERSION" != x; then
1.49 JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
1.50 else
