-
Notifications
You must be signed in to change notification settings - Fork 6.6k
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
[inih] Upgrade from r51 to r56 #25879
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You have modified or added at least one portfile where deprecated functions are used.
If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake
-> vcpkg_cmake_install
(from port vcpkg-cmake
)
vcpkg_build_cmake
-> vcpkg_cmake_build
(from port vcpkg-cmake
)
vcpkg_configure_cmake
-> vcpkg_cmake_configure
(Please remove the option PREFER_NINJA
) (from port vcpkg-cmake
)
vcpkg_fixup_cmake_targets
-> vcpkg_cmake_config_fixup
(from port vcpkg-cmake-config
)
In the ports that use the new function, you have to add the corresponding dependencies:
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
The following files are affected:
ports/inih/portfile.cmake
You have modified or added at least one vcpkg.json where you should check the license
field.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/inih/vcpkg.json
Valid values for the license field can be found in the documentation
…CMakeLists.txt` template)
Tested the usage successfully |
This is becoming a relatively large build system replacement. Do you know why we aren't just using upstream's meson one? |
My main goal was debugging why it was getting my |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would like to see that vcpkg_cmake_config_fixup
is used + quotes around paths.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree with @Thomas1664 's comments
I'll manually make these changes and/or apply the given patch first chance I get (probably 24 hours from now) In the interim I've given @BillyONeal write access to my vcpkg fork |
17c7d52
@SamuelMarks I had to make significant changes in order to get this to pass in CI, because this stealth-merge-conflicted with #26145 which depends on headers this was no longer installing. Please double check that you are happy with these changes. |
@SamuelMarks, Please double check that you are happy with these changes. |
Yes I'm sure this is fine |
6298b07
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 571a0551ebab159fd460cb1534f6c820fcd6565a -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index fb7c403..2f88646 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3021,8 +3021,8 @@
"port-version": 1
},
"inih": {
- "baseline": "51",
- "port-version": 1
+ "baseline": "56",
+ "port-version": 0
},
"iniparser": {
"baseline": "2020-04-06",
Thanks for your contribution and thanks for confirming. I resolved the merge conflict and will merge as soon as PR build is green. Thanks! |
Describe the pull request
https://github.com/benhoyt/inih/releases
56
55
54
53
52
What does your PR fix?
Which triplets are supported/not supported? Have you updated the CI baseline?
Yes
Does your PR follow the maintainer guide?
Yes
If you have added/updated a port: Have you run
./vcpkg x-add-version --all
and committed the result?Yes
If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/