Skip to content
This repository was archived by the owner on Apr 11, 2022. It is now read-only.

Commit

Permalink
Minor fixes for consistency with other installers
Browse files Browse the repository at this point in the history
Need to get back to work on this...
  • Loading branch information
Triangle717 committed Sep 5, 2014
1 parent d4f4b39 commit a820c29
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 24 deletions.
8 changes: 4 additions & 4 deletions FindDisc.pas
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// LEGO(R) Stunt Rally Alternate Installer v1.0
// LEGO(R) Stunt Rally Alternate Installer
// Created 2013-2014 Triangle717
// <http://Triangle717.WordPress.com/>
// Contains source code from Grim Fandango Setup
Expand All @@ -16,7 +16,7 @@
external 'GetLogicalDriveStringsA@kernel32.dll stdcall';

const
// Ensure this is a Stunt Rally disc
// Ensure this is a Stunt Rally disc
UniqueFile_1 = '_avi_\intro.avi';


Expand Down Expand Up @@ -90,7 +90,7 @@ function FindUniqueFile(): Ansistring;
begin
for i:=0 to GetArrayLength(DrvLetters) -1 do
begin
// A LEGO Stunt Rally disc was detected
// A LEGO Stunt Rally disc was detected
if FileExists( DrvLetters[i] + UniqueFile_1) then
begin
result:=DrvLetters[i];
Expand All @@ -107,7 +107,7 @@ function GetSourceCdDrive(): Ansistring;
FindAllCdDrives();
if GetArrayLength(DrvLetters) < 1 then
begin
MsgBox('No optical drive found was found on your computer.', mbError, MB_OK);
MsgBox('No disc drive was found on your computer.', mbError, MB_OK);
Abort;
end;

Expand Down
39 changes: 19 additions & 20 deletions SR-Alternate-Installer.iss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; LEGO(R) Stunt Rally Alternate Installer v1.0
; LEGO Stunt Rally Alternate Installer
; Created 2013-2014 Triangle717
; <http://Triangle717.WordPress.com/>
; Contains source code from Grim Fandango Setup
Expand All @@ -7,30 +7,30 @@

; If any version below the specified version is used for compiling,
; this error will be shown.
#if VER < EncodeVer(5,5,2)
#error You must use Inno Setup 5.5.2 or newer to compile this script
#if VER < EncodeVer(5, 5, 2)
#error You must use Inno Setup 5.5.2 or newer to compile this script
#endif

#define MyAppInstallerName "LEGO Stunt Rally Alternate Installer"
#define MyAppInstallerVersion "1.0"
#define MyAppName "LEGO® Stunt Rally"
#define MyAppInstallerName "LEGO® Stunt Rally Alternate Installer"
#define MyAppInstallerVersion "1.0.0"
#define MyAppName "LEGO® Stunt Rally"
#define MyAppNameNoR "LEGO Stunt Rally"
#define MyAppVersion "0.3.5.1"
#define MyAppPublisher "LEGO Media"
#define MyAppExeName "StuntRally.exe"
#define MySecondAppExeName "_msr.exe"

[Setup]
AppID={#MyAppInstallerName}{#MyAppInstallerVersion}
AppID={#MyAppName}
AppName={#MyAppName}
AppVersion={#MyAppVersion}
VersionInfoVersion={#MyAppInstallerVersion}
AppPublisher={#MyAppPublisher}
AppCopyright=(C) 2000 {#MyAppPublisher}
AppCopyright=(c) 2000 {#MyAppPublisher}
LicenseFile=license.txt
; Start menu/screen and Desktop shortcuts
DefaultDirName={pf}\LEGO Media\Games\{#MyAppNameNoR}
DefaultGroupName={#MyAppName}
DefaultGroupName=LEGO Media\{#MyAppNameNoR}
AllowNoIcons=yes
; Installer Graphics
SetupIconFile=StuntRally.ico
Expand All @@ -40,7 +40,7 @@ WizardImageStretch=True
WizardImageBackColor=clBlack
; Location of the compiled Exe
OutputDir=bin
OutputBaseFilename={#MyAppInstallerName} {#MyAppInstallerVersion}
OutputBaseFilename={#MyAppNameNoR} Alternate Installer {#MyAppInstallerVersion}
; Uninstallation stuff
UninstallFilesDir={app}
UninstallDisplayIcon={app}\StuntRally.ico
Expand All @@ -54,8 +54,7 @@ SolidCompression=True
InternalCompressLevel=ultra
LZMAUseSeparateProcess=yes
; From top to bottom:
; Explicitly set Admin rights, no other languages,
; do not restart upon finishing.
; Require Admin rights, no other languages, do not restart upon finish.
PrivilegesRequired=admin
ShowLanguageDialog=no
RestartIfNeededByRun=no
Expand All @@ -64,8 +63,8 @@ RestartIfNeededByRun=no
Name: "English"; MessagesFile: "compiler:Default.isl"

[Messages]
BeveledLabel={#MyAppInstallerName} {#MyAppInstallerVersion}
; WelcomeLabel2 is overridden because I'm unsure if every
BeveledLabel={#MyAppInstallerName}
;; WelcomeLabel2 is overridden because I'm unsure if every
; LEGO Stunt Rally disc says version 0.3.5.1 or just mine.
WelcomeLabel2=This will install [name] on your computer.%n%nIt is recommended that you close all other applications before continuing.
; DiskSpaceMBLabel is overridden because it reports an incorrect installation size.
Expand All @@ -86,19 +85,19 @@ Name: "Minimal"; Description: "Minimal Installation (Without Movies)"; Types: Mi
Source: "{code:GetSourceDrive}data1.cab"; DestDir: "{app}"; Flags: external ignoreversion deleteafterinstall
Source: "{code:GetSourceDrive}resource.cfg"; DestDir: "{app}"; Flags: external ignoreversion
Source: "{code:GetSourceDrive}_avi_\*"; DestDir: "{app}"; Flags: external ignoreversion
Source: "{code:GetSourceDrive}ReadMeUS.txt"; DestDir: "{app}"; Flags: external ignoreversion skipifsourcedoesntexist

; Manual and icon
; Source: "Manual.pdf"; DestDir: "{app}"; Flags: ignoreversion skipifsourcedoesntexist
Source: "StuntRally.ico"; DestDir: "{app}"; Flags: ignoreversion
Source: "ReadMeUS.txt"; DestDir: "{app}"; Flags: ignoreversion

; Tool needed to extract the CAB
Source: "Tools\CABExtract\i5comp.exe"; DestDir: "{app}"; Flags: deleteafterinstall
Source: "Tools\CABExtract\ZD51145.DLL"; DestDir: "{app}"; Flags: deleteafterinstall

[Icons]
; The first {group} and {commondesktop} entries are created only if the user
;chooses to play the intro videos, while the second ones skip the intro vidoes.
; First and last icons are created only if user choose not to use the videos,
; else the normal ones are created.
Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; IconFilename: "{app}\StuntRally.ico"; Comment: "Run {#MyAppName}"; Components: Full
Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MySecondAppExeName}"; IconFilename: "{app}\StuntRally.ico"; Parameters: "/NOINTROVIDEO"; Comment: "Run {#MyAppName} without Intro videos"; Components: Minimal
Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; IconFilename: "{app}\StuntRally.ico"; Comment: "Run {#MyAppName}"; Components: Full; Tasks: desktopicon
Expand All @@ -118,7 +117,7 @@ Name: "Admin"; Description: "Run {#MyAppName} with Administrator Rights"; GroupD
; (depending on user's choice on the videos).
Filename: "{app}\i5comp.exe"; Parameters: "x ""{app}\data1.cab"""; Flags: runascurrentuser
Filename: "{app}\{#MyAppExeName}"; Flags: nowait postinstall skipifsilent runascurrentuser; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Components: Full
Filename: "{app}\{#MyAppExeName}"; Parameters: "-novideo"; Flags: nowait postinstall skipifsilent runascurrentuser; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Components: Minimal
Filename: "{app}\{#MyAppExeName}"; Parameters: "/NOINTROVIDEO"; Flags: nowait postinstall skipifsilent runascurrentuser; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Components: Minimal

[UninstallDelete]
; Because the files came from a CAB were not installed from [Files],
Expand All @@ -131,12 +130,12 @@ Type: files; Name: "{app}\*.avi"

[Dirs]
; Created to ensure the save games are not removed
; (which should never ever happen).
; (which should never ever happen)
Name: "{app}\SavedTracks"; Flags: uninsneveruninstall

[Code]
// Pascal script from Bgbennyboy to pull files off a CD, greatly trimmed up
// and modified to support ANSI and Unicode Inno Setup by Triangle717.
// and modified to support ANSI and Unicode Inno Setup by Triangle717
var
SourceDrive: string;
Expand Down

0 comments on commit a820c29

Please sign in to comment.