From 023e341e0af0fcef67e9bf32e98059a19d35e890 Mon Sep 17 00:00:00 2001 From: ArieKlerk Date: Mon, 2 Mar 2020 08:55:01 +0100 Subject: [PATCH] This is to repair my fault during a WIN deploy --- oscar/BuildInstall.iss | 117 ----------------------------------------- oscar/Setup.ico | Bin 10134 -> 0 bytes oscar/buildinfo.iss | 8 --- 3 files changed, 125 deletions(-) delete mode 100644 oscar/BuildInstall.iss delete mode 100644 oscar/Setup.ico delete mode 100644 oscar/buildinfo.iss diff --git a/oscar/BuildInstall.iss b/oscar/BuildInstall.iss deleted file mode 100644 index eecbce99..00000000 --- a/oscar/BuildInstall.iss +++ /dev/null @@ -1,117 +0,0 @@ -; Script originally generated by the Inno Script Studio Wizard, then manually modified. -; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! -; -; See DEPLOY.BAT for documentation on how this is used to build OSCAR installer - -#define MyGitRevision "unreleased" -#define MyReleaseStatus "" -#define MyVersionNumbers "0.0.0.0" - -#include "buildinfo.iss" - -#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 and for test builds -- GTS 4/6/2019 -#if MyPlatform == "Win64" - ArchitecturesAllowed=x64 - ArchitecturesInstallIn64BitMode=x64 - #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 - #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} -AppVersion={#MyAppVersion}-{#MyPlatform}-{#MyGitRevision}{#MySuffix} -AppVerName={#MyAppName} {#MyAppVersion}-{#MyPlatform}-{#MyGitRevision}{#MySuffix} -AppPublisher={#MyAppPublisher} -AppCopyright=Copyright 2019-2020 {#MyAppPublisher} -; **** AppCopyright=Copyright {GetDateTimeString('yyyy', #0, #0)} {%MyAppPublisher} -DefaultDirName={pf}\{#MyDirName} -DefaultGroupName={#MyGroupName} -OutputDir=.\Installer -#if MyReleaseStatus == "r" - OutputBaseFilename={#MyAppName}-{#MyAppVersion}-{#MyPlatform}{#MySuffix} -#else - OutputBaseFilename={#MyAppName}-{#MyAppVersion}-{#MyPlatform}-{#MyGitRevision}{#MySuffix} -#endif -SetupIconFile=setup.ico -Compression=lzma -SolidCompression=yes -VersionInfoCompany={#MyAppPublisher} -VersionInfoProductName={#MyAppName} -UninstallDisplayName={#MyGroupName} -UninstallDisplayIcon={app}\{#MyAppExeName} - -VersionInfoVersion={#MyVersionNumbers} -VersionInfoProductTextVersion={#MyAppVersion} - -[Languages] -Name: "english"; MessagesFile: "compiler:Default.isl" -Name: "armenian"; MessagesFile: "compiler:Languages\Armenian.isl" -Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl" -Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl" -Name: "corsican"; MessagesFile: "compiler:Languages\Corsican.isl" -Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl" -Name: "danish"; MessagesFile: "compiler:Languages\Danish.isl" -Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl" -Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl" -Name: "french"; MessagesFile: "compiler:Languages\French.isl" -Name: "german"; MessagesFile: "compiler:Languages\German.isl" -Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl" -Name: "icelandic"; MessagesFile: "compiler:Languages\Icelandic.isl" -Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl" -Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl" -Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl" -Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl" -Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl" -Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl" -Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl" -Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl" -Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl" -Name: "ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl" - -[Tasks] -Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}" -Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1 - -[Files] -Source: ".\Release\OSCAR.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: ".\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs -; NOTE: Don't use "Flags: ignoreversion" on any shared system files - -[Icons] -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] -ConfirmUninstall=Are you sure you want to completely remove %1 and all of its components? (Data folder and settings will not be removed.) - -[Run] -Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent diff --git a/oscar/Setup.ico b/oscar/Setup.ico deleted file mode 100644 index 228e50b84b647f82f459dc8d8173035197ae67db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10134 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