From 3a65e6d016b5b5dc6b46bc1c5427f97f37105f5c Mon Sep 17 00:00:00 2001
From: natureh 510 <natureh.510@gmail.com>
Date: Wed, 16 Oct 2013 23:21:31 +0200
Subject: [PATCH] Some changes in the InnoSetup mechanism (see issue 1904,
 comment 13)

---
 rtdata/CMakeLists.txt                        |  4 ++++
 rtdata/win/InnoSetup/WindowsInnoSetup.iss.in | 14 ++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/rtdata/CMakeLists.txt b/rtdata/CMakeLists.txt
index 11260b211..e125c373c 100644
--- a/rtdata/CMakeLists.txt
+++ b/rtdata/CMakeLists.txt
@@ -34,12 +34,16 @@ if (WIN32)
 		set(ARCHITECTURE_ALLOWED "x86 x64 ia64")
 		# installing in 32 bits mode even on 64 bits OS and architecture
 		set(INSTALL_MODE "")
+		# set part of the output archive name
+		set(SYSTEM_NAME "WinXP")
 	elseif (CMAKE_SIZEOF_VOID_P EQUAL 8)
 		set(BUILD_BIT_DEPTH 64)
 		# Restricting the 64 bits builds to 64 bits systems only
 		set(ARCHITECTURE_ALLOWED "x64 ia64")
 		# installing in 64 bits mode for all 64 bits processors, even for itanium architecture
 		set(INSTALL_MODE "x64 ia64")
+		# set part of the output archive name
+		set(SYSTEM_NAME "WinVista")
 	endif (CMAKE_SIZEOF_VOID_P EQUAL 4)
     configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/win/InnoSetup/WindowsInnoSetup.iss.in" "${CMAKE_CURRENT_BINARY_DIR}/WindowsInnoSetup.iss")
     install (FILES "${CMAKE_CURRENT_BINARY_DIR}/WindowsInnoSetup.iss" DESTINATION ${BINDIR})
diff --git a/rtdata/win/InnoSetup/WindowsInnoSetup.iss.in b/rtdata/win/InnoSetup/WindowsInnoSetup.iss.in
index 5040ab415..c55288926 100644
--- a/rtdata/win/InnoSetup/WindowsInnoSetup.iss.in
+++ b/rtdata/win/InnoSetup/WindowsInnoSetup.iss.in
@@ -33,6 +33,7 @@
 #define MyBitDepth "${BUILD_BIT_DEPTH}"
 #define MyTargetArchitecture "${ARCHITECTURE_ALLOWED}"
 #define MyInstallMode "${INSTALL_MODE}"
+#define MySystemName "${SYSTEM_NAME}"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
@@ -47,12 +48,12 @@ AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\{#MyAppName} {#MyAppFullVersion}
-DefaultGroupName={#MyAppName} {#MyAppFullVersion}
+DefaultDirName={pf}\{#MyAppName}-{#MyAppFullVersion}
+DefaultGroupName={#MyAppName} {#MyAppFullVersion}
 AllowNoIcons=yes
 LicenseFile={#MyBuildBasePath}\LICENSE.txt
 OutputDir={#MyBuildBasePath}\..\
-OutputBaseFilename={#MyAppName}{#MyAppVersion}-Win{#MyBitDepth}
+OutputBaseFilename={#MyAppName}_{#MySystemName}_{#MyBitDepth}_{#MyAppFullVersion}
 SetupIconFile={#MySourceBasePath}\rtgui\RT.ico
 WizardImageFile={#MySourceBasePath}\rtdata\win\InnoSetup\installerStrip.bmp
 WizardImageBackColor=$2A2A2A
@@ -60,6 +61,7 @@ Compression=lzma
 SolidCompression=yes
 ArchitecturesAllowed={#MyTargetArchitecture}
 ArchitecturesInstallIn64BitMode={#MyInstallMode}
+PrivilegesRequired=none
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -117,11 +119,11 @@ Source: "{#MyBuildBasePath}\gspawn-win{#MyBitDepth}-helper-console.exe"; DestDir
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
-Name: "{group}\{#MyAppName} {#MyAppFullVersion}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{group}\{#MyAppName} {#MyAppFullVersion}"; Filename: "{app}\{#MyAppExeName}"
 Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
 Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\{#MyAppName}{#MyAppFullVersion}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
-Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName} {#MyAppFullVersion}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon
+Name: "{commondesktop}\{#MyAppName}{#MyAppFullVersion}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName} {#MyAppFullVersion}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon
 
 [Run]
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent