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.

Sign up for GitHub

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

Jump to bottom

Fix vcpkg-tool-meson clobbering the tools directory. #37585

Merged
merged 1 commit into from
Mar 21, 2024
Merged

Fix vcpkg-tool-meson clobbering the tools directory. #37585

merged 1 commit into from
Mar 21, 2024

Conversation

BillyONeal
Copy link
Member

No description provided.

@BillyONeal BillyONeal added category:vcpkg-bug The issue is with the vcpkg system (including helper scripts in `scripts/cmake/`) category:port-bug The issue is with a library, which is something the port should already support info:internal This PR or Issue was filed by the vcpkg team. labels Mar 21, 2024
@BillyONeal
Copy link
Member Author

/cc @Neumann-A

BillyONeal
BillyONeal commented Mar 21, 2024
View reviewed changes
ports/vcpkg-tool-meson/vcpkg-port-config.cmake
@@ -41,22 +41,25 @@ if(NOT SCRIPT_MESON)
FILENAME "${download_filename}"

)
file(REMOVE_RECURSE "${path_to_search}-tmp/../")
Copy link
Member Author

Choose a reason for hiding this comment

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

${path_to_search}-tmp/../ is ${DOWNLOADS}/tools

@dg0yt
Copy link
Contributor

dg0yt commented Mar 21, 2024

Maybe fixes #36773?

@dg0yt dg0yt mentioned this pull request Mar 21, 2024
Closed
@LilyWangLL LilyWangLL self-assigned this Mar 21, 2024
@Cheney-W Cheney-W removed the category:vcpkg-bug The issue is with the vcpkg system (including helper scripts in `scripts/cmake/`) label Mar 21, 2024
@LilyWangLL LilyWangLL mentioned this pull request Mar 21, 2024
Closed
@LilyWangLL LilyWangLL linked an issue Mar 21, 2024 that may be closed by this pull request
failed to compress folder #37513
Closed
@Neumann-A
Copy link
Contributor

The reason it says file(MAKE_DIRECTORY "${path_to_search}-tmp/../") was because i observed downloads/tools/meson/meson-sha512 but if that is no longer the case due to other changes within the port the extra ../ is of course wrong. I didn't actively notice the 7zip problems in my overlay install (maybe I just was lucky and something did a vcpkg_find_acquire_program(7Z) or I just did too many sequenced vcpkg installs or --editable tests) but an easy way to reproduce it is to vcpkg install pkgconf (or any meson based port). If CMake is provided by vcpkg it will just delete everything above that cmake folder. If a viable version of cmake is provided then the whole tools folder gets nuked.

But another interesting questions arises here: How to detect and protect for such changes in the future? Do the vcpkg-tool tools need a different folder? Script tools would generally just get re-extracted.

@Osyotr Osyotr mentioned this pull request Mar 21, 2024
Closed
@BillyONeal BillyONeal merged commit 936588e into microsoft:master Mar 21, 2024
12 of 16 checks passed
@BillyONeal BillyONeal deleted the fix-tool-meson branch March 21, 2024 20:19
@LilyWangLL LilyWangLL added the info:reviewed Pull Request changes follow basic guidelines label Mar 22, 2024
@Osyotr Osyotr mentioned this pull request Mar 25, 2024
Closed
@JonLiu1993 JonLiu1993 mentioned this pull request Aug 16, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Neumann-A Neumann-A Neumann-A approved these changes

Assignees

@LilyWangLL LilyWangLL

Labels
category:port-bug The issue is with a library, which is something the port should already support info:internal This PR or Issue was filed by the vcpkg team. info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

failed to compress folder
5 participants
@BillyONeal @dg0yt @Neumann-A @Cheney-W @LilyWangLL