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.

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

[WIP] installer: use modern innosetup features #593

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

rimrul
Copy link
Member

@rimrul rimrul commented Feb 15, 2025

Innosetup 6.4 introduced a New function ExecAndCaptureOutput that executes commands and captures there standard output and standard error streams. We've been using our own howmgrown solution called ExecWithCapture for this purpose, but it's a bit finicky. Switch to the official implementation.

Copy link
Member Author

@rimrul rimrul left a comment

Choose a reason for hiding this comment

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

This is entirely untested, I just made sure it builds.

end;

// Split NUL-delimited key/value pairs, extract LF that denotes end of key
StdOut:=StringJoin(#10,Output.StdOut);
Copy link
Member Author

@rimrul rimrul Feb 15, 2025

Choose a reason for hiding this comment

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

We probably want to iterate over Output.StdOut directly instead of joining and re-splitting this, but that was the easiest Q&D way to at least get it to compile again.

Copy link
Member Author

Choose a reason for hiding this comment

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

We do that now, but there's probably at least one off-by-one error in there.

Innosetup 6.4 introduced a New function ExecAndCaptureOutput that
executes commands and captures there standard output and standard error
streams. We've been using our own howmgrown solution called
ExecWithCapture for this purpose, but it's a bit finicky. Switch to the
official implementation.

Signed-off-by: Matthias Aßhauer <[email protected]>
@rimrul rimrul force-pushed the modern-inno-features branch from 0c4df92 to 8d18d60 Compare February 22, 2025 10:44
Innosetup deprecated x64 in V6.4 in favour of x64os and x64compatible.
Use the appropriate new replacements.

Signed-off-by: Matthias Aßhauer <[email protected]>
@rimrul rimrul changed the title [WIP] installer: use ExecAndCaptureOutput [WIP] installer: use modern innosetup features Feb 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant