Repository navigation
fix: single-source the Windows runtime source list in a props file - #288
Merged
Merged
Conversation
Downstream hosts that compile Rivet sources directly re-list the <ClCompile> set by hand, and the list rots: every new runtime translation unit silently broke every vendored Windows host at link time (the podlens valid_utf8 LNK2001, issue #280). platform/windows/rivet-runtime-sources.props is now the single author of the set. rivet-host.vcxproj imports it, so Rivet's own build and the transitional vendored-source contract consume one list; a guard test keeps it in step with runtime/CMakeLists.txt, and platform/windows/README.md documents both consumption contracts.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
Closes #280.
platform/windows/rivet-runtime-sources.propsis now the single author of thehost library's
<ClCompile>set:rivet-host.vcxprojimports the props instead of listing 15 sources, soRivet's own build and any downstream consumption of the same list can never
disagree.
prebuilt static libraries) import the same props;
RivetSourceRootcan beoverridden when the import happens from a checkout rooted elsewhere.
rivet/tests/host-package-linkage.rktgains the rot guard: everyrivet_protocolruntime unit inruntime/CMakeLists.txt(minus the chartunit that
rivet-chart.libowns) must appear in the props, so adding atranslation unit without reaching vendored Windows hosts fails in rivet CI
instead of at a downstream link.
platform/windows/README.mddocuments both consumption contracts(ProjectReference primary, props import transitional).
platform/windows/obj/build output is gitignored.Verification
raco test rivet/tests/host-package-linkage.rkt rivet/tests/windows-update-handoff.rkt— 39 passed.rivet-host.vcxproj(Release x64, local VS 18) withthe props import produced
rivet-host.lib— the imported item groupcompiles end to end, including NuGet restore of the Windows App SDK graph.