Skip to content

Commit c454147

Browse files
committed
Document that InnoSetup 6.4.3 should be used for packaging
Use x64os instead of deprecated x64 for x64 Windows installs Add debugging notes
1 parent ac5367c commit c454147

File tree

2 files changed

+25
-4
lines changed

2 files changed

+25
-4
lines changed

builds/install/arch-specific/win32/FirebirdInstall.iss

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
; Usage Notes:
2525
;
26-
; This script has been designed to work with Inno Setup v6.2.1
26+
; This script has been designed to work with Inno Setup v6.4.3
2727
; It is available as a quick start pack from here:
2828
; https://www.jrsoftware.org/isdl.php
2929
;
@@ -40,6 +40,17 @@
4040
; server. They must be stopped manually.
4141
;
4242
;
43+
; Debugging this script
44+
;
45+
; You need to run BuildExecutableInstall.bat to create the correct environment.
46+
; If you have built firebird from run_all.bat you need to switch to the install
47+
; script directory:
48+
; pushd ..\install\arch-specific\win32
49+
;
50+
; After that you should be able to compile and debug the script from the command
51+
; line thus:
52+
; "%INNO6_SETUP_PATH%"\compil32.exe FirebirdInstall.iss
53+
;
4354
;
4455
#define MyAppPublisher "Firebird Project"
4556
#define MyAppURL "http://www.firebirdsql.org/"
@@ -335,8 +346,8 @@ PrivilegesRequired=admin
335346
SetupMutex={#MyAppName}
336347

337348
#if PlatformTarget == "x64"
338-
ArchitecturesAllowed=x64
339-
ArchitecturesInstallIn64BitMode=x64
349+
ArchitecturesAllowed=x64os
350+
ArchitecturesInstallIn64BitMode=x64os
340351
#elif PlatformTarget == "arm64"
341352
ArchitecturesAllowed=arm64
342353
ArchitecturesInstallIn64BitMode=arm64
@@ -721,6 +732,16 @@ var
721732
cmdParams: TStringList;
722733
begin
723734
735+
// This snippet from the InnoSetup help might be useful for testing.
736+
if IsArm32Compatible then Log('IsArm32Compatible');
737+
if IsArm64 then Log('IsArm64');
738+
if IsX64OS then Log('IsX64OS');
739+
if IsX64Compatible then Log('IsX64Compatible');
740+
if IsX86 then Log('IsX86');
741+
if IsX86OS then Log('IsX86OS');
742+
if IsX86Compatible then Log('IsX86Compatible');
743+
if IsWin64 then Log('IsWin64');
744+
724745
result := true;
725746
726747
CommandLine:=GetCmdTail;

builds/install/arch-specific/win32/i18n_readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ documentatation i18n should be available separately. I18n is a
99
good thing, but bloating the installer with large amounts of translated
1010
documentation is not desirable.
1111

12-
The current version of InnoSetup used by Firebird - 5.5.8 - provides
12+
The current version of InnoSetup used by Firebird - 6.4.3 - provides
1313
generic support for the following languages:
1414

1515
BrazilianPortuguese, Catalan, Corsican, Czech, Danish, Dutch, Finnish, French,

0 commit comments

Comments
 (0)