Parcourir la source

Removed outdated IA64 stuff from the examples (but ia64 is still supported ofc).

Martijn Laan il y a 11 ans
Parent
commit
8749678fcc
4 fichiers modifiés avec 1 ajouts et 55 suppressions
  1. 0 52
      Examples/64BitThreeArch.iss
  2. BIN
      Examples/MyProg-IA64.exe
  3. 1 1
      README.md
  4. 0 2
      setup.iss

+ 0 - 52
Examples/64BitThreeArch.iss

@@ -1,52 +0,0 @@
-; -- 64BitThreeArch.iss --
-; Demonstrates how to install a program built for three different
-; architectures (x86, x64, Itanium) using a single installer.
-
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES!
-
-[Setup]
-AppName=My Program
-AppVersion=1.5
-DefaultDirName={pf}\My Program
-DefaultGroupName=My Program
-UninstallDisplayIcon={app}\MyProg.exe
-Compression=lzma2
-SolidCompression=yes
-OutputDir=userdocs:Inno Setup Examples Output
-; "ArchitecturesInstallIn64BitMode=x64 ia64" requests that the install
-; be done in "64-bit mode" on x64 & Itanium, 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 ia64
-
-[Files]
-; Install MyProg-x64.exe if running on x64, MyProg-IA64.exe if
-; running on Itanium, MyProg.exe otherwise.
-; Place all x64 files here
-Source: "MyProg-x64.exe"; DestDir: "{app}"; DestName: "MyProg.exe"; Check: IsX64
-; Place all IA64 files here, first one should be marked 'solidbreak'
-Source: "MyProg-IA64.exe"; DestDir: "{app}"; DestName: "MyProg.exe"; Check: IsIA64; Flags: solidbreak
-; Place all x86 files here, first one should be marked 'solidbreak'
-Source: "MyProg.exe"; DestDir: "{app}"; Check: IsOtherArch; Flags: solidbreak
-; Place all common files here, first one should be marked 'solidbreak'
-Source: "MyProg.chm"; DestDir: "{app}"; Flags: solidbreak
-Source: "Readme.txt"; DestDir: "{app}"; Flags: isreadme
-
-[Icons]
-Name: "{group}\My Program"; Filename: "{app}\MyProg.exe"
-
-[Code]
-function IsX64: Boolean;
-begin
-  Result := Is64BitInstallMode and (ProcessorArchitecture = paX64);
-end;
-
-function IsIA64: Boolean;
-begin
-  Result := Is64BitInstallMode and (ProcessorArchitecture = paIA64);
-end;
-
-function IsOtherArch: Boolean;
-begin
-  Result := not IsX64 and not IsIA64;
-end;

BIN
Examples/MyProg-IA64.exe


+ 1 - 1
README.md

@@ -270,7 +270,7 @@ See Projects\lzma2\Decoder\compiling.txt.
 
 **ishelp\ISHelpGen\ISHelpGen.exe** - See ishelp\ISHelpGen\compile.bat
 
-**Examples\MyProg.exe**, **Examples\MyProg-IA64.exe**, **Examples\MyProg-x64.exe** -
+**Examples\MyProg.exe**, **Examples\MyProg-x64.exe** -
 Compiled by Visual Studio 2005 from the Examples\MyProg directory.
 
 7. Inno Setup-specific editing guidelines for the help files

+ 0 - 2
setup.iss

@@ -145,13 +145,11 @@ Source: "Examples\Example1.iss"; DestDir: "{app}\Examples"; Flags: ignoreversion
 Source: "Examples\Example2.iss"; DestDir: "{app}\Examples"; Flags: ignoreversion touch
 Source: "Examples\Example3.iss"; DestDir: "{app}\Examples"; Flags: ignoreversion touch
 Source: "Examples\64Bit.iss"; DestDir: "{app}\Examples"; Flags: ignoreversion touch
-Source: "Examples\64BitThreeArch.iss"; DestDir: "{app}\Examples"; Flags: ignoreversion touch
 Source: "Examples\64BitTwoArch.iss"; DestDir: "{app}\Examples"; Flags: ignoreversion touch
 Source: "Examples\Components.iss"; DestDir: "{app}\Examples"; Flags: ignoreversion touch
 Source: "Examples\Languages.iss"; DestDir: "{app}\Examples"; Flags: ignoreversion touch
 Source: "Examples\MyProg.exe"; DestDir: "{app}\Examples"; Flags: ignoreversion touch
 Source: "Examples\MyProg-x64.exe"; DestDir: "{app}\Examples"; Flags: ignoreversion touch
-Source: "Examples\MyProg-IA64.exe"; DestDir: "{app}\Examples"; Flags: ignoreversion touch
 Source: "Examples\MyProg.chm"; DestDir: "{app}\Examples"; Flags: ignoreversion touch
 Source: "Examples\Readme.txt"; DestDir: "{app}\Examples"; Flags: ignoreversion touch
 Source: "Examples\Readme-Dutch.txt"; DestDir: "{app}\Examples"; Flags: ignoreversion touch