INNO Setup fixes

Author: Paulchen-Panther

cmake/Packaging.cmake

@@ -108,7 +108,8 @@ endif()
 if(WIN32)
 	set(CPACK_EXTERNAL_PACKAGE_SCRIPT ${CMAKE_SOURCE_DIR}/cmake/windows/inno/innosetup.cmake)
 	set(CPACK_EXTERNAL_ENABLE_STAGING ON)
-	set(CPACK_BUILD_CONFIG "${CMAKE_BUILD_TYPE}")
+	set(CPACK_BUILD_CONFIG ${CMAKE_BUILD_TYPE})
+	set(CPACK_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR})
 endif()
 
 # Define the install components

cmake/windows/inno/i18n/de.isl

@@ -8,6 +8,7 @@ SetupTypeFull=Komplette Installation (Hyperion und standalone tools)
 SetupTypeCustom=Benutzerdefinierte Installation
 
 StartMenuEntry=&Startmenüeintrag erstellen
+MenuIconConsole=(Konsole)
 
 DesktopIcon=&Desktop-Symbol erstellen
 DesktopIconAllUsers=Für alle Benutzer
@@ -20,3 +21,5 @@ AddToSystemAllUsers=Für alle Benutzer
 
 Autostart_Group=Autostart
 Autostart_Description=Hyperion beim Windows start automatisch ausführen
+
+VCRedistInstall=VC++ Laufzeitkomponenten werden installiert...

cmake/windows/inno/i18n/en.isl

@@ -8,6 +8,7 @@ SetupTypeFull=Full installation (Hyperion and standalone tools)
 SetupTypeCustom=Custom installation
 
 StartMenuEntry=Create a &start menu entry
+MenuIconConsole=(Console)
 
 DesktopIcon=Create a &desktop icon
 DesktopIconAllUsers=For all users
@@ -20,3 +21,5 @@ AddToSystemAllUsers=For all users
 
 Autostart_Group=Autostart
 Autostart_Description=Start Hyperion automatically on Windows startup
+
+VCRedistInstall=Installing VC++ Redistributables...

cmake/windows/inno/windows.iss.in

@@ -8,6 +8,7 @@
 #define OutputName "@CPACK_PACKAGE_FILE_NAME@"
 #define ComponentStagingDir "@CPACK_TEMPORARY_INSTALL_DIRECTORY@"
 #define OutputDir "@CPACK_PACKAGE_DIRECTORY@"
+#define VCRedist "vc_redist.@[email protected]"
 #define AppFile str(ComponentStagingDir)+str("\Hyperion\bin\hyperiond.exe")
 
 [Setup]
@@ -17,6 +18,7 @@
 
 ; App Information
 AppId={{3546F644-587C-4690-B8DA-C84383B9ECFD}
+AppMutex={#AppName}
 AppName={#AppName}
 AppVersion={#AppVersion}
 AppPublisher={#AppPublisher}
@@ -45,7 +47,7 @@ OutputBaseFilename={#OutputName}
 DirExistsWarning=no
 AlwaysShowComponentsList=true
 PrivilegesRequired=lowest
-PrivilegesRequiredOverridesAllowed=commandline
+PrivilegesRequiredOverridesAllowed=dialog
 ArchitecturesAllowed=x64compatible
 ArchitecturesInstallIn64BitMode=x64compatible
 ChangesEnvironment=true
@@ -131,21 +133,29 @@ Source: "{#ComponentStagingDir}\hyperion_qt\*"; DestDir: "{app}"; Flags: ignorev
 #endif
 
 ;dependencies
-Source: "{#ComponentStagingDir}\dependencies\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs;
+Source: "{#ComponentStagingDir}\dependencies\*"; DestDir: "{app}"; Excludes: "\bin\{#VCRedist}"; Flags: ignoreversion recursesubdirs;
+
+;vc_redist
+Source: "{#ComponentStagingDir}\dependencies\bin\{#VCRedist}"; DestDir: {tmp}; Flags: deleteafterinstall
 
 [Registry]
 Root: HKCU; Subkey: "Software\Microsoft\Windows\CurrentVersion\Run"; ValueType: string; ValueName: "Hyperion"; ValueData: "{app}\hyperiond.exe"; Flags:uninsdeletevalue; Tasks: autostart
 
 [Icons]
 ;menu icons
 Name: "{group}\{#AppName}"; Filename: "{app}\bin\hyperiond.exe"
+Name: "{group}\{#AppName} {cm:MenuIconConsole}"; Filename: "{app}\bin\hyperiond.exe"; Parameters: "-c"
+
+;uninstaller
 Name: "{group}\{cm:UninstallProgram,{#AppName}}"; Filename: "{uninstallexe}"
 
-;desktop icon
-Name: "{commondesktop}\Hyperion"; Filename: "{app}\bin\hyperiond.exe"; Tasks: desktopicon; Components: runtime
-Name: "{userdesktop}\Hyperion"; Filename: "{app}\bin\hyperiond.exe"; Tasks: desktopicon\common; Components: runtime
+;common desktop icon
+Name: "{commondesktop}\Hyperion"; Filename: "{app}\bin\hyperiond.exe"; Tasks: desktopicon\common; Components: runtime
+;user desktop icon
+Name: "{userdesktop}\Hyperion"; Filename: "{app}\bin\hyperiond.exe"; Tasks: desktopicon\user; Components: runtime
 
 [Run]
+Filename: "{tmp}\{#VCRedist}"; Parameters: "/install /quiet /norestart"; StatusMsg: "{cm:VCRedistInstall}"
 Filename: "{app}\bin\hyperiond.exe"; Description: "{cm:LaunchProgram,{#StringChange(AppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
 
 [Code]

src/hyperiond/main.cpp

@@ -123,6 +123,9 @@ int main(int argc, char** argv)
 	QString processName = QCoreApplication::applicationName();
 #ifdef _WIN32
 	processName.append(".exe");
+
+	// This prevents INNO Setup from being (un)installed while Hyperion is running!
+	CreateMutexA(0, FALSE, "Hyperion");
 #endif
 
 	QObject::connect(&errorManager, &ErrorManager::errorOccurred, [&](const QString& error) {