Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8220445: Support for side by side MSVC Toolset versions #180

Closed
wants to merge 1 commit into from

Conversation

@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Aug 3, 2021

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


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8220445: Support for side by side MSVC Toolset versions

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/180/head:pull/180
$ git checkout pull/180

Update a local copy of the PR:
$ git checkout pull/180
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/180/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 180

View PR using the GUI difftool:
$ git pr show -t 180

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/180.diff

Co-authored-by: Ali Ince <ali.ince@gmail.com>
Reviewed-by: tbell
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Aug 3, 2021

👋 Welcome back clanger! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

Loading

@openjdk openjdk bot changed the title Backport 9833d2a1cd5ff386ee233de9c89e23b204458320 8220445: Support for side by side MSVC Toolset versions Aug 3, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Aug 3, 2021

This backport pull request has now been updated with issue from the original commit.

Loading

@RealCLanger RealCLanger changed the title 8220445: Support for side by side MSVC Toolset versions Backport 9833d2a1cd5ff386ee233de9c89e23b204458320 Aug 3, 2021
@openjdk openjdk bot changed the title Backport 9833d2a1cd5ff386ee233de9c89e23b204458320 8220445: Support for side by side MSVC Toolset versions Aug 3, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Aug 3, 2021

This backport pull request has now been updated with issue from the original commit.

Loading

@mlbridge
Copy link

@mlbridge mlbridge bot commented Aug 3, 2021

Webrevs

Loading

tstuefe
tstuefe approved these changes Aug 3, 2021
Copy link
Member

@tstuefe tstuefe left a comment

Not an expert, but looks okay to me. You did test it, right?

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Aug 3, 2021

@RealCLanger This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8220445: Support for side by side MSVC Toolset versions

Reviewed-by: stuefe

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

Loading

@openjdk openjdk bot added the ready label Aug 3, 2021
@RealCLanger
Copy link
Contributor Author

@RealCLanger RealCLanger commented Aug 3, 2021

Not an expert, but looks okay to me. You did test it, right?

Thanks for the Review, Thomas. I tested it in my GitHub actions experiments and it looks promising. Will run it through SAP's testing tonight.

Loading

@RealCLanger
Copy link
Contributor Author

@RealCLanger RealCLanger commented Aug 4, 2021

/integrate

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Aug 4, 2021

Going to push as commit 87e300b.
Since your change was applied there have been 9 commits pushed to the master branch:

  • d05effd: 8270893: IndexOutOfBoundsException while reading large TIFF file
  • d900e31: 8211055: Provide print to a file (PDF) feature even when printer was not connected
  • 7751352: 8230808: Remove Access::equals()
  • 35fcac6: 8168304: Make all of DependencyContext_test available in product mode
  • cf2cf25: 8266761: AssertionError in sun.net.httpserver.ServerImpl.responseCompleted
  • 0c783b0: 8257497: Update keytool to create AKID from the SKID of the issuing certificate as specified by RFC 5280
  • aebdee3: 8230674: Heap dumps should exclude dormant CDS archived objects of unloaded classes
  • 815d3e1: 8267625: AARCH64: typo in LIR_Assembler::emit_profile_type
  • 4da3fb8: 8268261: C2: assert(n != __null) failed: Bad immediate dominator info.

Your commit was automatically rebased without conflicts.

Loading

@openjdk openjdk bot closed this Aug 4, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Aug 4, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Aug 4, 2021

@RealCLanger Pushed as commit 87e300b.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Loading

@RealCLanger RealCLanger deleted the 8220445 branch Aug 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants