[jdk11u-dev] Integrated: 8220445: Support for side by side MSVC Toolset versions

[Christoph Langer]

On Tue, 3 Aug 2021 05:07:21 GMT, Christoph Langer <clanger at openjdk.org> wrote:

> This is a backport of JDK-8220445 Support for side by side MSVC Toolset versions. It is needed to support the GitHub Actions workflow for Windows because it is using the hereby introduced configure option --with-msvc-toolset-version.
> 
> The backport did not apply cleanly because JDK-8215445: Enable building for Windows in WSL is missing. I adapted the change to make it fit.
> 
> I moved the line
> `        $ECHO "$WINPATH_BASH -c 'echo VCToolsRedistDir="'"$VCToolsRedistDir " >> set-vs-env.sh' \
>             >> $EXTRACT_VC_ENV_BAT_FILE`
> to the fitting place and dropped the hunk
> `        $ECHO 'echo VCToolsRedistDir="%VCToolsRedistDir% " >> set-vs-env.sh' \
>             >> $EXTRACT_VC_ENV_BAT_FILE`

This pull request has now been integrated.

Changeset: 87e300be
Author:    Christoph Langer <clanger at openjdk.org>
URL:       https://git.openjdk.java.net/jdk11u-dev/commit/87e300be2660ba102a7002a8da7aa4fea0af3cc7
Stats:     24 lines in 1 file changed: 22 ins; 0 del; 2 mod

8220445: Support for side by side MSVC Toolset versions

Reviewed-by: stuefe
Backport-of: 9833d2a1cd5ff386ee233de9c89e23b204458320

-------------

PR: https://git.openjdk.java.net/jdk11u-dev/pull/180