feat: option to download vc/ucrt debug binaries #148
+215
−8
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
superewald
commented
Dec 20, 2024
|
|
||
| for pkg in manifest.packages { | ||
| packages.insert(pkg.id.clone(), pkg); |
There was a problem hiding this comment.
manifest.packages contains lots of packages which have the same id, the vc debug runtime packages are one example. To prevent overriding packages in the packages map the key needs to be slightly modified for those. I decided to simply append the count of duplicate packages to the key, this doesn't conflict with the current behavior and allows to grab all the packages.
| @@ -454,6 +454,7 @@ pub(crate) fn minimize( | |||
| SectionKind::SdkLib => (&sdk_lib_prefix, &mut map.sdk.libs), | |||
| SectionKind::CrtHeader => (&crt_hdr_prefix, &mut map.crt.headers), | |||
| SectionKind::CrtLib => (&crt_lib_prefix, &mut map.crt.libs), | |||
| SectionKind::VcrDebug => (&roots.vcrd, &mut map.vcrd.libs), | |||
There was a problem hiding this comment.
I'm very uncertain how to handle this as the vcr shouldn't be part of the minimize logic at all. Is there a way to "skip" this ?
superewald
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in 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.
This PR adds the opportunity to download and splat the VCR and UCRT debug binaries (eg
vcruntime140d.dll) by adding the--include-debug-runtimecli argument.This is useful for testing/debugging debug builds on linux hosts as the debug runtime dlls are not included in wine.
Note
This is my first time coding in rust, I tried to stick to best practices but it would be good to review the changes carefully for code style and performance.
output
The binaries are placed inside
<splat-output-dir>/vcrd/<vcr-version>/bin/<arch>.Running
xwin --manifest-version 16 --include-debug-runtime splatcreatessplat/vcrd/14.29.30157/bin/x86_64with the debug runtime binaries inside it.The complete list of included binaries can be found in the updated
deterministic__verify_deterministic.snap.Note
I updated the snapshots for deterministic and compile tests, however I skipped updating the snapshots for compile_minimized because they seem to be outdated on the main branch.
(Implements #81)