8006658: build-infra: Make MILESTONE behave the same as JDK_BUILD_NUMBER
authorerikj
Wed, 23 Jan 2013 11:42:29 +0100
changeset 15180 ec560ee3d64c
parent 15179 d5be3992e87e
child 15181 d2da3d97c999
8006658: build-infra: Make MILESTONE behave the same as JDK_BUILD_NUMBER Reviewed-by: ohrstrom, dholmes, tbell
common/autoconf/generated-configure.sh
common/autoconf/jdk-options.m4
--- a/common/autoconf/generated-configure.sh	Wed Jan 23 11:41:06 2013 +0100
+++ b/common/autoconf/generated-configure.sh	Wed Jan 23 11:42:29 2013 +0100
@@ -3723,7 +3723,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1358937404
+DATE_WHEN_GENERATED=1358937713
 
 ###############################################################################
 #
@@ -10778,7 +10778,8 @@
   as_fn_error $? "Milestone must have a value" "$LINENO" 5
 elif test "x$with_milestone" != x; then
     MILESTONE="$with_milestone"
-else
+fi
+if test "x$MILESTONE" = x; then
   MILESTONE=internal
 fi
 
--- a/common/autoconf/jdk-options.m4	Wed Jan 23 11:41:06 2013 +0100
+++ b/common/autoconf/jdk-options.m4	Wed Jan 23 11:42:29 2013 +0100
@@ -389,7 +389,8 @@
   AC_MSG_ERROR([Milestone must have a value])
 elif test "x$with_milestone" != x; then
     MILESTONE="$with_milestone"
-else
+fi
+if test "x$MILESTONE" = x; then
   MILESTONE=internal
 fi