Mercurial > hg > vamp-plugin-pack

changeset 113:732a4bf233df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes for static Windows build. In particular, plugins (which are not static) need to be built with "dll" target instead of "plugin" target
author Chris Cannam
date Fri, 06 Mar 2020 12:11:00 +0000
parents 7e0d33a25a9d
children 09ecb5e67454
files azi.pro bbc-vamp-plugins.pro beatroot-vamp.pro cepstral-pitchtracker.pro constant-q-cpp.pro deploy/clean-build-and-package.bat deploy/win64/build-64.bat marsyas-vamp.pro match-vamp.pro nnls-chroma.pro noconfig.pri pyin.pro qm-vamp-plugins.pro segmentino.pro silvet.pro tipic.pro tuning-difference.pro ua-vamp-plugins.pro vamp-aubio-plugins.pro vamp-example-plugins.pro vamp-fanchirp.pro vamp-libxtract-plugins.pro vamp-simple-cepstrum.pro vamp-tempogram.pro vampy.pro
diffstat 25 files changed, 33 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/azi.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/azi.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/azi
 
--- a/bbc-vamp-plugins.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/bbc-vamp-plugins.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/bbc-vamp-plugins
 
--- a/beatroot-vamp.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/beatroot-vamp.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/beatroot-vamp
 
--- a/cepstral-pitchtracker.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/cepstral-pitchtracker.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/cepstral-pitchtracker
 
--- a/constant-q-cpp.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/constant-q-cpp.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/cqvamp
 
--- a/deploy/clean-build-and-package.bat	Fri Mar 06 11:47:15 2020 +0000
+++ b/deploy/clean-build-and-package.bat	Fri Mar 06 12:11:00 2020 +0000
@@ -13,6 +13,7 @@
 @if "%YN%" neq "y" exit /b 3
 
 @echo Proceeding
+del /q /s out
 del /q /s build_win64
 call .\deploy\win64\build-64.bat sign
 if %errorlevel% neq 0 exit /b %errorlevel%
--- a/deploy/win64/build-64.bat	Fri Mar 06 11:47:15 2020 +0000
+++ b/deploy/win64/build-64.bat	Fri Mar 06 12:11:00 2020 +0000
@@ -6,7 +6,7 @@
 set STARTPWD=%CD%
 
 rem  Using Qt Base module thus:
-rem  .\configure -static -static-runtime -release -platform win32-msvc -no-opengl -no-angle -prefix C:\Qt\5.14.1-static
+rem  .\configure -static -static-runtime -release -platform win32-msvc -no-opengl -no-angle -nomake examples -prefix C:\Qt\5.14.1-static
 rem  nmake
 rem  nmake install
 rem 
@@ -15,13 +15,15 @@
 rem  nmake
 rem  nmake install
 
-set QTDIR=C:\Qt\5.14.1-static
+set QTDIR=C:\Qt\5.14.1-static-msvc2015
 if not exist %QTDIR% (
 @   echo Could not find 64-bit Qt in %QTDIR%
 @   exit /b 2
 )
 
-set vcvarsall="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat"
+rem  Not 2019! Its APIs are too new for use in our static build
+rem set vcvarsall="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat"
+set vcvarsall="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
 
 if not exist %vcvarsall% (
 @   echo "Could not find MSVC vars batch file"
@@ -35,6 +37,7 @@
 )
 
 call %vcvarsall% amd64
+if %errorlevel% neq 0 exit /b %errorlevel%
 
 set ORIGINALPATH=%PATH%
 set PATH=%PATH%;%SMLNJDIR%\bin;%QTDIR%\bin
@@ -91,9 +94,11 @@
 @echo Signing plugins and version helper
 signtool sign /v /n "%NAME%" /t http://time.certum.pl /fd sha1 /a ..\out\*.dll ..\out\*.exe
 signtool verify /pa ..\out\*.dll ..\out\*.exe
+if %errorlevel% neq 0 exit /b %errorlevel%
 )
 
 %QTDIR%\bin\rcc ..\installer.qrc -o o\qrc_installer.cpp
+if %errorlevel% neq 0 exit /b %errorlevel%
 
 qmake -spec win32-msvc -r -tp vc ..\installer.pro
 if %errorlevel% neq 0 exit /b %errorlevel%
@@ -116,6 +121,7 @@
 @echo Signing application
 signtool sign /v /n "%NAME%" /t http://time.certum.pl /fd sha1 /a release\*.exe release\*.dll
 signtool verify /pa "release\Vamp Plugin Pack Installer.exe"
+if %errorlevel% neq 0 exit /b %errorlevel%
 )
 
 cd ..
--- a/marsyas-vamp.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/marsyas-vamp.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/mvamp
 
--- a/match-vamp.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/match-vamp.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/match-vamp-plugin
 
--- a/nnls-chroma.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/nnls-chroma.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/nnls-chroma
 
--- a/noconfig.pri	Fri Mar 06 11:47:15 2020 +0000
+++ b/noconfig.pri	Fri Mar 06 12:11:00 2020 +0000
@@ -22,7 +22,7 @@
 
     DEFINES += NOMINMAX _USE_MATH_DEFINES HAVE_C99_VARARGS_MACROS _HAS_STD_BYTE=0
 
-    LIBS += -lWindowsApp
+    DEFINES += AVOID_WINRT_DEPENDENCY
 }
 
 macx* {
--- a/pyin.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/pyin.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -9,7 +9,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/pyin
 
--- a/qm-vamp-plugins.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/qm-vamp-plugins.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/qm-vamp-plugins
 
--- a/segmentino.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/segmentino.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/segmentino
 
--- a/silvet.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/silvet.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/silvet
 
--- a/tipic.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/tipic.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/tipic
 
--- a/tuning-difference.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/tuning-difference.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -9,7 +9,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/tuning-difference
 
--- a/ua-vamp-plugins.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/ua-vamp-plugins.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/ua-vamp-plugins
 
@@ -58,4 +58,3 @@
     vamp-plugin-sdk/src/vamp-sdk/PluginAdapter.cpp \
     vamp-plugin-sdk/src/vamp-sdk/RealTime.cpp
 
-
--- a/vamp-aubio-plugins.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/vamp-aubio-plugins.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/vamp-aubio
 OBJECTS_DIR = vamp-aubio-plugins/o
--- a/vamp-example-plugins.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/vamp-example-plugins.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/vamp-example-plugins
 
--- a/vamp-fanchirp.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/vamp-fanchirp.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/fanchirp
 
@@ -51,5 +51,3 @@
     vamp-plugin-sdk/src/vamp-sdk/PluginAdapter.cpp \
     vamp-plugin-sdk/src/vamp-sdk/RealTime.cpp
 
-
-
--- a/vamp-libxtract-plugins.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/vamp-libxtract-plugins.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/vamp-libxtract
 
--- a/vamp-simple-cepstrum.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/vamp-simple-cepstrum.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/simple-cepstrum
 
--- a/vamp-tempogram.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/vamp-tempogram.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/tempogram
 
--- a/vampy.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/vampy.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/vampy