]> repos.lx-s.de Git - winmute.git/commitdiff
Merge branch 'dev' into main 29/head
authorAlexander Steinhöfer <kontakt@lx-s.de>
Thu, 12 Oct 2023 08:29:01 +0000 (10:29 +0200)
committerGitHub <noreply@github.com>
Thu, 12 Oct 2023 08:29:01 +0000 (10:29 +0200)
1  2 
Dist/InnoSetup/winmute-setup.iss

index 8f168c2b98efd4c9d0571e1c5d616fa9d991aac9,3bcf31db78472e020b7978b1ffce9274f78e4aab..f15ec5cb7908fbcf5309abe2c0502af5cf999bbb
@@@ -1,76 -1,75 +1,79 @@@
- #include               ".\winmute-setup-languages.iss"
 -#include               ".\winmute-setup-strings.iss"
--#define MyAppName      "WinMute"
++\r
++#include               ".\winmute-setup-languages.iss"\r
++\r
++#define MyAppName      "WinMute"\r
  #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 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
 -
 -WizardStyle=modern
 -ShowLanguageDialog=yes
 -UsePreviousLanguage=no
 -
 -DefaultDirName={autopf}\{#MyAppPublisher}\{#MyAppName}
 -DisableProgramGroupPage=yes
 -LicenseFile=..\bin\license.rtf
 -InfoBeforeFile=info-before.txt
 -AppMutex={#MyAppMutex}
 -SetupMutex={#MyAppMutex}Setup
 -;PrivilegesRequiredOverridesAllowed=dialog
 -PrivilegesRequired=lowest
 -OutputDir=..\bin\
 -OutputBaseFilename=WinMuteSetup
 -;SetupIconFile=..\..\WinMute\icons\app.ico
 -ArchitecturesInstallIn64BitMode=x64
 -Compression=lzma
 -SolidCompression=yes
 -
 -[Tasks]
 -Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 -Name: "autostart" ; Description: "{cm:StartpAppLogon}" ; GroupDescription: "Autostart"; Flags: unchecked
 -
 -[Files]
 -Source: "..\bin\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
 -Source: "..\bin\changelog.txt"; DestDir: "{app}"; Flags: ignoreversion
 -Source: "..\bin\license.txt"; DestDir: "{app}"; Flags: ignoreversion
 -Source: "..\bin\liesmich.html"; DestDir: "{app}"; Flags: ignoreversion
 -Source: "..\bin\readme.html"; DestDir: "{app}"; Flags: ignoreversion
 -
 -[Icons]
 -Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
 -Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
 -
 -[Registry]
 -Root: HKCU; Subkey: "Software\lx-systems"; Flags: uninsdeletekeyifempty
 -Root: HKCU; Subkey: "Software\lx-systems\WinMute"; Flags: uninsdeletekey
 -Root: HKCU; Subkey: "Software\lx-systems\WinMute"; ValueType: string; ValueName: "InstallPath"; ValueData: "{app}"
 -Root: HKCU; Subkey: "Software\lx-systems\WinMute\BluetoothDevices"; Flags: uninsdeletekey
 -Root: HKCU; Subkey: "Software\lx-systems\WinMute\WifiNetworks"; Flags: uninsdeletekey
 -Root: HKCU; Subkey: "Software\lx-systems\WinMute\ManagedAudioEndpoints"; Flags: uninsdeletekey
 -Root: HKCU; Subkey: "Software\Microsoft\Windows\CurrentVersion\Run"; ValueType: string; ValueName: "LX-Systems WinMute"; ValueData: "{app}\{#MyAppExeName}"; Tasks: autostart
 -
 -[Run]
 -Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
 -
++#define MyAppPublisher "LX-Systems"\r
++#define MyAppURL       "https://www.lx-s.de/winmute"\r
++#define MyAppExeName   "WinMute.exe"\r
++#define MyAppMutex     "LxSystemsWinMute"\r
++#define CurrentYear    GetDateTimeString('yyyy','','')\r
++\r
++[Setup]\r
++AppId={{D2E8F9EF-11E7-418B-B9B7-A35A69A30490}\r
++AppName={#MyAppName}\r
++AppVersion={#MyAppVersion}\r
++AppVerName={#MyAppName} {#MyAppVersion}\r
++\r
++AppCopyright=(c) {#CurrentYear} {#MyAppPublisher}\r
++AppPublisher={#MyAppPublisher}\r
++AppPublisherURL={#MyAppURL}\r
++AppSupportURL={#MyAppURL}\r
++AppUpdatesURL={#MyAppURL}\r
++\r
++VersionInfoDescription={#MyAppName} installer\r
++VersionInfoProductName={#MyAppName}\r
++VersionInfoVersion={#MyAppVersion}\r
++\r
++UninstallDisplayName={#MyAppName}\r
++UninstallDisplayIcon={app}\{#MyAppExeName}.exe\r
 +\r
 +WizardStyle=modern\r
 +ShowLanguageDialog=yes\r
 +UsePreviousLanguage=no\r
 +LanguageDetectionMethod=uilanguage\r
- 
- DefaultDirName={autopf}\{#MyAppPublisher}\{#MyAppName}
- DisableProgramGroupPage=yes
- LicenseFile=..\bin\license.rtf
- InfoBeforeFile=info-before.txt
- AppMutex={#MyAppMutex}
- SetupMutex={#MyAppMutex}Setup
- ;PrivilegesRequiredOverridesAllowed=dialog
- PrivilegesRequired=lowest
- OutputDir=..\bin\
- OutputBaseFilename=WinMuteSetup
- SetupIconFile=..\..\WinMute\icons\app.ico
- ArchitecturesInstallIn64BitMode=x64
- Compression=lzma
- SolidCompression=yes
- 
- [Tasks]
- Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
- Name: "autostart" ; Description: "{cm:StartpAppLogon}" ; GroupDescription: "Autostart"; Flags: unchecked
- 
- [Files]
- Source: "..\bin\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
- Source: "..\bin\changelog.txt"; DestDir: "{app}"; Flags: ignoreversion
- Source: "..\bin\license.txt"; DestDir: "{app}"; Flags: ignoreversion
- Source: "..\bin\liesmich.html"; DestDir: "{app}"; Flags: ignoreversion
- Source: "..\bin\readme.html"; DestDir: "{app}"; Flags: ignoreversion
- 
- [Icons]
- Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
- Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
- 
- [Registry]
- Root: HKCU; Subkey: "Software\lx-systems"; Flags: uninsdeletekeyifempty
- Root: HKCU; Subkey: "Software\lx-systems\WinMute"; Flags: uninsdeletekey
- Root: HKCU; Subkey: "Software\lx-systems\WinMute"; ValueType: string; ValueName: "InstallPath"; ValueData: "{app}"
- Root: HKCU; Subkey: "Software\lx-systems\WinMute\BluetoothDevices"; Flags: uninsdeletekey
- Root: HKCU; Subkey: "Software\lx-systems\WinMute\WifiNetworks"; Flags: uninsdeletekey
- Root: HKCU; Subkey: "Software\lx-systems\WinMute\ManagedAudioEndpoints"; Flags: uninsdeletekey
- Root: HKCU; Subkey: "Software\Microsoft\Windows\CurrentVersion\Run"; ValueType: string; ValueName: "LX-Systems WinMute"; ValueData: "{app}\{#MyAppExeName}"; Tasks: autostart
- 
- [Run]
- Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
- 
++\r
++DefaultDirName={autopf}\{#MyAppPublisher}\{#MyAppName}\r
++DisableProgramGroupPage=yes\r
++LicenseFile=..\bin\license.rtf\r
++InfoBeforeFile=info-before.txt\r
++AppMutex={#MyAppMutex}\r
++SetupMutex={#MyAppMutex}Setup\r
++;PrivilegesRequiredOverridesAllowed=dialog\r
++PrivilegesRequired=lowest\r
++OutputDir=..\bin\\r
++OutputBaseFilename=WinMuteSetup\r
++\r
++SetupIconFile=..\..\WinMute\icons\app.ico\r
++ArchitecturesInstallIn64BitMode=x64\r
++Compression=lzma\r
++SolidCompression=yes\r
++\r
++[Tasks]\r
++Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked\r
++Name: "autostart" ; Description: "{cm:StartpAppLogon}" ; GroupDescription: "Autostart"; Flags: unchecked\r
++\r
++[Files]\r
++Source: "..\bin\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion\r
++Source: "..\bin\changelog.txt"; DestDir: "{app}"; Flags: ignoreversion\r
++Source: "..\bin\license.txt"; DestDir: "{app}"; Flags: ignoreversion\r
++Source: "..\bin\liesmich.html"; DestDir: "{app}"; Flags: ignoreversion\r
++Source: "..\bin\readme.html"; DestDir: "{app}"; Flags: ignoreversion\r
++\r
++[Icons]\r
++Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"\r
++Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon\r
++\r
++[Registry]\r
++Root: HKCU; Subkey: "Software\lx-systems"; Flags: uninsdeletekeyifempty\r
++Root: HKCU; Subkey: "Software\lx-systems\WinMute"; Flags: uninsdeletekey\r
++Root: HKCU; Subkey: "Software\lx-systems\WinMute"; ValueType: string; ValueName: "InstallPath"; ValueData: "{app}"\r
++Root: HKCU; Subkey: "Software\lx-systems\WinMute\BluetoothDevices"; Flags: uninsdeletekey\r
++Root: HKCU; Subkey: "Software\lx-systems\WinMute\WifiNetworks"; Flags: uninsdeletekey\r
++Root: HKCU; Subkey: "Software\lx-systems\WinMute\ManagedAudioEndpoints"; Flags: uninsdeletekey\r
++Root: HKCU; Subkey: "Software\Microsoft\Windows\CurrentVersion\Run"; ValueType: string; ValueName: "LX-Systems WinMute"; ValueData: "{app}\{#MyAppExeName}"; Tasks: autostart\r
++\r
++[Run]\r
++Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent\r
++\r