Skip to content

Conversation

elecpower
Copy link
Collaborator

Fixes #6519

Summary of changes:

  • install vs_redist.x64.exe sourced from compiler environment

@elecpower elecpower added companion Related to the companion software compilation Related to compiling the firmware and firmware options labels Sep 24, 2025
@pfeerick pfeerick changed the title Fix(cpn): bundle ms vc++ redist into installer fix(cpn): bundle MSVC++ redist with win64 installer Sep 25, 2025
@pfeerick pfeerick added this to the 3.0 milestone Sep 25, 2025
@pfeerick
Copy link
Member

pfeerick commented Oct 1, 2025

image

Both local build and Github build are pulling in the x86 redist, and thus nether install detection/verification (since x86 uses a different registry key) nor Companion will work on a clean system (testing using Windows Sandbox, as that is clean slate every run). Killing x86 in cmake\FindMSVCRedist.cmake seems to work locally... leave it at that, or do you think there is a better way to do this?

elecpower and others added 5 commits October 15, 2025 06:02
- Redist executable path was wrong - was concatonating the build system path to the runtime path.
- Redist executable needs to be unpacked in order to check it's version!
- Also add section descriptions while I'm here
@elecpower elecpower force-pushed the elecpower/cpn-vcpp-redist branch from fc7cafa to d9e79e4 Compare October 14, 2025 19:03
@elecpower
Copy link
Collaborator Author

elecpower commented Oct 14, 2025

Cajoling seems to be the most reliable though less flexible approach. Build priority is obviously GitHub and 'default' local vc++ install. Suppose we could always add an environment variable to force cmake find to also look in non-default location.

@pfeerick
Copy link
Member

So you're happy to leave this as it is until (if? or is that being too optimistic? 😆 ) it blows up on us in the future? Yes, I did say "us". ;)

@elecpower
Copy link
Collaborator Author

Almost guaranteed to blow up. We are dealing with Windows. But let's go with what we have.

@pfeerick pfeerick merged commit 44fcd35 into main Oct 17, 2025
50 checks passed
@pfeerick pfeerick deleted the elecpower/cpn-vcpp-redist branch October 17, 2025 01:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

companion Related to the companion software compilation Related to compiling the firmware and firmware options

Projects

None yet

Development

Successfully merging this pull request may close these issues.

During yesterday's Companion installation, the program encountered an error.

2 participants