Build with VS 2019

[Erik Joelsson]

Hello Yasumasa,

If that was all it took, we are certainly lucky. I would be happy to 
accept the patch.

I think it would be better to put 2019 as the second item in the list of 
valid versions as it's most likely preferable to all the older versions 
currently listed after 2017.

/Erik

On 2019-04-17 07:18, Yasumasa Suenaga wrote:
> Hi all,
>
> I tried to build jdk/jdk on WSL with VS 2019.
> Someone work for VS 2019?
>
> If not, I want to file it to JBS and contribute patch as below.
> It works fine on my environment.
>
> ------------------
> diff -r 4224f26b2e7f make/autoconf/toolchain_windows.m4
> --- a/make/autoconf/toolchain_windows.m4        Mon Apr 15 06:41:02 
> 2019 -0700
> +++ b/make/autoconf/toolchain_windows.m4        Wed Apr 17 23:14:56 
> 2019 +0900
> @@ -1,5 +1,5 @@
>  #
> -# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights 
> reserved.
> +# 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
> @@ -25,7 +25,7 @@
>
>
> ################################################################################ 
>
>  # The order of these defines the priority by which we try to find them.
> -VALID_VS_VERSIONS="2017 2013 2015 2012 2010"
> +VALID_VS_VERSIONS="2017 2013 2015 2012 2010 2019"
>
>  VS_DESCRIPTION_2010="Microsoft Visual Studio 2010"
>  VS_VERSION_INTERNAL_2010=100
> @@ -89,6 +89,20 @@
>  VS_SUPPORTED_2017=true
>  VS_TOOLSET_SUPPORTED_2017=true
>
> +VS_DESCRIPTION_2019="Microsoft Visual Studio 2019"
> +VS_VERSION_INTERNAL_2019=142
> +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=true
> +VS_TOOLSET_SUPPORTED_2019=true
> +
>
> ################################################################################ 
>
>
>  AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],
> @@ -99,7 +113,7 @@
>      METHOD="$3"
>
>      BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(VS_BASE)
> -    # In VS 2017, the default installation is in a subdir named after 
> the edition.
> +    # In VS 2017 or later, 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
> ------------------
>
> Thanks,
>
> Yasumasa