Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/autoconf/generated-configure.sh	Fri Jun 28 12:02:37 2013 +0200
     1.2 +++ b/common/autoconf/generated-configure.sh	Mon Jul 01 15:40:27 2013 +0200
     1.3 @@ -3786,7 +3786,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=1372413705
     1.8 +DATE_WHEN_GENERATED=1372685988
     1.9  
    1.10  ###############################################################################
    1.11  #
    1.12 @@ -23975,19 +23975,20 @@
    1.13          RC_FLAGS="$RC_FLAGS -d NDEBUG"
    1.14  
    1.15  fi
    1.16 -    JDK_UPDATE_VERSION_NOTNULL=$JDK_UPDATE_VERSION
    1.17 -    if test "x$JDK_UPDATE_VERSION" = x; then :
    1.18 -
    1.19 -        JDK_UPDATE_VERSION_NOTNULL=0
    1.20 -
    1.21 -fi
    1.22 -    RC_FLAGS="$RC_FLAGS -d \"JDK_BUILD_ID=$FULL_VERSION\""
    1.23 -    RC_FLAGS="$RC_FLAGS -d \"JDK_COMPANY=$COMPANY_NAME\""
    1.24 -    RC_FLAGS="$RC_FLAGS -d \"JDK_COMPONENT=$PRODUCT_NAME $JDK_RC_PLATFORM_NAME binary\""
    1.25 -    RC_FLAGS="$RC_FLAGS -d \"JDK_VER=$JDK_MINOR_VERSION.$JDK_MICRO_VERSION.$JDK_UPDATE_VERSION_NOTNULL.$COOKED_BUILD_NUMBER\""
    1.26 -    RC_FLAGS="$RC_FLAGS -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\""
    1.27 -    RC_FLAGS="$RC_FLAGS -d \"JDK_NAME=$PRODUCT_NAME $JDK_RC_PLATFORM_NAME $JDK_MINOR_VERSION $JDK_UPDATE_META_TAG\""
    1.28 -    RC_FLAGS="$RC_FLAGS -d \"JDK_FVER=$JDK_MINOR_VERSION,$JDK_MICRO_VERSION,$JDK_UPDATE_VERSION_NOTNULL,$COOKED_BUILD_NUMBER\""
    1.29 +
    1.30 +    # The version variables used to create RC_FLAGS may be overridden
    1.31 +    # in a custom configure script, or possibly the command line.
    1.32 +    # Let those variables be expanded at make time in spec.gmk.
    1.33 +    # The \$ are escaped to the shell, and the $(...) variables
    1.34 +    # are evaluated by make.
    1.35 +    RC_FLAGS="$RC_FLAGS \
    1.36 +        -d \"JDK_BUILD_ID=\$(FULL_VERSION)\" \
    1.37 +        -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \
    1.38 +        -d \"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \
    1.39 +        -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0).\$(COOKED_BUILD_NUMBER)\" \
    1.40 +        -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
    1.41 +        -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
    1.42 +        -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
    1.43  
    1.44      # lib.exe is used to create static libraries.
    1.45      # Extract the first word of "lib", so it can be a program name with args.

     2.1 --- a/common/autoconf/toolchain.m4	Fri Jun 28 12:02:37 2013 +0200
     2.2 +++ b/common/autoconf/toolchain.m4	Mon Jul 01 15:40:27 2013 +0200
     2.3 @@ -369,17 +369,20 @@
     2.4      AS_IF([test "x$VARIANT" = xOPT], [
     2.5          RC_FLAGS="$RC_FLAGS -d NDEBUG"
     2.6      ])
     2.7 -    JDK_UPDATE_VERSION_NOTNULL=$JDK_UPDATE_VERSION
     2.8 -    AS_IF([test "x$JDK_UPDATE_VERSION" = x], [
     2.9 -        JDK_UPDATE_VERSION_NOTNULL=0
    2.10 -    ])
    2.11 -    RC_FLAGS="$RC_FLAGS -d \"JDK_BUILD_ID=$FULL_VERSION\""
    2.12 -    RC_FLAGS="$RC_FLAGS -d \"JDK_COMPANY=$COMPANY_NAME\""
    2.13 -    RC_FLAGS="$RC_FLAGS -d \"JDK_COMPONENT=$PRODUCT_NAME $JDK_RC_PLATFORM_NAME binary\""
    2.14 -    RC_FLAGS="$RC_FLAGS -d \"JDK_VER=$JDK_MINOR_VERSION.$JDK_MICRO_VERSION.$JDK_UPDATE_VERSION_NOTNULL.$COOKED_BUILD_NUMBER\""
    2.15 -    RC_FLAGS="$RC_FLAGS -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\""
    2.16 -    RC_FLAGS="$RC_FLAGS -d \"JDK_NAME=$PRODUCT_NAME $JDK_RC_PLATFORM_NAME $JDK_MINOR_VERSION $JDK_UPDATE_META_TAG\""
    2.17 -    RC_FLAGS="$RC_FLAGS -d \"JDK_FVER=$JDK_MINOR_VERSION,$JDK_MICRO_VERSION,$JDK_UPDATE_VERSION_NOTNULL,$COOKED_BUILD_NUMBER\""
    2.18 +
    2.19 +    # The version variables used to create RC_FLAGS may be overridden
    2.20 +    # in a custom configure script, or possibly the command line.  
    2.21 +    # Let those variables be expanded at make time in spec.gmk.
    2.22 +    # The \$ are escaped to the shell, and the $(...) variables
    2.23 +    # are evaluated by make.
    2.24 +    RC_FLAGS="$RC_FLAGS \
    2.25 +        -d \"JDK_BUILD_ID=\$(FULL_VERSION)\" \
    2.26 +        -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \
    2.27 +        -d \"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \
    2.28 +        -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0).\$(COOKED_BUILD_NUMBER)\" \
    2.29 +        -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
    2.30 +        -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
    2.31 +        -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
    2.32  
    2.33      # lib.exe is used to create static libraries.
    2.34      AC_CHECK_PROG([WINAR], [lib],[lib],,,)