From 8a98cf1400214b87c211e0983314b171da27bb05 Mon Sep 17 00:00:00 2001
From: Seeker4 <guy.oscar@moxis.com>
Date: Mon, 12 Aug 2019 16:04:33 -0700
Subject: [PATCH] Windows installers now support Oscar, Oscar (test), Oscar
 32-bit, and Oscar 32-bit (test).  First two are 64-bit.

---
 Building/Windows/BuildInstall.iss | 44 +++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/Building/Windows/BuildInstall.iss b/Building/Windows/BuildInstall.iss
index faa3b7fa..1bb99ff3 100644
--- a/Building/Windows/BuildInstall.iss
+++ b/Building/Windows/BuildInstall.iss
@@ -7,29 +7,45 @@
 
 #define MyAppVersion MyMajorVersion+"."+MyMinorVersion+"."+MyRevision+"-"+MyReleaseStatus
 #if MyReleaseStatus == "r"
-#define MyAppVersion MyAppVersion+MyBuildNumber
+  #define MyAppVersion MyAppVersion+MyBuildNumber
 #else
-#define MyAppVersion MyAppVersion+"-"+MyBuildNumber
+  #define MyAppVersion MyAppVersion+"-"+MyBuildNumber
 #endif
 
-#define MyAppName "OSCAR"
 #define MyAppPublisher "The OSCAR Team"
 #define MyAppExeName "OSCAR.exe"
+#define MyAppName "OSCAR"
 
 [Setup]
 SetupLogging=yes
 ; NOTE: The value of AppId uniquely identifies this application.
 ; Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-; Now using separate AppID for Win32 and Win64 -- GTS 4/6/2019
+; Now using separate AppID for Win32 and Win64 and for test builds -- GTS 4/6/2019
 #if MyPlatform == "Win64"
     ArchitecturesAllowed=x64
     ArchitecturesInstallIn64BitMode=x64
-    AppId={{FC6F08E6-69BF-4469-ADE3-78199288D305}
+    #if MyReleaseStatus == "r" || MyReleaseStatus == "rc"
+      AppId={{FC6F08E6-69BF-4469-ADE3-78199288D305}
+      #define MyGroupName "OSCAR"
+      #define MyDirName "OSCAR"
+    #else
+      AppId={{C5E23210-4BC5-499D-A0E4-81192748D322}
+      #define MyGroupName "OSCAR (test)"
+      #define MyDirName "OSCAR-test"
+    #endif
 ;    DefaultDirName={%PROGRAMFILES|{pf}}\OSCAR
 ; above doesn't work.  Always returns x86 directory
 #else  // 32-bit
-    AppId={{4F3EB81B-1866-4124-B388-5FB5DA34FFDD}
+    #if MyReleaseStatus == "r" || MyReleaseStatus == "rc"
+      AppId={{4F3EB81B-1866-4124-B388-5FB5DA34FFDD}
+      #define MyGroupName "OSCAR 32-bit"
+      #define MyDirName "OSCAR"
+    #else
+      AppId={{B0382AB3-ECB4-4F9D-ABB1-F6EF73D4E3DB}
+      #define MyGroupName "OSCAR 32-bit (test)"
+      #define MyDirName "OSCAR-test"
+    #endif
 ;    DefaultDirName={%PROGRAMFILES(X86)|{pf}}\OSCAR
 #endif
 AppName={#MyAppName}
@@ -38,20 +54,20 @@ AppVerName={#MyAppName} {#MyAppVersion}-{#MyPlatform}-{#MyGitRevision}{#MySuffix
 AppPublisher={#MyAppPublisher}
 AppCopyright=Copyright 2019 {#MyAppPublisher}
 ; **** AppCopyright=Copyright {GetDateTimeString('yyyy', #0, #0)} {%MyAppPublisher}
-DefaultDirName={pf}\OSCAR
-DefaultGroupName={#MyAppName}
+DefaultDirName={pf}\{#MyDirName}
+DefaultGroupName={#MyGroupName}
 OutputDir=.\Installer
 #if MyReleaseStatus == "r"
-OutputBaseFilename={#MyAppName}-{#MyAppVersion}-{#MyPlatform}{#MySuffix}
+  OutputBaseFilename={#MyAppName}-{#MyAppVersion}-{#MyPlatform}{#MySuffix}
 #else
-OutputBaseFilename={#MyAppName}-{#MyAppVersion}-{#MyPlatform}-{#MyGitRevision}{#MySuffix}
+  OutputBaseFilename={#MyAppName}-{#MyAppVersion}-{#MyPlatform}-{#MyGitRevision}{#MySuffix}
 #endif
 SetupIconFile=setup.ico
 Compression=lzma
 SolidCompression=yes
 VersionInfoCompany={#MyAppPublisher}
 VersionInfoProductName={#MyAppName}
-UninstallDisplayName={#MyAppName}
+UninstallDisplayName={#MyGroupName}
 UninstallDisplayIcon={app}\{#MyAppExeName}
 
 [Languages]
@@ -89,9 +105,9 @@ Source: ".\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs cre
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
-Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+Name: "{group}\{#MyGroupName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{group}\{cm:UninstallProgram,{#MyGroupName}}"; Filename: "{uninstallexe}"
+Name: "{commondesktop}\{#MyGroupName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
 ; Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon
 
 [Messages]