Add jack-router to windows installer, opt-in

windows/inno/win32.iss

@@ -14,26 +14,29 @@ OutputDir=.
 UsePreviousAppDir=no
 
 [Types]
-Name: "full"; Description: "Full installation";
+Name: "full"; Description: "Full installation (without JACK-Router)";
+Name: "router"; Description: "Full installation (with JACK-Router)";
 Name: "custom"; Description: "Custom installation"; Flags: iscustom;
 
 [Components]
-Name: qjackctl; Description: "QJackCtl application (recommended)"; Types: full;
-Name: dev; Description: "Developer resources"; Types: full;
+Name: jackserver; Description: "JACK Server and tools"; Types: full router custom; Flags: fixed;
+Name: qjackctl; Description: "QjackCtl application (recommended)"; Types: full router;
+Name: router; Description: "JACK-Router ASIO Driver"; Types: router;
+Name: dev; Description: "Developer resources"; Types: full router;
 
 [Files]
 ; icon
-Source: "jack.ico"; DestDir: "{app}";
+Source: "jack.ico"; DestDir: "{app}"; Components: jackserver;
 ; jackd and server libs
-Source: "win32\bin\jackd.exe"; DestDir: "{app}";
-Source: "win32\lib\libjacknet.dll"; DestDir: "{app}";
-Source: "win32\lib\libjackserver.dll"; DestDir: "{app}";
+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;
 ; drivers
-Source: "win32\lib\jack\*.dll"; DestDir: "{app}\jack";
+Source: "win32\lib\jack\*.dll"; DestDir: "{app}\jack"; Components: jackserver;
 ; tools
-Source: "win32\bin\jack_*.exe"; DestDir: "{app}\tools";
+Source: "win32\bin\jack_*.exe"; DestDir: "{app}\tools"; Components: jackserver;
 ; jack client lib (NOTE goes into windir)
-Source: "win32\lib\libjack.dll"; DestDir: "{win}";
+Source: "win32\lib\libjack.dll"; DestDir: "{win}"; Components: jackserver;
 ; qjackctl
 Source: "win32\bin\qjackctl.exe"; DestDir: "{app}\qjackctl"; Components: qjackctl;
 Source: "Qt5*.dll"; DestDir: "{app}\qjackctl"; Components: qjackctl;
@@ -44,9 +47,13 @@ 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;
+; 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;
 
 [Icons]
-Name: "{commonprograms}\QJackCtl"; Filename: "{app}\qjackctl\qjackctl.exe"; IconFilename: "{app}\jack.ico"; WorkingDir: "{app}"; Comment: "Graphical Interface for JACK"; Components: qjackctl;
+Name: "{commonprograms}\QjackCtl"; Filename: "{app}\qjackctl\qjackctl.exe"; IconFilename: "{app}\jack.ico"; WorkingDir: "{app}"; Comment: "Graphical Interface for JACK"; Components: qjackctl;
 
 [Registry]
 Root: HKLM; Subkey: "Software\JACK"; Flags: deletevalue uninsdeletekeyifempty uninsdeletevalue; ValueType: string; ValueName: "ServerExecutable"; ValueData: "{app}\jackd.exe"

windows/inno/win64.iss

@@ -15,27 +15,30 @@ OutputDir=.
 UsePreviousAppDir=no
 
 [Types]
-Name: "full"; Description: "Full installation";
+Name: "full"; Description: "Full installation (without JACK-Router)";
+Name: "router"; Description: "Full installation (with JACK-Router)";
 Name: "custom"; Description: "Custom installation"; Flags: iscustom;
 
 [Components]
-Name: qjackctl; Description: "QJackCtl application (recommended)"; Types: full;
-Name: dev; Description: "Developer resources"; Types: full;
+Name: jackserver; Description: "JACK Server and tools"; Types: full router custom; Flags: fixed;
+Name: qjackctl; Description: "QjackCtl application (recommended)"; Types: full router;
+Name: router; Description: "JACK-Router ASIO Driver"; Types: router;
+Name: dev; Description: "Developer resources"; Types: full router;
 
 [Files]
 ; icon
-Source: "jack.ico"; DestDir: "{app}";
+Source: "jack.ico"; DestDir: "{app}"; Components: jackserver;
 ; jackd and server libs
-Source: "win64\bin\jackd.exe"; DestDir: "{app}";
-Source: "win64\lib\libjacknet64.dll"; DestDir: "{app}";
-Source: "win64\lib\libjackserver64.dll"; DestDir: "{app}";
+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;
 ; drivers
-Source: "win64\lib\jack\*.dll"; DestDir: "{app}\jack";
+Source: "win64\lib\jack\*.dll"; DestDir: "{app}\jack"; Components: jackserver;
 ; tools
-Source: "win64\bin\jack_*.exe"; DestDir: "{app}\tools";
+Source: "win64\bin\jack_*.exe"; DestDir: "{app}\tools"; Components: jackserver;
 ; jack client lib (NOTE goes into windir)
-Source: "win64\lib\libjack64.dll"; DestDir: "{win}";
-Source: "win64\lib32\libjack.dll"; DestDir: "{win}";
+Source: "win64\lib\libjack64.dll"; DestDir: "{win}"; Components: jackserver;
+Source: "win64\lib32\libjack.dll"; DestDir: "{win}"; Components: jackserver;
 ; qjackctl
 Source: "win64\bin\qjackctl.exe"; DestDir: "{app}\qjackctl"; Components: qjackctl;
 Source: "Qt5*.dll"; DestDir: "{app}\qjackctl"; Components: qjackctl;
@@ -49,9 +52,15 @@ 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;
+; 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;
 
 [Icons]
-Name: "{commonprograms}\QJackCtl"; Filename: "{app}\qjackctl\qjackctl.exe"; IconFilename: "{app}\jack.ico"; WorkingDir: "{app}"; Comment: "Graphical Interface for JACK"; Components: qjackctl;
+Name: "{commonprograms}\QjackCtl"; Filename: "{app}\qjackctl\qjackctl.exe"; IconFilename: "{app}\jack.ico"; WorkingDir: "{app}"; Comment: "Graphical Interface for JACK"; Components: qjackctl;
 
 [Registry]
 Root: HKLM; Subkey: "Software\JACK"; Flags: deletevalue uninsdeletekeyifempty uninsdeletevalue; ValueType: string; ValueName: "ServerExecutable"; ValueData: "{app}\jackd.exe"