changeset 2089:efd1b3c3d010 spectrogramparam

Merge from default branch

--- a/deploy/win64/build-and-package.bat	Thu Nov 08 15:05:22 2018 +0000
+++ b/deploy/win64/build-and-package.bat	Mon Nov 12 11:33:00 2018 +0000
@@ -12,6 +12,28 @@
 @   exit /b 2
 )
 
+set ORIGINALPATH=%PATH%
+set PATH=C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin;%PATH%
+set NAME=Open Source Developer, Christopher Cannam
+
+set ARG=%1
+shift
+if "%ARG%" == "sign" (
+@   echo NOTE: sign option specified, will attempt to codesign exe and msi
+@   echo NOTE: starting by codesigning an unrelated executable, so we know
+@   echo NOTE: whether it'll work before doing the entire build
+copy sv-dependency-builds\win64-msvc\bin\capnp.exe signtest.exe
+signtool sign /v /n "%NAME%" /t http://time.certum.pl /fd sha1 signtest.exe
+if %errorlevel% neq 0 exit /b %errorlevel%
+signtool verify /pa signtest.exe
+if %errorlevel% neq 0 exit /b %errorlevel%
+del signtest.exe
+@   echo NOTE: success
+) else (
+@   echo NOTE: sign option not specified, will not codesign anything
+)
+
+@echo ""
 @echo Rebuilding 32-bit
 
 cd %STARTPWD%
@@ -19,6 +41,11 @@
 call .\deploy\win64\build-32.bat
 if %errorlevel% neq 0 exit /b %errorlevel%
 
+if "%ARG%" == "sign" (
+@echo Signing 32-bit executables and libraries
+signtool sign /v /n "%NAME%" /t http://time.certum.pl /fd sha1 build_win32\release\*.exe build_win32\release\*.dll
+)
+
 @echo Rebuilding 64-bit
 
 cd %STARTPWD%
@@ -26,6 +53,11 @@
 call .\deploy\win64\build-64.bat
 if %errorlevel% neq 0 exit /b %errorlevel%
 
+if "%ARG%" == "sign" (
+@echo Signing 64-bit executables and libraries
+signtool sign /v /n "%NAME%" /t http://time.certum.pl /fd sha1 build_win32\release\*.exe build_win64\release\*.dll
+)
+
 set PATH=%PATH%;"C:\Program Files (x86)\WiX Toolset v3.11\bin"
 
 @echo Packaging 32-bit
@@ -38,6 +70,12 @@
 del sonic-visualiser.wixobj
 del sonic-visualiser.wixpdb
 
+if "%ARG%" == "sign" (
+@echo Signing 32-bit package
+signtool sign /v /n "%NAME%" /t http://time.certum.pl /fd sha1 sonic-visualiser.msi
+signtool verify /pa sonic-visualiser.msi
+)
+
 @echo Packaging 64-bit
 
 cd %STARTPWD%\build_win64
@@ -48,5 +86,13 @@
 del sonic-visualiser.wixobj
 del sonic-visualiser.wixpdb
 
+if "%ARG%" == "sign" (
+@echo Signing 64-bit package
+signtool sign /v /n "%NAME%" /t http://time.certum.pl /fd sha1 sonic-visualiser.msi
+signtool verify /pa sonic-visualiser.msi
+)
+
+set PATH=%ORIGINALPATH%
+
 @echo Done
 

--- a/main/SVSplash.cpp	Thu Nov 08 15:05:22 2018 +0000
+++ b/main/SVSplash.cpp	Mon Nov 12 11:33:00 2018 +0000
@@ -91,6 +91,7 @@
 {
     painter->drawPixmap(rect(), *m_pixmap, m_pixmap->rect());
     QString text = QString("v%1").arg(SV_VERSION);
+    painter->setPen(Qt::black);
     painter->drawText
         (width() - painter->fontMetrics().width(text) - (width()/50),
          (width()/70) + painter->fontMetrics().ascent(),

--- a/repoint-lock.json	Thu Nov 08 15:05:22 2018 +0000
+++ b/repoint-lock.json	Mon Nov 12 11:33:00 2018 +0000
@@ -4,13 +4,13 @@
       "pin": "da86fb0bccb3"
     },
     "svcore": {
-      "pin": "f04038819c26"
+      "pin": "cfcfec216c21"
     },
     "svgui": {
       "pin": "37e9d6a1e00c"
     },
     "svapp": {
-      "pin": "ca64cc9047d0"
+      "pin": "29bef008588e"
     },
     "checker": {
       "pin": "17fb9ff8e072"