make/autoconf/toolchain_windows.m4

*** 1,7 ****
  #
! # Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 23,33 ****
  # questions.
  #
  
  ################################################################################
  # The order of these defines the priority by which we try to find them.
! VALID_VS_VERSIONS="2017 2013 2015 2012 2010"
  
  VS_DESCRIPTION_2010="Microsoft Visual Studio 2010"
  VS_VERSION_INTERNAL_2010=100
  VS_MSVCR_2010=msvcr100.dll
  # We don't use msvcp on Visual Studio 2010
--- 23,33 ----
  # questions.
  #
  
  ################################################################################
  # The order of these defines the priority by which we try to find them.
! VALID_VS_VERSIONS="2017 2019 2013 2015 2012 2010"
  
  VS_DESCRIPTION_2010="Microsoft Visual Studio 2010"
  VS_VERSION_INTERNAL_2010=100
  VS_MSVCR_2010=msvcr100.dll
  # We don't use msvcp on Visual Studio 2010
*** 87,107 ****
  VS_VS_PLATFORM_NAME_2017="v141"
  VS_SDK_PLATFORM_NAME_2017=
  VS_SUPPORTED_2017=true
  VS_TOOLSET_SUPPORTED_2017=true
  
  ################################################################################
  
  AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],
  [
    if test "x$VS_ENV_CMD" = x; then
      VS_VERSION="$1"
      VS_BASE="$2"
      METHOD="$3"
  
      BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(VS_BASE)
!     # In VS 2017, the default installation is in a subdir named after the edition.
      # Find the first one present and use that.
      if test "x$VS_EDITIONS" != x; then
        for edition in $VS_EDITIONS; do
          if test -d "$VS_BASE/$edition"; then
            VS_BASE="$VS_BASE/$edition"
--- 87,121 ----
  VS_VS_PLATFORM_NAME_2017="v141"
  VS_SDK_PLATFORM_NAME_2017=
  VS_SUPPORTED_2017=true
  VS_TOOLSET_SUPPORTED_2017=true
  
+ VS_DESCRIPTION_2019="Microsoft Visual Studio 2019"
+ VS_VERSION_INTERNAL_2019=141
+ VS_MSVCR_2019=vcruntime140.dll
+ VS_MSVCP_2019=msvcp140.dll
+ VS_ENVVAR_2019="VS160COMNTOOLS"
+ VS_USE_UCRT_2019="true"
+ VS_VS_INSTALLDIR_2019="Microsoft Visual Studio/2019"
+ VS_EDITIONS_2019="BuildTools Community Professional Enterprise"
+ VS_SDK_INSTALLDIR_2019=
+ VS_VS_PLATFORM_NAME_2019="v142"
+ VS_SDK_PLATFORM_NAME_2019=
+ VS_SUPPORTED_2019=false
+ VS_TOOLSET_SUPPORTED_2019=false
+ 
  ################################################################################
  
  AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],
  [
    if test "x$VS_ENV_CMD" = x; then
      VS_VERSION="$1"
      VS_BASE="$2"
      METHOD="$3"
  
      BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(VS_BASE)
!     # In VS 2017 and VS 2019, the default installation is in a subdir named after the edition.
      # Find the first one present and use that.
      if test "x$VS_EDITIONS" != x; then
        for edition in $VS_EDITIONS; do
          if test -d "$VS_BASE/$edition"; then
            VS_BASE="$VS_BASE/$edition"
*** 660,670 ****
            POSSIBLE_MSVC_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME"
          fi
        else
          CYGWIN_VC_TOOLS_REDIST_DIR="$VCToolsRedistDir"
          BASIC_FIXUP_PATH(CYGWIN_VC_TOOLS_REDIST_DIR)
!         # Probe: Using well-known location from VS 2017
          if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
            POSSIBLE_MSVC_DLL="`ls $CYGWIN_VC_TOOLS_REDIST_DIR/x64/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME`"
          else
            POSSIBLE_MSVC_DLL="`ls $CYGWIN_VC_TOOLS_REDIST_DIR/x86/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME`"
          fi
--- 674,684 ----
            POSSIBLE_MSVC_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME"
          fi
        else
          CYGWIN_VC_TOOLS_REDIST_DIR="$VCToolsRedistDir"
          BASIC_FIXUP_PATH(CYGWIN_VC_TOOLS_REDIST_DIR)
!         # Probe: Using well-known location from VS 2017 and VS 2019
          if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
            POSSIBLE_MSVC_DLL="`ls $CYGWIN_VC_TOOLS_REDIST_DIR/x64/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME`"
          else
            POSSIBLE_MSVC_DLL="`ls $CYGWIN_VC_TOOLS_REDIST_DIR/x86/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME`"
          fi