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

8242468: VS2019 build missing vcruntime140_1.dll #193

Closed
wants to merge 6 commits into from
Closed

8242468: VS2019 build missing vcruntime140_1.dll #193

wants to merge 6 commits into from

Conversation

apavlyutkin
Copy link
Contributor

@apavlyutkin apavlyutkin commented Nov 23, 2022

Hi!

Here is another backport from MSVS2019 seria. It fixes bundling of new vcruntime140_1.dll for MSVS2019 builds. The patch openjdk/jdk11u-dev@2548ed3 is applied with the following changes:

  • make/CreateJmods.gmk -> SKIPPED, cuz jdk8 does not support Jmod
  • make/hotspot/test/GtestImage.gmk -> SKIPPED, cuz jdk8 does not use GTest
  • make/autoconf/basic.m4 -> common/autoconf/basics.m4 (no conflicts)
  • make/autoconf/toolchain_windows.m4 -> common/autoconf/toolchain_windows.m4 (no conflicts)
  • make/autoconf/spec.gmk.in -> common/autoconf/spec.gmk.in (no conflicts)
  • make/lib/CoreLibraries.gmk -> jdk/make/lib/CoreLibraries.gmk (no conflicts)
  • make/devkit/createWindowsDevkit2019.sh -> make/devkit/createWindowsDevkit2019.sh (no conflicts)
  • make/copy/Copy-java.base.gmk -> jdk/make/CopyFiles.gmk: at line#276 jdk11 uses TARGETS to hold concatenated value but jdk8 uses COPY_FILES

Verification: MSVS2019 32/64-bit builds populate vcrunt~1.dll and vcrunt~2.dll to JRE images, these are vcruntime140.dll and vcruntime140_1.dll accordingly (in jdk8 configure script renames the DLL's to avoid 8.3 conflict. I have no idea, do we still need for this).
Regression: MSVS2017 builds populate only vcrunt~1.dll

Note: accordingly to JDK-8247676 32-bit builds do not need to populate new runtime library. The backport will be done on top of this one as dependent PR


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev pull/193/head:pull/193
$ git checkout pull/193

Update a local copy of the PR:
$ git checkout pull/193
$ git pull https://git.openjdk.org/jdk8u-dev pull/193/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 193

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/193.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 23, 2022

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

@openjdk openjdk bot changed the title Backport 2548ed31aeb255a61644885c501667a74f90ebc7 8242468: VS2019 build missing vcruntime140_1.dll Nov 23, 2022
@openjdk
Copy link

openjdk bot commented Nov 23, 2022

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Nov 23, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 23, 2022

Webrevs

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/190 to master December 1, 2022 10:48
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout 8242468
git fetch https://git.openjdk.org/jdk8u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Dec 1, 2022

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

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

8242468: VS2019 build missing vcruntime140_1.dll

Reviewed-by: phh

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@phohensee) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 1, 2022
@apavlyutkin
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 1, 2022
@openjdk
Copy link

openjdk bot commented Dec 1, 2022

@apavlyutkin
Your change (at version e18afb9) is now ready to be sponsored by a Committer.

@yan-too
Copy link
Contributor

yan-too commented Dec 1, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Dec 1, 2022

Going to push as commit 1ec7984.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 1, 2022
@openjdk openjdk bot closed this Dec 1, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Dec 1, 2022
@openjdk
Copy link

openjdk bot commented Dec 1, 2022

@yan-too @apavlyutkin Pushed as commit 1ec7984.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
3 participants