Mercurial > hg > vamp-plugin-pack

changeset 39:f24d8a6f1e49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Windows/MSVC fixes
author Chris Cannam
date Wed, 18 Dec 2019 16:53:08 +0000
parents 3466e0d1393c
children eb1788a438dc
files azi.pro bbc-vamp-plugins.pro beatroot-vamp.pro cepstral-pitchtracker.pro constant-q-cpp.pro deploy/win64/mark-for-signing.bat marsyas-vamp.pro nnls-chroma.pro pyin.pro qm-vamp-plugins.pro repoint-lock.json 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 23 files changed, 51 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/azi.pro	Tue Dec 17 09:51:32 2019 +0000
+++ b/azi.pro	Wed Dec 18 16:53:08 2019 +0000
@@ -33,7 +33,7 @@
     LIBS += -exported_symbols_list $$PWD/azi/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out
 
 !win* {
     QMAKE_POST_LINK += && \
--- a/bbc-vamp-plugins.pro	Tue Dec 17 09:51:32 2019 +0000
+++ b/bbc-vamp-plugins.pro	Wed Dec 18 16:53:08 2019 +0000
@@ -33,7 +33,7 @@
     LIBS += -exported_symbols_list $$PWD/bbc-vamp-plugins/src/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out
 
 !win* {
     QMAKE_POST_LINK += && \
--- a/beatroot-vamp.pro	Tue Dec 17 09:51:32 2019 +0000
+++ b/beatroot-vamp.pro	Wed Dec 18 16:53:08 2019 +0000
@@ -33,7 +33,7 @@
     LIBS += -exported_symbols_list $$PWD/beatroot-vamp/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out
 
 !win* {
     QMAKE_POST_LINK += && \
--- a/cepstral-pitchtracker.pro	Tue Dec 17 09:51:32 2019 +0000
+++ b/cepstral-pitchtracker.pro	Wed Dec 18 16:53:08 2019 +0000
@@ -33,7 +33,7 @@
     LIBS += -exported_symbols_list $$PWD/cepstral-pitchtracker/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out
 
 !win* {
     QMAKE_POST_LINK += && \
--- a/constant-q-cpp.pro	Tue Dec 17 09:51:32 2019 +0000
+++ b/constant-q-cpp.pro	Wed Dec 18 16:53:08 2019 +0000
@@ -33,7 +33,7 @@
     LIBS += -exported_symbols_list $$PWD/constant-q-cpp/vamp/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out
 
 !win* {
     QMAKE_POST_LINK += && \
--- a/deploy/win64/mark-for-signing.bat	Tue Dec 17 09:51:32 2019 +0000
+++ b/deploy/win64/mark-for-signing.bat	Wed Dec 18 16:53:08 2019 +0000
@@ -1,3 +1,24 @@
+@echo off
+
+set ME=%0
 set DIR=%1
 shift
+
+if not defined DIR (
+@   echo "Usage: %ME% <directory>"
+@   exit /b 2
+)
+
+@echo on
+
+@if not exist %DIR% (
+@    echo Could not find directory %DIR%, trying release\%DIR%
+@    set DIR=release\%DIR%
+)
+
+@if not exist %DIR% (
+@       echo Could not find directory %DIR%
+@       exit /b 2
+)
+
 echo( > %DIR%\.something-to-sign
--- a/marsyas-vamp.pro	Tue Dec 17 09:51:32 2019 +0000
+++ b/marsyas-vamp.pro	Wed Dec 18 16:53:08 2019 +0000
@@ -35,7 +35,7 @@
     LIBS += -exported_symbols_list $$PWD/vamp-plugin-sdk/skeleton/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out
 
 !win* {
     QMAKE_POST_LINK += && \
--- a/nnls-chroma.pro	Tue Dec 17 09:51:32 2019 +0000
+++ b/nnls-chroma.pro	Wed Dec 18 16:53:08 2019 +0000
@@ -33,7 +33,7 @@
     LIBS += -exported_symbols_list $$PWD/nnls-chroma/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out
 
 !win* {
     QMAKE_POST_LINK += && \
--- a/pyin.pro	Tue Dec 17 09:51:32 2019 +0000
+++ b/pyin.pro	Wed Dec 18 16:53:08 2019 +0000
@@ -34,7 +34,7 @@
     LIBS += -exported_symbols_list $$PWD/pyin/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out
 
 !win* {
     QMAKE_POST_LINK += && \
--- a/qm-vamp-plugins.pro	Tue Dec 17 09:51:32 2019 +0000
+++ b/qm-vamp-plugins.pro	Wed Dec 18 16:53:08 2019 +0000
@@ -43,7 +43,7 @@
     LIBS += -exported_symbols_list $$PWD/qm-vamp-plugins/vamp-plugin.list -lpthread
 }
 
-QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out
 
 !win* {
     QMAKE_POST_LINK += && \
--- a/repoint-lock.json	Tue Dec 17 09:51:32 2019 +0000
+++ b/repoint-lock.json	Wed Dec 18 16:53:08 2019 +0000
@@ -49,7 +49,7 @@
       "pin": "be50e19670d7702b706581d71f84d55c5ade290e"
     },
     "vamp-tempogram": {
-      "pin": "02721bb9c4f0"
+      "pin": "ac1a75151fc9"
     },
     "vamp-aubio-plugins": {
       "pin": "7a8e644aa81f0a3672b4e140396f9afe17eb2627"
@@ -76,7 +76,7 @@
       "pin": "cd235ecbeb31"
     },
     "vampy": {
-      "pin": "e1d65734d953"
+      "pin": "a38d318c85a9"
     },
     "sv-dependency-builds": {
       "pin": "d0c2a83c1364"
--- a/segmentino.pro	Tue Dec 17 09:51:32 2019 +0000
+++ b/segmentino.pro	Wed Dec 18 16:53:08 2019 +0000
@@ -35,7 +35,7 @@
     LIBS += -exported_symbols_list $$PWD/segmentino/segmentino/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out
 
 !win* {
     QMAKE_POST_LINK += && \
--- a/silvet.pro	Tue Dec 17 09:51:32 2019 +0000
+++ b/silvet.pro	Wed Dec 18 16:53:08 2019 +0000
@@ -33,7 +33,7 @@
     LIBS += -exported_symbols_list $$PWD/silvet/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out
 
 !win* {
     QMAKE_POST_LINK += && \
--- a/tipic.pro	Tue Dec 17 09:51:32 2019 +0000
+++ b/tipic.pro	Wed Dec 18 16:53:08 2019 +0000
@@ -36,7 +36,7 @@
     LIBS += -exported_symbols_list $$PWD/tipic/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out
 
 !win* {
     QMAKE_POST_LINK += && \
--- a/tuning-difference.pro	Tue Dec 17 09:51:32 2019 +0000
+++ b/tuning-difference.pro	Wed Dec 18 16:53:08 2019 +0000
@@ -34,7 +34,7 @@
     LIBS += -exported_symbols_list $$PWD/tuning-difference/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out
 
 !win* {
     QMAKE_POST_LINK += && \
--- a/ua-vamp-plugins.pro	Tue Dec 17 09:51:32 2019 +0000
+++ b/ua-vamp-plugins.pro	Wed Dec 18 16:53:08 2019 +0000
@@ -34,7 +34,7 @@
     LIBS += -exported_symbols_list $$PWD/ua-vamp-plugins/vamp-plugin.list -lfftw3
 }
 
-QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out
 
 !win* {
     QMAKE_POST_LINK += && \
--- a/vamp-aubio-plugins.pro	Tue Dec 17 09:51:32 2019 +0000
+++ b/vamp-aubio-plugins.pro	Wed Dec 18 16:53:08 2019 +0000
@@ -34,7 +34,7 @@
     LIBS += -exported_symbols_list $$PWD/vamp-aubio-plugins/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out
 
 !win* {
     QMAKE_POST_LINK += && \
--- a/vamp-example-plugins.pro	Tue Dec 17 09:51:32 2019 +0000
+++ b/vamp-example-plugins.pro	Wed Dec 18 16:53:08 2019 +0000
@@ -33,7 +33,7 @@
     LIBS += -exported_symbols_list $$PWD/vamp-plugin-sdk/build/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out
 
 !win* {
     QMAKE_POST_LINK += && \
--- a/vamp-fanchirp.pro	Tue Dec 17 09:51:32 2019 +0000
+++ b/vamp-fanchirp.pro	Wed Dec 18 16:53:08 2019 +0000
@@ -34,7 +34,7 @@
     LIBS += -exported_symbols_list $$PWD/vamp-fanchirp/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out
 
 !win* {
     QMAKE_POST_LINK += && \
--- a/vamp-libxtract-plugins.pro	Tue Dec 17 09:51:32 2019 +0000
+++ b/vamp-libxtract-plugins.pro	Wed Dec 18 16:53:08 2019 +0000
@@ -37,7 +37,7 @@
     LIBS += -exported_symbols_list $$PWD/vamp-libxtract-plugins/vamp-plugin.list -framework Accelerate
 }
 
-QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out
 
 !win* {
     QMAKE_POST_LINK += && \
--- a/vamp-simple-cepstrum.pro	Tue Dec 17 09:51:32 2019 +0000
+++ b/vamp-simple-cepstrum.pro	Wed Dec 18 16:53:08 2019 +0000
@@ -33,7 +33,7 @@
     LIBS += -exported_symbols_list $$PWD/vamp-simple-cepstrum/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out
 
 !win* {
     QMAKE_POST_LINK += && \
--- a/vamp-tempogram.pro	Tue Dec 17 09:51:32 2019 +0000
+++ b/vamp-tempogram.pro	Wed Dec 18 16:53:08 2019 +0000
@@ -33,7 +33,7 @@
     LIBS += -exported_symbols_list $$PWD/vamp-tempogram/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out
 
 !win* {
     QMAKE_POST_LINK += && \
--- a/vampy.pro	Tue Dec 17 09:51:32 2019 +0000
+++ b/vampy.pro	Wed Dec 18 16:53:08 2019 +0000
@@ -41,8 +41,15 @@
         -I/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python/numpy/core/include
     LIBS += -lpython2.7 -lpthread -exported_symbols_list $$PWD/vampy/vamp-plugin.list
 }
+win* {
+    QMAKE_CXXFLAGS += -DHAVE_NUMPY \
+        -DNDEBUG \
+        -DVAMPY_EXPORTS \
+        -I/Python27-64/include -I/Python27-64/Lib/site-packages/numpy-1.16.1-py2.7-win-amd64.egg/numpy/core/include
+    LIBS += -L/Python27-64/libs -lpython27
+}
 
-QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out
 
 !win* {
     QMAKE_POST_LINK += && \