From 83d015ed9e32ad32e041b63b56394755a222834b Mon Sep 17 00:00:00 2001
From: Birch-san <Birch-san@users.noreply.github.com>
Date: Sun, 4 Aug 2019 12:13:18 +0100
Subject: [PATCH] point to text files, libraries in Wix installer

---
 Builds/VisualStudio2017/juicysfplugin.sln |  44 ---------
 Builds/WixSetup/Config.wxi                |   2 +
 Builds/WixSetup/Product.wxs               | 112 ++++++++++++++++++++--
 Builds/WixSetup/WixSetup.wixproj          |   6 ++
 4 files changed, 112 insertions(+), 52 deletions(-)

diff --git a/Builds/VisualStudio2017/juicysfplugin.sln b/Builds/VisualStudio2017/juicysfplugin.sln
index e3b437f..169527f 100644
--- a/Builds/VisualStudio2017/juicysfplugin.sln
+++ b/Builds/VisualStudio2017/juicysfplugin.sln
@@ -23,91 +23,47 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WixSetup", "..\WixSetup\Wix
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug x86|Win32 = Debug x86|Win32
-		Debug x86|x64 = Debug x86|x64
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
-		Release x86|Win32 = Release x86|Win32
-		Release x86|x64 = Release x86|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7C3AB9BE-365A-0EF7-AA2A-5B044FE497E5}.Debug x86|Win32.ActiveCfg = Debug|Win32
-		{7C3AB9BE-365A-0EF7-AA2A-5B044FE497E5}.Debug x86|Win32.Build.0 = Debug|Win32
-		{7C3AB9BE-365A-0EF7-AA2A-5B044FE497E5}.Debug x86|x64.ActiveCfg = Debug|x64
-		{7C3AB9BE-365A-0EF7-AA2A-5B044FE497E5}.Debug x86|x64.Build.0 = Debug|x64
 		{7C3AB9BE-365A-0EF7-AA2A-5B044FE497E5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7C3AB9BE-365A-0EF7-AA2A-5B044FE497E5}.Debug|Win32.Build.0 = Debug|Win32
 		{7C3AB9BE-365A-0EF7-AA2A-5B044FE497E5}.Debug|x64.ActiveCfg = Debug|x64
 		{7C3AB9BE-365A-0EF7-AA2A-5B044FE497E5}.Debug|x64.Build.0 = Debug|x64
-		{7C3AB9BE-365A-0EF7-AA2A-5B044FE497E5}.Release x86|Win32.ActiveCfg = Release|Win32
-		{7C3AB9BE-365A-0EF7-AA2A-5B044FE497E5}.Release x86|Win32.Build.0 = Release|Win32
-		{7C3AB9BE-365A-0EF7-AA2A-5B044FE497E5}.Release x86|x64.ActiveCfg = Release|x64
-		{7C3AB9BE-365A-0EF7-AA2A-5B044FE497E5}.Release x86|x64.Build.0 = Release|x64
 		{7C3AB9BE-365A-0EF7-AA2A-5B044FE497E5}.Release|Win32.ActiveCfg = Release|Win32
 		{7C3AB9BE-365A-0EF7-AA2A-5B044FE497E5}.Release|Win32.Build.0 = Release|Win32
 		{7C3AB9BE-365A-0EF7-AA2A-5B044FE497E5}.Release|x64.ActiveCfg = Release|x64
 		{7C3AB9BE-365A-0EF7-AA2A-5B044FE497E5}.Release|x64.Build.0 = Release|x64
-		{F47A6C45-0C65-BB36-F74E-BCCDF23F5ECA}.Debug x86|Win32.ActiveCfg = Debug|Win32
-		{F47A6C45-0C65-BB36-F74E-BCCDF23F5ECA}.Debug x86|Win32.Build.0 = Debug|Win32
-		{F47A6C45-0C65-BB36-F74E-BCCDF23F5ECA}.Debug x86|x64.ActiveCfg = Debug|x64
-		{F47A6C45-0C65-BB36-F74E-BCCDF23F5ECA}.Debug x86|x64.Build.0 = Debug|x64
 		{F47A6C45-0C65-BB36-F74E-BCCDF23F5ECA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F47A6C45-0C65-BB36-F74E-BCCDF23F5ECA}.Debug|Win32.Build.0 = Debug|Win32
 		{F47A6C45-0C65-BB36-F74E-BCCDF23F5ECA}.Debug|x64.ActiveCfg = Debug|x64
 		{F47A6C45-0C65-BB36-F74E-BCCDF23F5ECA}.Debug|x64.Build.0 = Debug|x64
-		{F47A6C45-0C65-BB36-F74E-BCCDF23F5ECA}.Release x86|Win32.ActiveCfg = Release|Win32
-		{F47A6C45-0C65-BB36-F74E-BCCDF23F5ECA}.Release x86|Win32.Build.0 = Release|Win32
-		{F47A6C45-0C65-BB36-F74E-BCCDF23F5ECA}.Release x86|x64.ActiveCfg = Release|x64
-		{F47A6C45-0C65-BB36-F74E-BCCDF23F5ECA}.Release x86|x64.Build.0 = Release|x64
 		{F47A6C45-0C65-BB36-F74E-BCCDF23F5ECA}.Release|Win32.ActiveCfg = Release|Win32
 		{F47A6C45-0C65-BB36-F74E-BCCDF23F5ECA}.Release|Win32.Build.0 = Release|Win32
 		{F47A6C45-0C65-BB36-F74E-BCCDF23F5ECA}.Release|x64.ActiveCfg = Release|x64
 		{F47A6C45-0C65-BB36-F74E-BCCDF23F5ECA}.Release|x64.Build.0 = Release|x64
-		{70A2C49A-5DF9-60C9-981B-D030ADE816BF}.Debug x86|Win32.ActiveCfg = Debug|Win32
-		{70A2C49A-5DF9-60C9-981B-D030ADE816BF}.Debug x86|Win32.Build.0 = Debug|Win32
-		{70A2C49A-5DF9-60C9-981B-D030ADE816BF}.Debug x86|x64.ActiveCfg = Debug|x64
-		{70A2C49A-5DF9-60C9-981B-D030ADE816BF}.Debug x86|x64.Build.0 = Debug|x64
 		{70A2C49A-5DF9-60C9-981B-D030ADE816BF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{70A2C49A-5DF9-60C9-981B-D030ADE816BF}.Debug|Win32.Build.0 = Debug|Win32
 		{70A2C49A-5DF9-60C9-981B-D030ADE816BF}.Debug|x64.ActiveCfg = Debug|x64
 		{70A2C49A-5DF9-60C9-981B-D030ADE816BF}.Debug|x64.Build.0 = Debug|x64
-		{70A2C49A-5DF9-60C9-981B-D030ADE816BF}.Release x86|Win32.ActiveCfg = Release|Win32
-		{70A2C49A-5DF9-60C9-981B-D030ADE816BF}.Release x86|Win32.Build.0 = Release|Win32
-		{70A2C49A-5DF9-60C9-981B-D030ADE816BF}.Release x86|x64.ActiveCfg = Release|x64
-		{70A2C49A-5DF9-60C9-981B-D030ADE816BF}.Release x86|x64.Build.0 = Release|x64
 		{70A2C49A-5DF9-60C9-981B-D030ADE816BF}.Release|Win32.ActiveCfg = Release|Win32
 		{70A2C49A-5DF9-60C9-981B-D030ADE816BF}.Release|Win32.Build.0 = Release|Win32
 		{70A2C49A-5DF9-60C9-981B-D030ADE816BF}.Release|x64.ActiveCfg = Release|x64
 		{70A2C49A-5DF9-60C9-981B-D030ADE816BF}.Release|x64.Build.0 = Release|x64
-		{81231CE9-96E4-09DA-53C7-714106FA6BD5}.Debug x86|Win32.ActiveCfg = Debug|Win32
-		{81231CE9-96E4-09DA-53C7-714106FA6BD5}.Debug x86|Win32.Build.0 = Debug|Win32
-		{81231CE9-96E4-09DA-53C7-714106FA6BD5}.Debug x86|x64.ActiveCfg = Debug|x64
-		{81231CE9-96E4-09DA-53C7-714106FA6BD5}.Debug x86|x64.Build.0 = Debug|x64
 		{81231CE9-96E4-09DA-53C7-714106FA6BD5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{81231CE9-96E4-09DA-53C7-714106FA6BD5}.Debug|Win32.Build.0 = Debug|Win32
 		{81231CE9-96E4-09DA-53C7-714106FA6BD5}.Debug|x64.ActiveCfg = Debug|x64
 		{81231CE9-96E4-09DA-53C7-714106FA6BD5}.Debug|x64.Build.0 = Debug|x64
-		{81231CE9-96E4-09DA-53C7-714106FA6BD5}.Release x86|Win32.ActiveCfg = Release|Win32
-		{81231CE9-96E4-09DA-53C7-714106FA6BD5}.Release x86|Win32.Build.0 = Release|Win32
-		{81231CE9-96E4-09DA-53C7-714106FA6BD5}.Release x86|x64.ActiveCfg = Release|x64
-		{81231CE9-96E4-09DA-53C7-714106FA6BD5}.Release x86|x64.Build.0 = Release|x64
 		{81231CE9-96E4-09DA-53C7-714106FA6BD5}.Release|Win32.ActiveCfg = Release|Win32
 		{81231CE9-96E4-09DA-53C7-714106FA6BD5}.Release|Win32.Build.0 = Release|Win32
 		{81231CE9-96E4-09DA-53C7-714106FA6BD5}.Release|x64.ActiveCfg = Release|x64
 		{81231CE9-96E4-09DA-53C7-714106FA6BD5}.Release|x64.Build.0 = Release|x64
-		{BE799AE7-8C17-4670-85A8-E3D3558385A7}.Debug x86|Win32.ActiveCfg = Debug|Win32
-		{BE799AE7-8C17-4670-85A8-E3D3558385A7}.Debug x86|Win32.Build.0 = Debug|Win32
-		{BE799AE7-8C17-4670-85A8-E3D3558385A7}.Debug x86|x64.ActiveCfg = Release|Win32
-		{BE799AE7-8C17-4670-85A8-E3D3558385A7}.Debug x86|x64.Build.0 = Release|Win32
 		{BE799AE7-8C17-4670-85A8-E3D3558385A7}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BE799AE7-8C17-4670-85A8-E3D3558385A7}.Debug|Win32.Build.0 = Debug|Win32
 		{BE799AE7-8C17-4670-85A8-E3D3558385A7}.Debug|x64.ActiveCfg = Debug|Win32
-		{BE799AE7-8C17-4670-85A8-E3D3558385A7}.Release x86|Win32.ActiveCfg = Release|Win32
-		{BE799AE7-8C17-4670-85A8-E3D3558385A7}.Release x86|Win32.Build.0 = Release|Win32
-		{BE799AE7-8C17-4670-85A8-E3D3558385A7}.Release x86|x64.ActiveCfg = Release|Win32
-		{BE799AE7-8C17-4670-85A8-E3D3558385A7}.Release x86|x64.Build.0 = Release|Win32
 		{BE799AE7-8C17-4670-85A8-E3D3558385A7}.Release|Win32.ActiveCfg = Release|Win32
 		{BE799AE7-8C17-4670-85A8-E3D3558385A7}.Release|Win32.Build.0 = Release|Win32
 		{BE799AE7-8C17-4670-85A8-E3D3558385A7}.Release|x64.ActiveCfg = Release|Win32
diff --git a/Builds/WixSetup/Config.wxi b/Builds/WixSetup/Config.wxi
index 38f1086..3990d93 100644
--- a/Builds/WixSetup/Config.wxi
+++ b/Builds/WixSetup/Config.wxi
@@ -17,11 +17,13 @@
     <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
     <?define PlatformCommonFilesFolder = "CommonFiles64Folder" ?>
     <?define PlatformSystemFolder = "System64Folder" ?>
+    <?define WixPlatform = "x64" ?>
   <?else ?>
     <?define ProductName = "$(var.Name) (32 bit)" ?>
     <?define Win64 = "no" ?>
     <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
     <?define PlatformCommonFilesFolder = "CommonFilesFolder" ?>
     <?define PlatformSystemFolder = "SystemFolder" ?>
+    <?define WixPlatform = "x86" ?>
   <?endif ?>
 </Include>
diff --git a/Builds/WixSetup/Product.wxs b/Builds/WixSetup/Product.wxs
index 397fb41..11a4755 100644
--- a/Builds/WixSetup/Product.wxs
+++ b/Builds/WixSetup/Product.wxs
@@ -3,12 +3,12 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <?include $(sys.CURRENTDIR)\Config.wxi?>
 	<Product Id="*" Name="$(var.Name)" Language="1033" Version="1.0.0.0" Manufacturer="$(var.Manufacturer)" UpgradeCode="e03ac63d-63d8-48d1-ab6c-ba539f7d523f">
-		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Platform="$(var.Platform)" />
+		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Platform="$(var.WixPlatform)" />
 
 		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 		<MediaTemplate />
 
-    <WixVariable Id="WixUILicenseRtf" Value="test.rtf" />
+    <WixVariable Id="WixUILicenseRtf" Value="license_concatenated.rtf" />
 
 		<Feature Id="ProductFeature" Title="WixSetup" Level="1">
 			<ComponentGroupRef Id="StandaloneAppComponents" />
@@ -59,17 +59,59 @@
       </Component>
     </ComponentGroup>
     <ComponentGroup Id="LibraryComponents" Directory="$(var.PlatformSystemFolder)">
+      <?if $(var.Win64) = no ?>
+        <Component Guid="*">
+          <File Source="$(var.LibSrcRoot)libgcc_s_dw2-1.dll" />
+        </Component>
+      <?endif ?>
+      <Component Guid="*">
+        <File Source="$(var.LibSrcRoot)libFLAC-8.dll" />
+      </Component>
       <Component Guid="*">
         <File Source="$(var.LibSrcRoot)libfluidsynth-2.dll" />
       </Component>
-      <?if $(var.Win64) = no ?>
-      <?warning $(var.Win64) ?>
-      <?warning $(var.Platform) ?>
-      <?warning $(var.LibSrcRoot) ?>
       <Component Guid="*">
-        <File Source="$(var.LibSrcRoot)libgcc_s_dw2-1.dll" />
+        <File Source="$(var.LibSrcRoot)libglib-2.0-0.dll" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LibSrcRoot)libgmodule-2.0-0.dll" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LibSrcRoot)libiconv-2.dll" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LibSrcRoot)libintl-8.dll" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LibSrcRoot)libogg-0.dll" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LibSrcRoot)libpcre-1.dll" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LibSrcRoot)libportaudio-2.dll" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LibSrcRoot)libreadline8.dll" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LibSrcRoot)libsndfile-1.dll" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LibSrcRoot)libspeex-1.dll" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LibSrcRoot)libtermcap-0.dll" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LibSrcRoot)libvorbis-0.dll" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LibSrcRoot)libvorbisenc-2.dll" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LibSrcRoot)libwinpthread-1.dll" />
       </Component>
-      <?endif ?>
     </ComponentGroup>
     <ComponentGroup Id="LicenseConcatComponents" Directory="INSTALLFOLDER">
       <Component Id="license_concatenated.txt" Guid="*">
@@ -83,6 +125,60 @@
       <Component Guid="*">
         <File Source="$(var.LicenseSrcRoot)JUCE-framework_GPL3.txt" />
       </Component>
+      <Component Guid="*">
+        <File Source="$(var.LicenseSrcRoot)libflac_New_BSD.txt" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LicenseSrcRoot)libfluidsynth_LGPL_2.1.txt" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LicenseSrcRoot)libgcc_runtime_libraries_GPL3_with_GCC_runtime_library_exception.txt" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LicenseSrcRoot)libglib_LGPL_2.1.txt" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LicenseSrcRoot)libgthread_LGPL_2.1.txt" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LicenseSrcRoot)libiconv_LGPL_2.1.txt" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LicenseSrcRoot)libintl_LGPL_2.1.txt" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LicenseSrcRoot)libogg_New_BSD.txt" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LicenseSrcRoot)libpcre_BSD.txt" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LicenseSrcRoot)libportaudio_bespoke.txt" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LicenseSrcRoot)libreadline_GPL3.txt" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LicenseSrcRoot)libsndfile_LGPL_2.1.txt" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LicenseSrcRoot)libspeex_revised_BSD.txt" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LicenseSrcRoot)libtermcap_LGPL_2.1.txt" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LicenseSrcRoot)libvorbis_New_BSD.txt" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LicenseSrcRoot)libvorbisenc_New_BSD.txt" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LicenseSrcRoot)libwinpthreads_BSD_and_MIT.txt" />
+      </Component>
+      <Component Guid="*">
+        <File Source="$(var.LicenseSrcRoot)Steinberg-VST3_GPL3.txt" />
+      </Component>
     </ComponentGroup>
 	</Fragment>
 </Wix>
diff --git a/Builds/WixSetup/WixSetup.wixproj b/Builds/WixSetup/WixSetup.wixproj
index f4d6dca..814a2d9 100644
--- a/Builds/WixSetup/WixSetup.wixproj
+++ b/Builds/WixSetup/WixSetup.wixproj
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- https://wixtoolset.org/documentation/manual/v3/msbuild/task_reference/candle.html -->
+  <!-- standardize on JUCE platform names -->
+  <PropertyGroup Condition=" '$(Platform)' == 'Win32' ">
+    <!-- change candle's arch option -->
+    <InstallerPlatform>x86</InstallerPlatform>
+  </PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">Win32</Platform>