1.1 --- a/common/autoconf/generated-configure.sh Sun Dec 30 12:15:02 2012 +0100
1.2 +++ b/common/autoconf/generated-configure.sh Tue Jan 01 14:13:18 2013 +0100
1.3 @@ -752,8 +752,7 @@
1.4 JAVA_CHECK
1.5 JAVAC_CHECK
1.6 COOKED_BUILD_NUMBER
1.7 -FULL_VERSION
1.8 -RELEASE
1.9 +USER_RELEASE_SUFFIX
1.10 JDK_VERSION
1.11 RUNTIME_NAME
1.12 COPYRIGHT_YEAR
1.13 @@ -969,6 +968,8 @@
1.14 enable_hotspot_test_in_build
1.15 with_cacerts_file
1.16 enable_unlimited_crypto
1.17 +with_milestone
1.18 +with_build_number
1.19 with_boot_jdk
1.20 with_boot_jdk_jvmargs
1.21 with_add_source_root
1.22 @@ -1698,6 +1699,8 @@
1.23 --with-builddeps-group chgrp the downloaded build dependencies to this
1.24 group
1.25 --with-cacerts-file specify alternative cacerts file
1.26 + --with-milestone Set milestone value for build [internal]
1.27 + --with-build-number Set build number value for build [b00]
1.28 --with-boot-jdk path to Boot JDK (used to bootstrap build) [probed]
1.29 --with-boot-jdk-jvmargs specify JVM arguments to be passed to all
1.30 invocations of the Boot JDK, overriding the default
1.31 @@ -3679,7 +3682,7 @@
1.32 #CUSTOM_AUTOCONF_INCLUDE
1.33
1.34 # Do not change or remove the following line, it is needed for consistency checks:
1.35 -DATE_WHEN_GENERATED=1356865941
1.36 +DATE_WHEN_GENERATED=1357045896
1.37
1.38 ###############################################################################
1.39 #
1.40 @@ -10608,6 +10611,33 @@
1.41 if test "x$OPENJDK" = "xfalse"; then
1.42 . $AUTOCONF_DIR/closed.version.numbers
1.43 fi
1.44 +
1.45 +
1.46 +# Check whether --with-milestone was given.
1.47 +if test "${with_milestone+set}" = set; then :
1.48 + withval=$with_milestone;
1.49 +fi
1.50 +
1.51 +if test "x$with_milestone" = xyes; then
1.52 + as_fn_error $? "Milestone must have a value" "$LINENO" 5
1.53 +elif test "x$with_milestone" != x; then
1.54 + MILESTONE="$with_milestone"
1.55 +else
1.56 + MILESTONE=internal
1.57 +fi
1.58 +
1.59 +
1.60 +# Check whether --with-build-number was given.
1.61 +if test "${with_build_number+set}" = set; then :
1.62 + withval=$with_build_number;
1.63 +fi
1.64 +
1.65 +if test "x$with_build_number" = xyes; then
1.66 + as_fn_error $? "Build number must have a value" "$LINENO" 5
1.67 +elif test "x$with_build_number" != x; then
1.68 + JDK_BUILD_NUMBER="$with_build_number"
1.69 +fi
1.70 +
1.71 # Now set the JDK version, milestone, build number etc.
1.72
1.73
1.74 @@ -10636,23 +10666,11 @@
1.75 fi
1.76
1.77
1.78 -if test "x$MILESTONE" != x; then
1.79 - RELEASE="${JDK_VERSION}-${MILESTONE}${BUILD_VARIANT_RELEASE}"
1.80 -else
1.81 - RELEASE="${JDK_VERSION}${BUILD_VARIANT_RELEASE}"
1.82 -fi
1.83 -
1.84 -
1.85 -if test "x$JDK_BUILD_NUMBER" != x; then
1.86 - FULL_VERSION="${RELEASE}-${JDK_BUILD_NUMBER}"
1.87 -else
1.88 - JDK_BUILD_NUMBER=b00
1.89 - BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
1.90 - # Avoid [:alnum:] since it depends on the locale.
1.91 - CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'`
1.92 - USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.93 - FULL_VERSION="${RELEASE}-${USER_RELEASE_SUFFIX}-${JDK_BUILD_NUMBER}"
1.94 -fi
1.95 +BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
1.96 +# Avoid [:alnum:] since it depends on the locale.
1.97 +CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'`
1.98 +USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.99 +
1.100
1.101 COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
1.102
