Skip to content

installer: Update Inno Setup from 5.6.1 to 6.1.2#330

Merged
dscho merged 4 commits into
git-for-windows:mainfrom
dennisameling:innosetup-update-v6
Mar 2, 2021
Merged

installer: Update Inno Setup from 5.6.1 to 6.1.2#330
dscho merged 4 commits into
git-for-windows:mainfrom
dennisameling:innosetup-update-v6

Conversation

@dennisameling

@dennisameling dennisameling commented Mar 2, 2021

Copy link
Copy Markdown
Member

Successor of #327. As discussed in that PR, we'll make separate PRs for the Inno Setup update and later on for adding Windows ARM64 64-bit support (currently installs in Program Files (x86)). This PR focuses on the Inno Setup upgrade, without changing any other functionality. It's split up into multiple commits for easier reviewing.

CC @dscho

There's no longer a separate is-unicode.exe file for InnoSetup - only is.exe is available now. Details can be found at https://jrsoftware.org/isdl.php#stable.

Signed-off-by: Dennis Ameling <[email protected]>
Previously, there was a separate is-unicode.exe version of InnoSetup. Starting with version 6, only an is.exe file is available.

Signed-off-by: Dennis Ameling <[email protected]>
This commit is the exact output of running installer/update-inno-setup.sh, without any other changes.

Signed-off-by: Dennis Ameling <[email protected]>
This commit applies several changes to install.iss that are necessary after the Inno Setup 6.1.0 update.

Signed-off-by: Dennis Ameling <[email protected]>
Comment thread installer/install.iss
ErrorCode:Integer;
begin
GetWindowsVersionEx(Version);
if (Version.Major<6) then begin

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

As discussed in #327 (comment), this check is no longer necessary since the minimum version required by InnoSetup is now also Windows Vista (see MinVersion above).

Comment thread installer/install.iss
Form.Caption:='Git Uninstall: Removing in-use files';
Form.ClientWidth:=ScaleX(500);
Form.ClientHeight:=ScaleY(256);
Form.Center;

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Needed to prevent errors in InnoSetup, as discussed in #327 (comment)

@dscho
dscho merged commit 23086e9 into git-for-windows:main Mar 2, 2021
@dscho

dscho commented Mar 2, 2021

Copy link
Copy Markdown
Member

Thank you!

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.

2 participants