8006658: build-infra: Make MILESTONE behave the same as JDK_BUILD_NUMBER

Wed, 23 Jan 2013 11:42:29 +0100

author
erikj
date
Wed, 23 Jan 2013 11:42:29 +0100
changeset 602
0d46733cfffb
parent 601
ea6379d4624f
child 603
9e5847257731

8006658: build-infra: Make MILESTONE behave the same as JDK_BUILD_NUMBER
Reviewed-by: ohrstrom, dholmes, tbell

common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
common/autoconf/jdk-options.m4 file | annotate | diff | comparison | revisions
     1.1 --- a/common/autoconf/generated-configure.sh	Wed Jan 23 11:41:06 2013 +0100
     1.2 +++ b/common/autoconf/generated-configure.sh	Wed Jan 23 11:42:29 2013 +0100
     1.3 @@ -3723,7 +3723,7 @@
     1.4  #CUSTOM_AUTOCONF_INCLUDE
     1.5  
     1.6  # Do not change or remove the following line, it is needed for consistency checks:
     1.7 -DATE_WHEN_GENERATED=1358937404
     1.8 +DATE_WHEN_GENERATED=1358937713
     1.9  
    1.10  ###############################################################################
    1.11  #
    1.12 @@ -10778,7 +10778,8 @@
    1.13    as_fn_error $? "Milestone must have a value" "$LINENO" 5
    1.14  elif test "x$with_milestone" != x; then
    1.15      MILESTONE="$with_milestone"
    1.16 -else
    1.17 +fi
    1.18 +if test "x$MILESTONE" = x; then
    1.19    MILESTONE=internal
    1.20  fi
    1.21  
     2.1 --- a/common/autoconf/jdk-options.m4	Wed Jan 23 11:41:06 2013 +0100
     2.2 +++ b/common/autoconf/jdk-options.m4	Wed Jan 23 11:42:29 2013 +0100
     2.3 @@ -389,7 +389,8 @@
     2.4    AC_MSG_ERROR([Milestone must have a value])
     2.5  elif test "x$with_milestone" != x; then
     2.6      MILESTONE="$with_milestone"
     2.7 -else
     2.8 +fi
     2.9 +if test "x$MILESTONE" = x; then
    2.10    MILESTONE=internal
    2.11  fi
    2.12  

mercurial