# HG changeset patch
# User Chris Cannam
# Date 1579008184 0
# Node ID 119588c4277288313e0b3d9a0e9bfc63ff1b9a95
# Parent d7b724db4bd0024f93c00e94ee8eff3e8073061f
Generate the WXS files from templated inputs, substituting in the version and redistributable paths; also include OpenSSL libraries in the package, fixing #1895 Windows build fails to open https locations
diff -r d7b724db4bd0 -r 119588c42772 deploy/win32/generate-wxs.ps1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/win32/generate-wxs.ps1 Tue Jan 14 13:23:04 2020 +0000
@@ -0,0 +1,22 @@
+
+Set-StrictMode -Version 2.0
+$ErrorActionPreference = "Stop"
+
+$version = (Get-Content version.h) -replace '#define SV_VERSION ','' -replace '"',''
+$wxs = "deploy\win32\sonic-visualiser.wxs"
+
+$in = "$wxs.in"
+
+echo "Generating $wxs..."
+echo " ...for SV version $version"
+echo " ...from $in"
+echo ""
+
+if (!(Test-Path -Path $in -PathType Leaf)) {
+ echo "ERROR: Input file $in not found"
+ exit 1
+}
+
+(Get-Content $in) -replace '@VERSION@', $version -replace '@W@', '' | Out-File -encoding ASCII $wxs
+
+echo "Done"
diff -r d7b724db4bd0 -r 119588c42772 deploy/win32/sonic-visualiser.wxs
--- a/deploy/win32/sonic-visualiser.wxs Fri Jan 10 15:06:09 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,272 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -r d7b724db4bd0 -r 119588c42772 deploy/win32/sonic-visualiser.wxs.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/win32/sonic-visualiser.wxs.in Tue Jan 14 13:23:04 2020 +0000
@@ -0,0 +1,288 @@
+
+
+ @W@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r d7b724db4bd0 -r 119588c42772 deploy/win64/build-and-package.bat
--- a/deploy/win64/build-and-package.bat Fri Jan 10 15:06:09 2020 +0000
+++ b/deploy/win64/build-and-package.bat Tue Jan 14 13:23:04 2020 +0000
@@ -12,6 +12,9 @@
@ exit /b 2
)
+powershell -NoProfile -ExecutionPolicy Bypass -Command "& 'deploy\win32\generate-wxs.ps1'"
+powershell -NoProfile -ExecutionPolicy Bypass -Command "& 'deploy\win64\generate-wxs.ps1'"
+
set ORIGINALPATH=%PATH%
set PATH=C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin;%PATH%
set NAME=Open Source Developer, Christopher Cannam
diff -r d7b724db4bd0 -r 119588c42772 deploy/win64/generate-wxs.ps1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/win64/generate-wxs.ps1 Tue Jan 14 13:23:04 2020 +0000
@@ -0,0 +1,31 @@
+
+Set-StrictMode -Version 2.0
+$ErrorActionPreference = "Stop"
+
+$redist_ver = "14.24.28127"
+$version = (Get-Content version.h) -replace '#define SV_VERSION ','' -replace '"',''
+$wxs = "deploy\win64\sonic-visualiser.wxs"
+
+$in = "$wxs.in"
+
+$redist_dir="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\$redist_ver\x64\Microsoft.VC142.CRT"
+
+echo "Generating $wxs..."
+echo " ...for SV version $version"
+echo " ...for redist version $redist_ver"
+echo " ...from $in"
+echo ""
+
+if (!(Test-Path -Path $redist_dir -PathType Container)) {
+ echo "ERROR: Redistributable directory $redist_dir not found"
+ exit 1
+}
+
+if (!(Test-Path -Path $in -PathType Leaf)) {
+ echo "ERROR: Input file $in not found"
+ exit 1
+}
+
+(Get-Content $in) -replace '@VERSION@', $version -replace '@REDIST_VER@', $redist_ver -replace '@W@', '' | Out-File -encoding ASCII $wxs
+
+echo "Done"
diff -r d7b724db4bd0 -r 119588c42772 deploy/win64/sonic-visualiser.wxs
--- a/deploy/win64/sonic-visualiser.wxs Fri Jan 10 15:06:09 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,364 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -r d7b724db4bd0 -r 119588c42772 deploy/win64/sonic-visualiser.wxs.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/win64/sonic-visualiser.wxs.in Tue Jan 14 13:23:04 2020 +0000
@@ -0,0 +1,381 @@
+
+
+ @W@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r d7b724db4bd0 -r 119588c42772 main/main.cpp
--- a/main/main.cpp Fri Jan 10 15:06:09 2020 +0000
+++ b/main/main.cpp Tue Jan 14 13:23:04 2020 +0000
@@ -43,6 +43,7 @@
#include
#include
#include
+#include
#include
#include
@@ -389,6 +390,10 @@
StoreStartupLocale();
+ SVDEBUG << "Note: SSL library build version is: "
+ << QSslSocket::sslLibraryBuildVersionString()
+ << endl;
+
// Make known-plugins query as early as possible after showing
// splash screen.
PluginScan::getInstance()->scan();