Merge

Mon, 01 Apr 2019 14:28:36 +0200

author
clanger
date
Mon, 01 Apr 2019 14:28:36 +0200
changeset 2419
f6bc08715234
parent 2418
9a4af54dd074
parent 2407
5218ef8ea6c3
child 2420
0bbd2bf737bf

Merge

.hgtags file | annotate | diff | comparison | revisions
common/autoconf/spec.gmk.in file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Fri Mar 22 17:51:45 2019 +0000
     1.2 +++ b/.hgtags	Mon Apr 01 14:28:36 2019 +0200
     1.3 @@ -952,3 +952,4 @@
     1.4  3a2209a0e9c9192bc803a95fa72510a79847bf15 jdk8u212-b00
     1.5  5af73acc6b6c7097ce916c860fd85c45459ea19a jdk8u222-b00
     1.6  5af73acc6b6c7097ce916c860fd85c45459ea19a jdk8u212-b01
     1.7 +7480582c7fdcfc86b5541a1887289a8416ef7f7d jdk8u212-b02
     2.1 --- a/common/autoconf/generated-configure.sh	Fri Mar 22 17:51:45 2019 +0000
     2.2 +++ b/common/autoconf/generated-configure.sh	Mon Apr 01 14:28:36 2019 +0200
     2.3 @@ -825,9 +825,12 @@
     2.4  COOKED_JDK_UPDATE_VERSION
     2.5  JDK_VERSION
     2.6  COPYRIGHT_YEAR
     2.7 +VENDOR_URL_VM_BUG
     2.8 +VENDOR_URL_BUG
     2.9 +VENDOR_URL
    2.10 +COMPANY_NAME
    2.11  MACOSX_BUNDLE_ID_BASE
    2.12  MACOSX_BUNDLE_NAME_BASE
    2.13 -COMPANY_NAME
    2.14  JDK_RC_PLATFORM_NAME
    2.15  PRODUCT_SUFFIX
    2.16  PRODUCT_NAME
    2.17 @@ -1057,6 +1060,10 @@
    2.18  with_update_version
    2.19  with_user_release_suffix
    2.20  with_build_number
    2.21 +with_vendor_name
    2.22 +with_vendor_url
    2.23 +with_vendor_bug_url
    2.24 +with_vendor_vm_bug_url
    2.25  with_copyright_year
    2.26  with_boot_jdk
    2.27  with_boot_jdk_jvmargs
    2.28 @@ -1890,6 +1897,16 @@
    2.29                            Add a custom string to the version string if build
    2.30                            number isn't set.[username_builddateb00]
    2.31    --with-build-number     Set build number value for build [b00]
    2.32 +  --with-vendor-name      Set vendor name. Among others, used to set the
    2.33 +                          'java.vendor' and 'java.vm.vendor' system
    2.34 +                          properties. [not specified]
    2.35 +  --with-vendor-url       Set the 'java.vendor.url' system property [not
    2.36 +                          specified]
    2.37 +  --with-vendor-bug-url   Set the 'java.vendor.url.bug' system property [not
    2.38 +                          specified]
    2.39 +  --with-vendor-vm-bug-url
    2.40 +                          Sets the bug URL which will be displayed when the VM
    2.41 +                          crashes [not specified]
    2.42    --with-copyright-year   Set copyright year value for build [current year]
    2.43    --with-boot-jdk         path to Boot JDK (used to bootstrap build) [probed]
    2.44    --with-boot-jdk-jvmargs specify JVM arguments to be passed to all
    2.45 @@ -4358,7 +4375,7 @@
    2.46  #CUSTOM_AUTOCONF_INCLUDE
    2.47  
    2.48  # Do not change or remove the following line, it is needed for consistency checks:
    2.49 -DATE_WHEN_GENERATED=1552344461
    2.50 +DATE_WHEN_GENERATED=1553405262
    2.51  
    2.52  ###############################################################################
    2.53  #
    2.54 @@ -19871,6 +19888,71 @@
    2.55  
    2.56  
    2.57  
    2.58 +  # The vendor name, if any
    2.59 +
    2.60 +# Check whether --with-vendor-name was given.
    2.61 +if test "${with_vendor_name+set}" = set; then :
    2.62 +  withval=$with_vendor_name;
    2.63 +fi
    2.64 +
    2.65 +  if test "x$with_vendor_name" = xyes; then
    2.66 +    as_fn_error $? "--with-vendor-name must have a value" "$LINENO" 5
    2.67 +  elif  ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ; then
    2.68 +    as_fn_error $? "--with-vendor-name contains non-printing characters: $with_vendor_name" "$LINENO" 5
    2.69 +  elif test "x$with_vendor_name" != x; then
    2.70 +    # Only set COMPANY_NAME if '--with-vendor-name' was used and is not empty.
    2.71 +    # Otherwise we will use the value from "version-numbers" included above.
    2.72 +    COMPANY_NAME="$with_vendor_name"
    2.73 +  fi
    2.74 +
    2.75 +
    2.76 +  # The vendor URL, if any
    2.77 +
    2.78 +# Check whether --with-vendor-url was given.
    2.79 +if test "${with_vendor_url+set}" = set; then :
    2.80 +  withval=$with_vendor_url;
    2.81 +fi
    2.82 +
    2.83 +  if test "x$with_vendor_url" = xyes; then
    2.84 +    as_fn_error $? "--with-vendor-url must have a value" "$LINENO" 5
    2.85 +  elif  ! [[ $with_vendor_url =~ ^[[:print:]]*$ ]] ; then
    2.86 +    as_fn_error $? "--with-vendor-url contains non-printing characters: $with_vendor_url" "$LINENO" 5
    2.87 +  else
    2.88 +    VENDOR_URL="$with_vendor_url"
    2.89 +  fi
    2.90 +
    2.91 +
    2.92 +  # The vendor bug URL, if any
    2.93 +
    2.94 +# Check whether --with-vendor-bug-url was given.
    2.95 +if test "${with_vendor_bug_url+set}" = set; then :
    2.96 +  withval=$with_vendor_bug_url;
    2.97 +fi
    2.98 +
    2.99 +  if test "x$with_vendor_bug_url" = xyes; then
   2.100 +    as_fn_error $? "--with-vendor-bug-url must have a value" "$LINENO" 5
   2.101 +  elif  ! [[ $with_vendor_bug_url =~ ^[[:print:]]*$ ]] ; then
   2.102 +    as_fn_error $? "--with-vendor-bug-url contains non-printing characters: $with_vendor_bug_url" "$LINENO" 5
   2.103 +  else
   2.104 +    VENDOR_URL_BUG="$with_vendor_bug_url"
   2.105 +  fi
   2.106 +
   2.107 +
   2.108 +  # The vendor VM bug URL, if any
   2.109 +
   2.110 +# Check whether --with-vendor-vm-bug-url was given.
   2.111 +if test "${with_vendor_vm_bug_url+set}" = set; then :
   2.112 +  withval=$with_vendor_vm_bug_url;
   2.113 +fi
   2.114 +
   2.115 +  if test "x$with_vendor_vm_bug_url" = xyes; then
   2.116 +    as_fn_error $? "--with-vendor-vm-bug-url must have a value" "$LINENO" 5
   2.117 +  elif  ! [[ $with_vendor_vm_bug_url =~ ^[[:print:]]*$ ]] ; then
   2.118 +    as_fn_error $? "--with-vendor-vm-bug-url contains non-printing characters: $with_vendor_vm_bug_url" "$LINENO" 5
   2.119 +  else
   2.120 +    VENDOR_URL_VM_BUG="$with_vendor_vm_bug_url"
   2.121 +  fi
   2.122 +
   2.123  
   2.124  
   2.125  # Check whether --with-copyright-year was given.
     3.1 --- a/common/autoconf/jdk-options.m4	Fri Mar 22 17:51:45 2019 +0000
     3.2 +++ b/common/autoconf/jdk-options.m4	Mon Apr 01 14:28:36 2019 +0200
     3.3 @@ -1,5 +1,5 @@
     3.4  #
     3.5 -# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
     3.6 +# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
     3.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8  #
     3.9  # This code is free software; you can redistribute it and/or modify it
    3.10 @@ -509,10 +509,60 @@
    3.11    AC_SUBST(PRODUCT_NAME)
    3.12    AC_SUBST(PRODUCT_SUFFIX)
    3.13    AC_SUBST(JDK_RC_PLATFORM_NAME)
    3.14 -  AC_SUBST(COMPANY_NAME)
    3.15    AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
    3.16    AC_SUBST(MACOSX_BUNDLE_ID_BASE)
    3.17  
    3.18 +  # The vendor name, if any
    3.19 +  AC_ARG_WITH(vendor-name, [AS_HELP_STRING([--with-vendor-name],
    3.20 +      [Set vendor name. Among others, used to set the 'java.vendor'
    3.21 +       and 'java.vm.vendor' system properties. @<:@not specified@:>@])])
    3.22 +  if test "x$with_vendor_name" = xyes; then
    3.23 +    AC_MSG_ERROR([--with-vendor-name must have a value])
    3.24 +  elif [ ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ]; then
    3.25 +    AC_MSG_ERROR([--with-vendor-name contains non-printing characters: $with_vendor_name])
    3.26 +  elif test "x$with_vendor_name" != x; then
    3.27 +    # Only set COMPANY_NAME if '--with-vendor-name' was used and is not empty.
    3.28 +    # Otherwise we will use the value from "version-numbers" included above.
    3.29 +    COMPANY_NAME="$with_vendor_name"
    3.30 +  fi
    3.31 +  AC_SUBST(COMPANY_NAME)
    3.32 +
    3.33 +  # The vendor URL, if any
    3.34 +  AC_ARG_WITH(vendor-url, [AS_HELP_STRING([--with-vendor-url],
    3.35 +      [Set the 'java.vendor.url' system property @<:@not specified@:>@])])
    3.36 +  if test "x$with_vendor_url" = xyes; then
    3.37 +    AC_MSG_ERROR([--with-vendor-url must have a value])
    3.38 +  elif [ ! [[ $with_vendor_url =~ ^[[:print:]]*$ ]] ]; then
    3.39 +    AC_MSG_ERROR([--with-vendor-url contains non-printing characters: $with_vendor_url])
    3.40 +  else
    3.41 +    VENDOR_URL="$with_vendor_url"
    3.42 +  fi
    3.43 +  AC_SUBST(VENDOR_URL)
    3.44 +
    3.45 +  # The vendor bug URL, if any
    3.46 +  AC_ARG_WITH(vendor-bug-url, [AS_HELP_STRING([--with-vendor-bug-url],
    3.47 +      [Set the 'java.vendor.url.bug' system property @<:@not specified@:>@])])
    3.48 +  if test "x$with_vendor_bug_url" = xyes; then
    3.49 +    AC_MSG_ERROR([--with-vendor-bug-url must have a value])
    3.50 +  elif [ ! [[ $with_vendor_bug_url =~ ^[[:print:]]*$ ]] ]; then
    3.51 +    AC_MSG_ERROR([--with-vendor-bug-url contains non-printing characters: $with_vendor_bug_url])
    3.52 +  else
    3.53 +    VENDOR_URL_BUG="$with_vendor_bug_url"
    3.54 +  fi
    3.55 +  AC_SUBST(VENDOR_URL_BUG)
    3.56 +
    3.57 +  # The vendor VM bug URL, if any
    3.58 +  AC_ARG_WITH(vendor-vm-bug-url, [AS_HELP_STRING([--with-vendor-vm-bug-url],
    3.59 +      [Sets the bug URL which will be displayed when the VM crashes @<:@not specified@:>@])])
    3.60 +  if test "x$with_vendor_vm_bug_url" = xyes; then
    3.61 +    AC_MSG_ERROR([--with-vendor-vm-bug-url must have a value])
    3.62 +  elif [ ! [[ $with_vendor_vm_bug_url =~ ^[[:print:]]*$ ]] ]; then
    3.63 +    AC_MSG_ERROR([--with-vendor-vm-bug-url contains non-printing characters: $with_vendor_vm_bug_url])
    3.64 +  else
    3.65 +    VENDOR_URL_VM_BUG="$with_vendor_vm_bug_url"
    3.66 +  fi
    3.67 +  AC_SUBST(VENDOR_URL_VM_BUG)
    3.68 +
    3.69    AC_ARG_WITH(copyright-year, [AS_HELP_STRING([--with-copyright-year],
    3.70        [Set copyright year value for build @<:@current year@:>@])])
    3.71    if test "x$with_copyright_year" = xyes; then
     4.1 --- a/common/autoconf/spec.gmk.in	Fri Mar 22 17:51:45 2019 +0000
     4.2 +++ b/common/autoconf/spec.gmk.in	Mon Apr 01 14:28:36 2019 +0200
     4.3 @@ -150,6 +150,18 @@
     4.4  NASHORN_TOPDIR:=@NASHORN_TOPDIR@
     4.5  COPYRIGHT_YEAR:=@COPYRIGHT_YEAR@
     4.6  
     4.7 +# Platform naming variables
     4.8 +LAUNCHER_NAME:=@LAUNCHER_NAME@
     4.9 +PRODUCT_NAME:=@PRODUCT_NAME@
    4.10 +PRODUCT_SUFFIX:=@PRODUCT_SUFFIX@
    4.11 +JDK_RC_PLATFORM_NAME:=@JDK_RC_PLATFORM_NAME@
    4.12 +COMPANY_NAME:=@COMPANY_NAME@
    4.13 +MACOSX_BUNDLE_NAME_BASE=@MACOSX_BUNDLE_NAME_BASE@
    4.14 +MACOSX_BUNDLE_ID_BASE=@MACOSX_BUNDLE_ID_BASE@
    4.15 +VENDOR_URL:=@VENDOR_URL@
    4.16 +VENDOR_URL_BUG:=@VENDOR_URL_BUG@
    4.17 +VENDOR_URL_VM_BUG:=@VENDOR_URL_VM_BUG@
    4.18 +
    4.19  # Location where build customization files may be found
    4.20  CUSTOM_MAKE_DIR:=@CUSTOM_MAKE_DIR@
    4.21  
    4.22 @@ -160,15 +172,33 @@
    4.23  JDK_UPDATE_VERSION:=@JDK_UPDATE_VERSION@
    4.24  JDK_BUILD_NUMBER:=@JDK_BUILD_NUMBER@
    4.25  MILESTONE:=@MILESTONE@
    4.26 -LAUNCHER_NAME:=@LAUNCHER_NAME@
    4.27 -PRODUCT_NAME:=@PRODUCT_NAME@
    4.28 -PRODUCT_SUFFIX:=@PRODUCT_SUFFIX@
    4.29 -JDK_RC_PLATFORM_NAME:=@JDK_RC_PLATFORM_NAME@
    4.30 -COMPANY_NAME:=@COMPANY_NAME@
    4.31 -MACOSX_BUNDLE_NAME_BASE=@MACOSX_BUNDLE_NAME_BASE@
    4.32 -MACOSX_BUNDLE_ID_BASE=@MACOSX_BUNDLE_ID_BASE@
    4.33  USER_RELEASE_SUFFIX=@USER_RELEASE_SUFFIX@
    4.34  
    4.35 +ifneq ($(COMPANY_NAME),)
    4.36 +  # COMPANY_NAME is set to "N/A" in $AUTOCONF_DIR/version-numbers by default,
    4.37 +  # but can be customized with the '--with-vendor-name' configure option.
    4.38 +  # Only export "VENDOR" to the build if COMPANY_NAME contains a real value.
    4.39 +  # Otherwise the default value for VENDOR, which is used to set the "java.vendor"
    4.40 +  # and "java.vm.vendor" properties is hard-coded into the source code (i.e. in
    4.41 +  # System.c in the jdk for "vm.vendor" and vm_version.cpp in the VM for "java.vm.vendor")
    4.42 +  ifneq ($(COMPANY_NAME), N/A)
    4.43 +    VERSION_CFLAGS += -DVENDOR='"$(COMPANY_NAME)"'
    4.44 +  endif
    4.45 +endif
    4.46 +
    4.47 +# Only export VENDOR_URL, VENDOR_URL_BUG and VENDOR_VM_URL_BUG to the build if
    4.48 +# they are not empty. Otherwise, default values which are defined in the sources
    4.49 +# will be used.
    4.50 +ifneq ($(VENDOR_URL),)
    4.51 +  VERSION_CFLAGS += -DVENDOR_URL='"$(VENDOR_URL)"'
    4.52 +endif
    4.53 +ifneq ($(VENDOR_URL_BUG),)
    4.54 +  VERSION_CFLAGS += -DVENDOR_URL_BUG='"$(VENDOR_URL_BUG)"'
    4.55 +endif
    4.56 +ifneq ($(VENDOR_URL_VM_BUG),)
    4.57 +  VERSION_CFLAGS += -DVENDOR_URL_VM_BUG='"$(VENDOR_URL_VM_BUG)"'
    4.58 +endif
    4.59 +
    4.60  # Different version strings generated from the above information.
    4.61  JDK_VERSION:=@JDK_VERSION@
    4.62  RUNTIME_NAME=$(PRODUCT_NAME) $(PRODUCT_SUFFIX)

mercurial