From a563cc8cdfb1de128ee4010ad2748e6bfe5893ad Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 9 Jan 2021 14:33:11 +0000 Subject: [PATCH] Ignore versions on windows installer, always replacing files --- windows/inno/win32.iss | 36 +++++++++++++++---------------- windows/inno/win64.iss | 48 +++++++++++++++++++++--------------------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/windows/inno/win32.iss b/windows/inno/win32.iss index 3c74745b..4a1c967f 100644 --- a/windows/inno/win32.iss +++ b/windows/inno/win32.iss @@ -26,31 +26,31 @@ Name: dev; Description: "Developer resources"; Types: full router; [Files] ; icon -Source: "jack.ico"; DestDir: "{app}"; Components: jackserver; +Source: "jack.ico"; DestDir: "{app}"; Components: jackserver; Flags: ignoreversion; ; jackd and server libs -Source: "win32\bin\jackd.exe"; DestDir: "{app}"; Components: jackserver; -Source: "win32\lib\libjacknet.dll"; DestDir: "{app}"; Components: jackserver; -Source: "win32\lib\libjackserver.dll"; DestDir: "{app}"; Components: jackserver; +Source: "win32\bin\jackd.exe"; DestDir: "{app}"; Components: jackserver; Flags: ignoreversion; +Source: "win32\lib\libjacknet.dll"; DestDir: "{app}"; Components: jackserver; Flags: ignoreversion; +Source: "win32\lib\libjackserver.dll"; DestDir: "{app}"; Components: jackserver; Flags: ignoreversion; ; drivers -Source: "win32\lib\jack\*.dll"; DestDir: "{app}\jack"; Components: jackserver; +Source: "win32\lib\jack\*.dll"; DestDir: "{app}\jack"; Components: jackserver; Flags: ignoreversion; ; tools -Source: "win32\bin\jack_*.exe"; DestDir: "{app}\tools"; Components: jackserver; +Source: "win32\bin\jack_*.exe"; DestDir: "{app}\tools"; Components: jackserver; Flags: ignoreversion; ; jack client lib (NOTE goes into windir) -Source: "win32\lib\libjack.dll"; DestDir: "{win}"; Components: jackserver; +Source: "win32\lib\libjack.dll"; DestDir: "{win}"; Components: jackserver; Flags: ignoreversion; ; qjackctl -Source: "win32\bin\qjackctl.exe"; DestDir: "{app}\qjackctl"; Components: qjackctl; -Source: "Qt5*.dll"; DestDir: "{app}\qjackctl"; Components: qjackctl; -Source: "qwindows.dll"; DestDir: "{app}\qjackctl\platforms"; Components: qjackctl; +Source: "win32\bin\qjackctl.exe"; DestDir: "{app}\qjackctl"; Components: qjackctl; Flags: ignoreversion; +Source: "Qt5*.dll"; DestDir: "{app}\qjackctl"; Components: qjackctl; Flags: ignoreversion; +Source: "qwindows.dll"; DestDir: "{app}\qjackctl\platforms"; Components: qjackctl; Flags: ignoreversion; ; dev -Source: "win32\include\jack\*.h"; DestDir: "{app}\include\jack"; Components: dev; -Source: "win32\lib\*.a"; DestDir: "{app}\lib"; Components: dev; -Source: "win32\lib\*.def"; DestDir: "{app}\lib"; Components: dev; -Source: "win32\lib\*.lib"; DestDir: "{app}\lib"; Components: dev; -Source: "win32\lib\jack\*.a"; DestDir: "{app}\lib\jack"; Components: dev; +Source: "win32\include\jack\*.h"; DestDir: "{app}\include\jack"; Components: dev; Flags: ignoreversion; +Source: "win32\lib\*.a"; DestDir: "{app}\lib"; Components: dev; Flags: ignoreversion; +Source: "win32\lib\*.def"; DestDir: "{app}\lib"; Components: dev; Flags: ignoreversion; +Source: "win32\lib\*.lib"; DestDir: "{app}\lib"; Components: dev; Flags: ignoreversion; +Source: "win32\lib\jack\*.a"; DestDir: "{app}\lib\jack"; Components: dev; Flags: ignoreversion; ; router -Source: "win32\jack-router\README.txt"; DestDir: "{app}\jack-router"; Components: router; -Source: "win32\jack-router\win32\JackRouter.dll"; DestDir: "{app}\jack-router\win32"; Components: router; Flags: regserver; -Source: "win32\jack-router\win32\JackRouter.ini"; DestDir: "{app}\jack-router\win32"; Components: router; +Source: "win32\jack-router\README.txt"; DestDir: "{app}\jack-router"; Components: router; Flags: ignoreversion; +Source: "win32\jack-router\win32\JackRouter.dll"; DestDir: "{app}\jack-router\win32"; Components: router; Flags: ignoreversion regserver; +Source: "win32\jack-router\win32\JackRouter.ini"; DestDir: "{app}\jack-router\win32"; Components: router; Flags: ignoreversion; [Icons] Name: "{commonprograms}\QjackCtl"; Filename: "{app}\qjackctl\qjackctl.exe"; IconFilename: "{app}\jack.ico"; WorkingDir: "{app}"; Comment: "Graphical Interface for JACK"; Components: qjackctl; diff --git a/windows/inno/win64.iss b/windows/inno/win64.iss index 8e25a1ea..2e68e80e 100644 --- a/windows/inno/win64.iss +++ b/windows/inno/win64.iss @@ -27,37 +27,37 @@ Name: dev; Description: "Developer resources"; Types: full router; [Files] ; icon -Source: "jack.ico"; DestDir: "{app}"; Components: jackserver; +Source: "jack.ico"; DestDir: "{app}"; Components: jackserver; Flags: ignoreversion; ; jackd and server libs -Source: "win64\bin\jackd.exe"; DestDir: "{app}"; Components: jackserver; -Source: "win64\lib\libjacknet64.dll"; DestDir: "{app}"; Components: jackserver; -Source: "win64\lib\libjackserver64.dll"; DestDir: "{app}"; Components: jackserver; +Source: "win64\bin\jackd.exe"; DestDir: "{app}"; Components: jackserver; Flags: ignoreversion; +Source: "win64\lib\libjacknet64.dll"; DestDir: "{app}"; Components: jackserver; Flags: ignoreversion; +Source: "win64\lib\libjackserver64.dll"; DestDir: "{app}"; Components: jackserver; Flags: ignoreversion; ; drivers -Source: "win64\lib\jack\*.dll"; DestDir: "{app}\jack"; Components: jackserver; +Source: "win64\lib\jack\*.dll"; DestDir: "{app}\jack"; Components: jackserver; Flags: ignoreversion; ; tools -Source: "win64\bin\jack_*.exe"; DestDir: "{app}\tools"; Components: jackserver; +Source: "win64\bin\jack_*.exe"; DestDir: "{app}\tools"; Components: jackserver; Flags: ignoreversion; ; jack client lib (NOTE goes into windir) -Source: "win64\lib\libjack64.dll"; DestDir: "{win}"; Components: jackserver; -Source: "win64\lib32\libjack.dll"; DestDir: "{win}"; Components: jackserver; +Source: "win64\lib\libjack64.dll"; DestDir: "{win}"; Components: jackserver; Flags: ignoreversion; +Source: "win64\lib32\libjack.dll"; DestDir: "{win}"; Components: jackserver; Flags: ignoreversion; ; qjackctl -Source: "win64\bin\qjackctl.exe"; DestDir: "{app}\qjackctl"; Components: qjackctl; -Source: "Qt5*.dll"; DestDir: "{app}\qjackctl"; Components: qjackctl; -Source: "qwindows.dll"; DestDir: "{app}\qjackctl\platforms"; Components: qjackctl; +Source: "win64\bin\qjackctl.exe"; DestDir: "{app}\qjackctl"; Components: qjackctl; Flags: ignoreversion; +Source: "Qt5*.dll"; DestDir: "{app}\qjackctl"; Components: qjackctl; Flags: ignoreversion; +Source: "qwindows.dll"; DestDir: "{app}\qjackctl\platforms"; Components: qjackctl; Flags: ignoreversion; ; dev -Source: "win64\include\jack\*.h"; DestDir: "{app}\include\jack"; Components: dev; -Source: "win64\lib\*.a"; DestDir: "{app}\lib"; Components: dev; -Source: "win64\lib\*.def"; DestDir: "{app}\lib"; Components: dev; -Source: "win64\lib\*.lib"; DestDir: "{app}\lib"; Components: dev; -Source: "win64\lib32\*.a"; DestDir: "{app}\lib32"; Components: dev; -Source: "win64\lib32\*.def"; DestDir: "{app}\lib32"; Components: dev; -Source: "win64\lib32\*.lib"; DestDir: "{app}\lib32"; Components: dev; -Source: "win64\lib\jack\*.a"; DestDir: "{app}\lib\jack"; Components: dev; +Source: "win64\include\jack\*.h"; DestDir: "{app}\include\jack"; Components: dev; Flags: ignoreversion; +Source: "win64\lib\*.a"; DestDir: "{app}\lib"; Components: dev; Flags: ignoreversion; +Source: "win64\lib\*.def"; DestDir: "{app}\lib"; Components: dev; Flags: ignoreversion; +Source: "win64\lib\*.lib"; DestDir: "{app}\lib"; Components: dev; Flags: ignoreversion; +Source: "win64\lib32\*.a"; DestDir: "{app}\lib32"; Components: dev; Flags: ignoreversion; +Source: "win64\lib32\*.def"; DestDir: "{app}\lib32"; Components: dev; Flags: ignoreversion; +Source: "win64\lib32\*.lib"; DestDir: "{app}\lib32"; Components: dev; Flags: ignoreversion; +Source: "win64\lib\jack\*.a"; DestDir: "{app}\lib\jack"; Components: dev; Flags: ignoreversion; ; router -Source: "win64\jack-router\README.txt"; DestDir: "{app}\jack-router"; Components: router; -Source: "win64\jack-router\win32\JackRouter.dll"; DestDir: "{app}\jack-router\win32"; Components: router; Flags: regserver 32bit; -Source: "win64\jack-router\win32\JackRouter.ini"; DestDir: "{app}\jack-router\win32"; Components: router; -Source: "win64\jack-router\win64\JackRouter.dll"; DestDir: "{app}\jack-router\win64"; Components: router; Flags: regserver 64bit; -Source: "win64\jack-router\win64\JackRouter.ini"; DestDir: "{app}\jack-router\win64"; Components: router; +Source: "win64\jack-router\README.txt"; DestDir: "{app}\jack-router"; Components: router; Flags: ignoreversion; +Source: "win64\jack-router\win32\JackRouter.dll"; DestDir: "{app}\jack-router\win32"; Components: router; Flags: ignoreversion regserver 32bit; +Source: "win64\jack-router\win32\JackRouter.ini"; DestDir: "{app}\jack-router\win32"; Components: router; Flags: ignoreversion; +Source: "win64\jack-router\win64\JackRouter.dll"; DestDir: "{app}\jack-router\win64"; Components: router; Flags: ignoreversion regserver 64bit; +Source: "win64\jack-router\win64\JackRouter.ini"; DestDir: "{app}\jack-router\win64"; Components: router; Flags: ignoreversion; [Icons] Name: "{commonprograms}\QjackCtl"; Filename: "{app}\qjackctl\qjackctl.exe"; IconFilename: "{app}\jack.ico"; WorkingDir: "{app}"; Comment: "Graphical Interface for JACK"; Components: qjackctl;