# HG changeset patch # User Chris Cannam # Date 1579017557 0 # Node ID c8fe74afb77d4f9977234c10dc4dd4dbd6d738a7 # Parent 119588c4277288313e0b3d9a0e9bfc63ff1b9a95# Parent 729b96803ab1cfc587723b76112a995fd46821ef Merge from branch csv-export-dialog diff -r 729b96803ab1 -r c8fe74afb77d deploy/win32/generate-wxs.ps1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/deploy/win32/generate-wxs.ps1 Tue Jan 14 15:59:17 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 729b96803ab1 -r c8fe74afb77d deploy/win32/sonic-visualiser.wxs --- a/deploy/win32/sonic-visualiser.wxs Tue Jan 14 15:43:31 2020 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,272 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 729b96803ab1 -r c8fe74afb77d 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 15:59:17 2020 +0000 @@ -0,0 +1,288 @@ + + + @W@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 729b96803ab1 -r c8fe74afb77d deploy/win64/build-and-package.bat --- a/deploy/win64/build-and-package.bat Tue Jan 14 15:43:31 2020 +0000 +++ b/deploy/win64/build-and-package.bat Tue Jan 14 15:59:17 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 729b96803ab1 -r c8fe74afb77d deploy/win64/generate-wxs.ps1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/deploy/win64/generate-wxs.ps1 Tue Jan 14 15:59:17 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 729b96803ab1 -r c8fe74afb77d deploy/win64/sonic-visualiser.wxs --- a/deploy/win64/sonic-visualiser.wxs Tue Jan 14 15:43:31 2020 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,364 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 729b96803ab1 -r c8fe74afb77d 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 15:59:17 2020 +0000 @@ -0,0 +1,381 @@ + + + @W@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 729b96803ab1 -r c8fe74afb77d main/main.cpp --- a/main/main.cpp Tue Jan 14 15:43:31 2020 +0000 +++ b/main/main.cpp Tue Jan 14 15:59:17 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(); diff -r 729b96803ab1 -r c8fe74afb77d repoint-lock.json --- a/repoint-lock.json Tue Jan 14 15:43:31 2020 +0000 +++ b/repoint-lock.json Tue Jan 14 15:59:17 2020 +0000 @@ -4,13 +4,13 @@ "pin": "c42e50a5c297" }, "svcore": { - "pin": "fd5a87f3c5b4" + "pin": "23d5cb3f9f38" }, "svgui": { - "pin": "3943553b95b0" + "pin": "b33b0b06133e" }, "svapp": { - "pin": "15da3ab3d416" + "pin": "8cf265f9b1b3" }, "checker": { "pin": "ef64b3f171d9" diff -r 729b96803ab1 -r c8fe74afb77d repoint-project.json --- a/repoint-project.json Tue Jan 14 15:43:31 2020 +0000 +++ b/repoint-project.json Tue Jan 14 15:59:17 2020 +0000 @@ -16,18 +16,15 @@ }, "svcore": { "vcs": "hg", - "service": "soundsoftware", - "branch": "csv-export-dialog" + "service": "soundsoftware" }, "svgui": { "vcs": "hg", - "service": "soundsoftware", - "branch": "csv-export-dialog" + "service": "soundsoftware" }, "svapp": { "vcs": "hg", - "service": "soundsoftware", - "branch": "csv-export-dialog" + "service": "soundsoftware" }, "checker": { "vcs": "hg",