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

[blingfire] Use Ninja rather than MSBuild in BlingFire to support UWP. #31331

Merged
merged 1 commit into from
Jun 1, 2023
Merged

[blingfire] Use Ninja rather than MSBuild in BlingFire to support UWP. #31331

merged 1 commit into from
Jun 1, 2023

Conversation

davidmatson
Copy link
Contributor

Fixes #31330.

  • Changes comply with the maintainer guide
  • SHA512s are updated for each updated download
  • The "supports" clause reflects platforms that may be fixed by this new version
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

@davidmatson
Copy link
Contributor Author

FYI - I'm also working with upstream to eliminate the need for the patch long-term:
microsoft/BlingFire#170

@Adela0814 Adela0814 added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label May 9, 2023
@Adela0814 Adela0814 changed the title Use Ninja rather than MSBuild in BlingFire to support UWP. [blingfire] Use Ninja rather than MSBuild in BlingFire to support UWP. May 9, 2023
@Adela0814 Adela0814 added the depends:upstream-changes Waiting on a change to the upstream project label May 9, 2023
@Adela0814
Copy link
Contributor

Let's wait for the reply from the upstream.

@Adela0814
Copy link
Contributor

Note: I will be converting your PR to draft status. please revert to "ready for review" after the upstream agrees to this change. Thanks.

@Adela0814 Adela0814 marked this pull request as draft May 9, 2023 02:48
@davidmatson
Copy link
Contributor Author

@Adela0814 - Can we go ahead with this PR now and then remove the patch once upstream is able to figure out a better approach, so that using this port in uwp apps can be unblocked in the meantime? Thanks!

Comment on lines +7 to +8
- add_compile_options("/O2" "/W4" "/GS" "/Gy" "/guard:cf" "/Gm-" "/Zc:inline" "/fp:precise" "/GF" "/EHsc" "/ZH:SHA_256")
+ add_compile_options("/W4" "/GS" "/Gy" "/guard:cf" "/Gm-" "/Zc:inline" "/fp:precise" "/GF" "/EHsc" "/ZH:SHA_256")
Copy link
Contributor

Choose a reason for hiding this comment

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

How is this change connected to ninja?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ninja appears to add a conflicting /Ox switch itself. Removing WINDOWS_USE_MSBUILD causes this port to break without this patch.

@dan-shaw dan-shaw marked this pull request as ready for review June 1, 2023 01:45
@dan-shaw dan-shaw merged commit 60f2513 into microsoft:master Jun 1, 2023
@davidmatson davidmatson deleted the blingfireNinjaForUwp branch June 27, 2023 01:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist depends:upstream-changes Waiting on a change to the upstream project
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[blingfire] Remove uwp support exclusion
4 participants