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

[document] Doc fixes for utils in vcpkg-cmake port #21763

Closed
wants to merge 1 commit into from
Closed

[document] Doc fixes for utils in vcpkg-cmake port #21763

wants to merge 1 commit into from

Conversation

horenmar
Copy link
Contributor

Describe the pull request
I changed the example link in documentation from opencv (empty portfile, alias of opencv4) to opencv4 proper.

  • What does your PR fix?

Fixes #21762

  • Which triplets are supported/not supported? Have you updated the [CI baseline]

N/A doc change

Copy link

@github-actions github-actions bot left a 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!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for vcpkg-cmake but no changes to version or port version.
-- Version: 2021-09-13
-- Old SHA: fc4d9fcc5b8d2b97c083c6b70dd06df5174bd97b
-- New SHA: 413b19357425489d510d4bf76c65e6f50e49b1ad
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

@JackBoosY JackBoosY added the category:documentation To resolve the issue, documentation will need to be updated label Nov 30, 2021
@JackBoosY
Copy link
Contributor

Please download this patch, apply it in your branch and commit changes.

@JackBoosY JackBoosY changed the title vcpkg_cmake_configure links to opencv4 portfile as example [document] vcpkg_cmake_configure links to opencv4 portfile as example Nov 30, 2021
@horenmar
Copy link
Contributor Author

@JackBoosY I can't actually download that, but I can update the port version properly -- I kinda forgot that since I am doing the change in a file in a port, I have to update port versions.

@JackBoosY
Copy link
Contributor

Please note that the documentation of vcpkg is automatically synchronized through the comments in the cmake script.

@JackBoosY JackBoosY marked this pull request as draft December 1, 2021 02:21
@horenmar horenmar marked this pull request as ready for review December 2, 2021 10:53
@JackBoosY
Copy link
Contributor

Depends on #21825.

@JackBoosY JackBoosY added the depends:different-pr This PR or Issue depends on a PR which has been filed label Dec 3, 2021
* `vcpkg_cmake_configure`: links to `opencv4` as example instead of
  `opencv` which is an empty port
* `vcpkg_cmake_install`: fix link to `vcpkg_cmake_build`'s docs
* `vcpkg_cmake_build`: fix link to `vcpkg_cmake_install`'s docs
@horenmar horenmar changed the title [document] vcpkg_cmake_configure links to opencv4 portfile as example [document] Doc fixes for utils in vcpkg-cmake port Dec 8, 2021
@horenmar
Copy link
Contributor Author

horenmar commented Dec 8, 2021

Since this is still open, I added some more doc fixes for the vcpkg-cmake port.

@JackBoosY JackBoosY removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Dec 9, 2021
ports/vcpkg-cmake/vcpkg_cmake_install.cmake Show resolved Hide resolved
Comment on lines +3 to +4
"version-date": "2021-09-13",
"port-version": 1
Copy link
Contributor

Choose a reason for hiding this comment

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

We shouldn't add the vcpkg-cmake port version for update doc.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We can either bump the main version, increment port version, or silently change what an already published version means.

Copy link
Contributor

Choose a reason for hiding this comment

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

Updating the version of vcpkg-cmake will cause if users use vcpkg upgrade to upgrade all installed ports, all ports that depend on the cmake build system will be updated unnecessarily.

Copy link
Contributor

Choose a reason for hiding this comment

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

The CI requires either a version change or a port-version changes when port content changes. That's the downside of docs in scripts.

Copy link
Contributor

Choose a reason for hiding this comment

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

all ports that depend on the cmake build system will be updated unnecessarily.

This might be mitigated by bundling with the necessary uwp toolchain fix, #21857.

Copy link
Member

Choose a reason for hiding this comment

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

I think we should just not put the docs in the sources any more.

Copy link
Contributor

Choose a reason for hiding this comment

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

For enforcing consistency, the dependency might be turned around:
Let the document cross-reference the cmake script's sha512 sum. Check in a CI task.

Copy link
Contributor

@Osyotr Osyotr Jan 16, 2022

Choose a reason for hiding this comment

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

How about removing comments and trailing whitespaces from a script before taking its hash?

Copy link
Contributor

Choose a reason for hiding this comment

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

How about removing comments and trailing whitespaces from a script before taking it's hash?

I would prefer to remove the redundancy instead of adding a cmake parser.
OTOH we might just move the documented scripts into a subdirectory of the respective port directory - IIRC subdirectory contents are not hashed. (?)

Copy link
Contributor

Choose a reason for hiding this comment

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

@dg0yt I still think it could be a positive change. Right now I have a custom triplet with a typo which I'm afraid to correct because it would require rebuilding of 170+ libraries.

@JackBoosY
Copy link
Contributor

Conclusion: We should wait for the next update of vcpkg-cmake PR and incorporate this content.

@JackBoosY JackBoosY added the depends:different-pr This PR or Issue depends on a PR which has been filed label Jan 7, 2022
@horenmar
Copy link
Contributor Author

Conclusion: We should wait for the next update of vcpkg-cmake PR and incorporate this content.

Fun fact, there have been two of those between the time this PR was open and now. 🤷

@dg0yt
Copy link
Contributor

dg0yt commented Jan 19, 2022

Fun fact, there have been two of those between the time this PR was open and now. shrug

And I explicitly proposed to do that in one of them, but it was ignored.

@JackBoosY
Copy link
Contributor

Fun fact, there have been two of those between the time this PR was open and now. shrug

And I explicitly proposed to do that in one of them, but it was ignored.

Ah that's because that PR doesn't contain changes about vcpkg-cmake.

@ras0219-msft ras0219-msft added info:world-rebuild and removed depends:different-pr This PR or Issue depends on a PR which has been filed labels Jan 28, 2022
@ras0219-msft
Copy link
Contributor

Thanks you very much for the PR and sorry for the long merge time!

These changes were rolled into #22626 to minimize user impact.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:documentation To resolve the issue, documentation will need to be updated
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Documentation] Bad link in vcpkg_cmake_configure documentation
6 participants