Quellcode durchsuchen

Update example scripts.

Martijn Laan vor 1 Jahr
Ursprung
Commit
cbb1ca96b2
3 geänderte Dateien mit 30 neuen und 28 gelöschten Zeilen
  1. 9 8
      Examples/64Bit.iss
  2. 12 12
      Examples/64BitThreeArch.iss
  3. 9 8
      Examples/64BitTwoArch.iss

+ 9 - 8
Examples/64Bit.iss

@@ -2,7 +2,7 @@
 ; Demonstrates installation of a program built for the x64 (a.k.a. AMD64)
 ; architecture.
 ; To successfully run this installation and the program it installs,
-; you must have a "x64" edition of Windows.
+; you must have a "x64" edition of Windows or Windows 11 on Arm.
 
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES!
 
@@ -16,13 +16,14 @@ UninstallDisplayIcon={app}\MyProg.exe
 Compression=lzma2
 SolidCompression=yes
 OutputDir=userdocs:Inno Setup Examples Output
-; "ArchitecturesAllowed=x64" specifies that Setup cannot run on
-; anything but x64.
-ArchitecturesAllowed=x64
-; "ArchitecturesInstallIn64BitMode=x64" requests that the install be
-; done in "64-bit mode" on x64, meaning it should use the native
-; 64-bit Program Files directory and the 64-bit view of the registry.
-ArchitecturesInstallIn64BitMode=x64
+; "ArchitecturesAllowed=x64compatible" specifies that Setup cannot run
+; on anything but x64 and Windows 11 on Arm.
+ArchitecturesAllowed=x64compatible
+; "ArchitecturesInstallIn64BitMode=x64compatible" requests that the
+; install be done in "64-bit mode" on x64 or Windows 11 on Arm,
+; meaning it should use the native 64-bit Program Files directory and
+; the 64-bit view of the registry.
+ArchitecturesInstallIn64BitMode=x64compatible
 
 [Files]
 Source: "MyProg-x64.exe"; DestDir: "{app}"; DestName: "MyProg.exe"

+ 12 - 12
Examples/64BitThreeArch.iss

@@ -1,6 +1,6 @@
 ; -- 64BitThreeArch.iss --
 ; Demonstrates how to install a program built for three different
-; architectures (x86, x64, ARM64) using a single installer.
+; architectures (x86, x64, Arm64) using a single installer.
 
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES!
 
@@ -14,19 +14,19 @@ UninstallDisplayIcon={app}\MyProg.exe
 Compression=lzma2
 SolidCompression=yes
 OutputDir=userdocs:Inno Setup Examples Output
-; "ArchitecturesInstallIn64BitMode=x64 arm64" requests that the install
-; be done in "64-bit mode" on x64 & ARM64, meaning it should use the
+; "ArchitecturesInstallIn64BitMode=x64os arm64" requests that the install
+; be done in "64-bit mode" on x64 & Arm64, meaning it should use the
 ; native 64-bit Program Files directory and the 64-bit view of the
 ; registry. On all other architectures it will install in "32-bit mode".
-ArchitecturesInstallIn64BitMode=x64 arm64
+ArchitecturesInstallIn64BitMode=x64os arm64
 
 [Files]
-; Install MyProg-x64.exe if running on x64, MyProg-ARM64.exe if
-; running on ARM64, MyProg.exe otherwise.
+; Install MyProg-x64.exe if running on x64, MyProg-Arm64.exe if
+; running on Arm64, MyProg.exe otherwise.
 ; Place all x64 files here
 Source: "MyProg-x64.exe"; DestDir: "{app}"; DestName: "MyProg.exe"; Check: InstallX64
-; Place all ARM64 files here, first one should be marked 'solidbreak'
-Source: "MyProg-ARM64.exe"; DestDir: "{app}"; DestName: "MyProg.exe"; Check: InstallARM64; Flags: solidbreak
+; Place all Arm64 files here, first one should be marked 'solidbreak'
+Source: "MyProg-Arm64.exe"; DestDir: "{app}"; DestName: "MyProg.exe"; Check: InstallArm64; Flags: solidbreak
 ; Place all x86 files here, first one should be marked 'solidbreak'
 Source: "MyProg.exe"; DestDir: "{app}"; Check: InstallOtherArch; Flags: solidbreak
 ; Place all common files here, first one should be marked 'solidbreak'
@@ -39,15 +39,15 @@ Name: "{group}\My Program"; Filename: "{app}\MyProg.exe"
 [Code]
 function InstallX64: Boolean;
 begin
-  Result := Is64BitInstallMode and (ProcessorArchitecture = paX64);
+  Result := Is64BitInstallMode and IsX64OS;
 end;
 
-function InstallARM64: Boolean;
+function InstallArm64: Boolean;
 begin
-  Result := Is64BitInstallMode and (ProcessorArchitecture = paARM64);
+  Result := Is64BitInstallMode and IsArm64;
 end;
 
 function InstallOtherArch: Boolean;
 begin
-  Result := not InstallX64 and not InstallARM64;
+  Result := not InstallX64 and not InstallArm64;
 end;

+ 9 - 8
Examples/64BitTwoArch.iss

@@ -2,8 +2,8 @@
 ; Demonstrates how to install a program built for two different
 ; architectures (x86 and x64) using a single installer: on a "x86"
 ; edition of Windows the x86 version of the program will be
-; installed but on a "x64" edition of Windows the x64 version will
-; be installed.
+; installed but on a "x64" edition of Windows or Windows 11 on Arm
+; the x64 version will be installed.
 
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES!
 
@@ -17,17 +17,18 @@ WizardStyle=modern
 Compression=lzma2
 SolidCompression=yes
 OutputDir=userdocs:Inno Setup Examples Output
-; "ArchitecturesInstallIn64BitMode=x64" requests that the install be
-; done in "64-bit mode" on x64, meaning it should use the native
-; 64-bit Program Files directory and the 64-bit view of the registry.
+; "ArchitecturesInstallIn64BitMode=x64compatible" requests that the
+; install be done in "64-bit mode" on x64 or Windows 11 on Arm,
+; meaning it should use the native 64-bit Program Files directory and
+; the 64-bit view of the registry.
 ; On all other architectures it will install in "32-bit mode".
-ArchitecturesInstallIn64BitMode=x64
-; Note: We don't set ProcessorsAllowed because we want this
+ArchitecturesInstallIn64BitMode=x64compatible
+; Note: We don't set ArchitecturesAllowed because we want this
 ; installation to run on all architectures (including Itanium,
 ; since it's capable of running 32-bit code too).
 
 [Files]
-; Install MyProg-x64.exe if running in 64-bit mode (x64; see above),
+; Install MyProg-x64.exe if running in 64-bit mode (see above), and
 ; MyProg.exe otherwise.
 ; Place all x64 files here
 Source: "MyProg-x64.exe"; DestDir: "{app}"; DestName: "MyProg.exe"; Check: Is64BitInstallMode