Handle 7zip extraction separately #1548
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BillyONeal
approved these changes
Dec 6, 2024
There was a problem hiding this comment.
This approval is contingent on microsoft/vcpkg#42370 being squashed into a single commit on top of github.com/microsoft/vcpkg master, and vcpkg-scripts-sha.txt updated to point to that exact commit SHA, as I described in microsoft/vcpkg#42370 (review)
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use 7zip for extraction whenever possible and create a separate extraction path for all
.7z.exeextensions. We will assume it is 7zip that is being extracted.Summary provided by CoPilot:
Support for self-extracting 7z archives:
include/vcpkg/archives.h: AddedSelfExtracting7zto theExtractionTypeenum.src/vcpkg/archives.cpp: Updated the extraction logic to differentiate between self-extracting 7z archives and other.exefiles.src/vcpkg/archives.cpp: Added handling forSelfExtracting7zin the extraction switch case for Windows.Testing updates:
src/vcpkg-test/archives.cpp: Added a test case to verify that.7z.exefiles are correctly identified asSelfExtracting7z.Code improvements:
src/vcpkg/archives.cpp: Introduced thestemvariable to help with the differentiation logic for self-extracting 7z archives.