Inno Setup script improvement

Usa many variables in define pre.processor instruction
Add many option to Setup sectioN
Separate all languages definitions/custom strings in a separate file

diff --git a/Dist/InnoSetup/winmute-setup-languages.iss b/Dist/InnoSetup/winmute-setup-languages.iss
new file mode 100644 (file)
index 0000000..3cc6d53
--- /dev/null
+++ b/Dist/InnoSetup/winmute-setup-languages.iss
@@ -0,0 +1,8 @@
+[CustomMessages]\r
+english.StartpAppLogon=Start WinMute when you log on\r
+;italian.StartpAppLogon=Esegui WinMute all'accesso\r
+\r
+[Languages]\r
+Name: "english"; MessagesFile: "compiler:Default.isl";           InfoBeforeFile: "info-before.txt";\r
+Name: "german";  MessagesFile: "compiler:Languages\German.isl";  InfoBeforeFile: "info-before.txt";\r
+;Name: "italian";  MessagesFile: "compiler:Languages\Italian.isl";  InfoBeforeFile: "info-before.ita.txt";\r

diff --git a/Dist/InnoSetup/winmute-setup.iss b/Dist/InnoSetup/winmute-setup.iss
index 2bff0ab543c97029066280e64cc95a7851ea8e03..8f168c2b98efd4c9d0571e1c5d616fa9d991aac9 100644 (file)
--- a/Dist/InnoSetup/winmute-setup.iss
+++ b/Dist/InnoSetup/winmute-setup.iss
@@ -1,44 +1,55 @@
-#define MyAppName "WinMute"
-#define MyAppVersion "2.4.1.0"
+#include               ".\winmute-setup-languages.iss"
+#define MyAppName      "WinMute"
+#define MyAppExeName   "..\bin\" + MyAppName + ".exe"\r
+#define MyAppVersion   GetVersionNumbersString(MyAppExeName)\r
 #define MyAppPublisher "LX-Systems"
-#define MyAppURL "https://www.lx-s.de/winmute"
-#define MyAppExeName "WinMute.exe"
-#define MyAppMutex "LxSystemsWinMute"
+#define MyAppURL       "https://www.lx-s.de/winmute"
+#define MyAppExeName   "WinMute.exe"
+#define MyAppMutex     "LxSystemsWinMute"
+#define CurrentYear    GetDateTimeString('yyyy','','')
 
 [Setup]
 AppId={{D2E8F9EF-11E7-418B-B9B7-A35A69A30490}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
 AppVerName={#MyAppName} {#MyAppVersion}
+
+AppCopyright=(c) {#CurrentYear} {#MyAppPublisher}
 AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
+
+VersionInfoDescription={#MyAppName} installer
+VersionInfoProductName={#MyAppName}
+VersionInfoVersion={#MyAppVersion}
+
+UninstallDisplayName={#MyAppName}
+UninstallDisplayIcon={app}\{#MyAppExeName}.exe
+\r
+WizardStyle=modern\r
+ShowLanguageDialog=yes\r
+UsePreviousLanguage=no\r
+LanguageDetectionMethod=uilanguage\r
+
 DefaultDirName={autopf}\{#MyAppPublisher}\{#MyAppName}
 DisableProgramGroupPage=yes
-LicenseFile=..\bin\license.txt
+LicenseFile=..\bin\license.rtf
 InfoBeforeFile=info-before.txt
 AppMutex={#MyAppMutex}
 SetupMutex={#MyAppMutex}Setup
-PrivilegesRequiredOverridesAllowed=dialog
+;PrivilegesRequiredOverridesAllowed=dialog
 PrivilegesRequired=lowest
 OutputDir=..\bin\
 OutputBaseFilename=WinMuteSetup
 SetupIconFile=..\..\WinMute\icons\app.ico
-UninstallDisplayIcon={app}\{#MyAppExeName}.exe
 ArchitecturesInstallIn64BitMode=x64
 Compression=lzma
 SolidCompression=yes
-WizardStyle=modern
-ShowLanguageDialog=auto
-
-[Languages]
-Name: "en"; MessagesFile: "compiler:Default.isl"
-Name: "de"; MessagesFile: "compiler:Languages\German.isl"
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-Name: "autostart" ; Description: "Start WinMute when you log on" ; GroupDescription: "Autostart"; Flags: unchecked
+Name: "autostart" ; Description: "{cm:StartpAppLogon}" ; GroupDescription: "Autostart"; Flags: unchecked
 
 [Files]
 Source: "..\bin\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
@@ -62,3 +73,4 @@ Root: HKCU; Subkey: "Software\Microsoft\Windows\CurrentVersion\Run"; ValueType:
 
 [Run]
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+