# HG changeset patch
# User Chris Cannam
# Date 1576507020 0
# Node ID 28b1dd4ee37089324f19f839a88c62c2c9f9ec04
# Parent  a822ca3eff4121678579ed148684f3c2271092ca
Try separating out platform script subdirs

diff -r a822ca3eff41 -r 28b1dd4ee370 azi.pro
--- a/azi.pro	Fri Dec 13 17:03:03 2019 +0000
+++ b/azi.pro	Mon Dec 16 14:37:00 2019 +0000
@@ -33,7 +33,7 @@
     LIBS += -exported_symbols_list $$PWD/azi/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$PWD/deploy/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
 
 !win* {
     QMAKE_POST_LINK += && \
diff -r a822ca3eff41 -r 28b1dd4ee370 bbc-vamp-plugins.pro
--- a/bbc-vamp-plugins.pro	Fri Dec 13 17:03:03 2019 +0000
+++ b/bbc-vamp-plugins.pro	Mon Dec 16 14:37:00 2019 +0000
@@ -33,7 +33,7 @@
     LIBS += -exported_symbols_list $$PWD/bbc-vamp-plugins/src/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$PWD/deploy/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
 
 !win* {
     QMAKE_POST_LINK += && \
diff -r a822ca3eff41 -r 28b1dd4ee370 beatroot-vamp.pro
--- a/beatroot-vamp.pro	Fri Dec 13 17:03:03 2019 +0000
+++ b/beatroot-vamp.pro	Mon Dec 16 14:37:00 2019 +0000
@@ -33,7 +33,7 @@
     LIBS += -exported_symbols_list $$PWD/beatroot-vamp/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$PWD/deploy/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
 
 !win* {
     QMAKE_POST_LINK += && \
diff -r a822ca3eff41 -r 28b1dd4ee370 cepstral-pitchtracker.pro
--- a/cepstral-pitchtracker.pro	Fri Dec 13 17:03:03 2019 +0000
+++ b/cepstral-pitchtracker.pro	Mon Dec 16 14:37:00 2019 +0000
@@ -33,7 +33,7 @@
     LIBS += -exported_symbols_list $$PWD/cepstral-pitchtracker/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$PWD/deploy/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
 
 !win* {
     QMAKE_POST_LINK += && \
diff -r a822ca3eff41 -r 28b1dd4ee370 constant-q-cpp.pro
--- a/constant-q-cpp.pro	Fri Dec 13 17:03:03 2019 +0000
+++ b/constant-q-cpp.pro	Mon Dec 16 14:37:00 2019 +0000
@@ -33,7 +33,7 @@
     LIBS += -exported_symbols_list $$PWD/constant-q-cpp/vamp/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$PWD/deploy/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
 
 !win* {
     QMAKE_POST_LINK += && \
diff -r a822ca3eff41 -r 28b1dd4ee370 deploy/linux/mark-for-signing
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/linux/mark-for-signing	Mon Dec 16 14:37:00 2019 +0000
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+
+usage() {
+    echo "Usage: $0 <plugin-dir>" 1>&2
+    exit 2
+}    
+
+dir="$1"
+
+if [ ! -d "$dir" ]; then
+    usage
+fi
+
+if [ -n "$2" ]; then
+    usage
+fi
+
+set -u
+
+touch "$dir"/.something-to-sign
+
diff -r a822ca3eff41 -r 28b1dd4ee370 deploy/linux/sign-plugins
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/linux/sign-plugins	Mon Dec 16 14:37:00 2019 +0000
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# This is purely a stub - we have no actual signing on Linux yet
+
+set -e
+
+usage() {
+    echo "Usage: $0 <plugin> [<plugin> ...]" 1>&2
+    echo "       $0 <plugin-dir>" 1>&2
+    exit 2
+}    
+
+first_arg="$1"
+
+if [ -z "$first_arg" ]; then
+    usage
+fi
+
+if [ -d "$first_arg" ] && [ -n "$2" ]; then
+    usage
+fi
+
+paths=("$@")
+
+set -u
+
+sign() {
+    path="$1"
+    echo "$path"
+}
+
+if [ -d "$first_arg" ]; then
+    for path in "$first_arg"/*.{dll,so,dylib} ; do
+        if [ -f "$path" ]; then
+            sign "$path"
+        fi
+    done
+    touch "$first_arg/.signed"
+else
+    for path in "${paths[@]}"; do
+        if [ ! -f "$path" ]; then
+            echo "ERROR: Path $path not found" 1>&2
+            exit 1
+        fi
+    done
+    for path in "${paths[@]}"; do
+        sign "$path"
+    done
+fi
+
+exit 0
+
diff -r a822ca3eff41 -r 28b1dd4ee370 deploy/mark-for-signing
--- a/deploy/mark-for-signing	Fri Dec 13 17:03:03 2019 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -e
-
-usage() {
-    echo "Usage: $0 <plugin-dir>" 1>&2
-    exit 2
-}    
-
-dir="$1"
-
-if [ ! -d "$dir" ]; then
-    usage
-fi
-
-if [ -n "$2" ]; then
-    usage
-fi
-
-set -u
-
-touch "$dir"/.something-to-sign
-
diff -r a822ca3eff41 -r 28b1dd4ee370 deploy/mark-for-signing.bat
--- a/deploy/mark-for-signing.bat	Fri Dec 13 17:03:03 2019 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-set DIR=%1
-shift
-echo( > %DIR%\.something-to-sign
diff -r a822ca3eff41 -r 28b1dd4ee370 deploy/osx/mark-for-signing
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/osx/mark-for-signing	Mon Dec 16 14:37:00 2019 +0000
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+
+usage() {
+    echo "Usage: $0 <plugin-dir>" 1>&2
+    exit 2
+}    
+
+dir="$1"
+
+if [ ! -d "$dir" ]; then
+    usage
+fi
+
+if [ -n "$2" ]; then
+    usage
+fi
+
+set -u
+
+touch "$dir"/.something-to-sign
+
diff -r a822ca3eff41 -r 28b1dd4ee370 deploy/osx/sign-plugins
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/osx/sign-plugins	Mon Dec 16 14:37:00 2019 +0000
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+set -e
+
+usage() {
+    echo "Usage: $0 <plugin> [<plugin> ...]" 1>&2
+    echo "       $0 <plugin-dir>" 1>&2
+    exit 2
+}    
+
+first_arg="$1"
+
+if [ -z "$first_arg" ]; then
+    usage
+fi
+
+if [ -d "$first_arg" ] && [ -n "$2" ]; then
+    usage
+fi
+
+paths=("$@")
+
+set -u
+
+sign() {
+    path="$1"
+    codesign -s "Developer ID Application: Chris Cannam" -fv --options runtime "$path"
+}
+
+if [ -d "$first_arg" ]; then
+    for path in "$first_arg"/*.{dll,so,dylib} ; do
+        if [ -f "$path" ]; then
+            sign "$path"
+        fi
+    done
+    touch "$first_arg/.signed"
+else
+    for path in "${paths[@]}"; do
+        if [ ! -f "$path" ]; then
+            echo "ERROR: Path $path not found" 1>&2
+            exit 1
+        fi
+    done
+    for path in "${paths[@]}"; do
+        sign "$path"
+    done
+fi
+
+exit 0
+
diff -r a822ca3eff41 -r 28b1dd4ee370 deploy/sign-plugins
--- a/deploy/sign-plugins	Fri Dec 13 17:03:03 2019 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-set -e
-
-usage() {
-    echo "Usage: $0 <plugin> [<plugin> ...]" 1>&2
-    echo "       $0 <plugin-dir>" 1>&2
-    exit 2
-}    
-
-first_arg="$1"
-
-if [ -z "$first_arg" ]; then
-    usage
-fi
-
-if [ -d "$first_arg" ] && [ -n "$2" ]; then
-    usage
-fi
-
-paths=("$@")
-
-set -u
-
-sign() {
-    path="$1"
-    if [ -d /Applications ]; then
-        codesign -s "Developer ID Application: Chris Cannam" -fv --options runtime "$path"
-    fi
-}
-
-if [ -d "$first_arg" ]; then
-    for path in "$first_arg"/*.{dll,so,dylib} ; do
-        if [ -f "$path" ]; then
-            sign "$path"
-        fi
-    done
-    touch "$first_arg/.signed"
-else
-    for path in "${paths[@]}"; do
-        if [ ! -f "$path" ]; then
-            echo "ERROR: Path $path not found" 1>&2
-            exit 1
-        fi
-    done
-    for path in "${paths[@]}"; do
-        sign "$path"
-    done
-fi
-
-exit 0
-
diff -r a822ca3eff41 -r 28b1dd4ee370 deploy/win64/mark-for-signing.bat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/win64/mark-for-signing.bat	Mon Dec 16 14:37:00 2019 +0000
@@ -0,0 +1,3 @@
+set DIR=%1
+shift
+echo( > %DIR%\.something-to-sign
diff -r a822ca3eff41 -r 28b1dd4ee370 installer.pro
--- a/installer.pro	Fri Dec 13 17:03:03 2019 +0000
+++ b/installer.pro	Mon Dec 16 14:37:00 2019 +0000
@@ -27,7 +27,7 @@
 
 sign.target = $$PWD/out/.signed
 sign.depends = $$PWD/out/.something-to-sign
-sign.commands = $$PWD/deploy/sign-plugins $$PWD/out
+sign.commands = $$DEPLOYDIR/sign-plugins $$PWD/out
 
 QMAKE_EXTRA_TARGETS += sign
 PRE_TARGETDEPS += $$sign.target
diff -r a822ca3eff41 -r 28b1dd4ee370 marsyas-vamp.pro
--- a/marsyas-vamp.pro	Fri Dec 13 17:03:03 2019 +0000
+++ b/marsyas-vamp.pro	Mon Dec 16 14:37:00 2019 +0000
@@ -35,7 +35,7 @@
     LIBS += -exported_symbols_list $$PWD/vamp-plugin-sdk/skeleton/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$PWD/deploy/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
 
 !win* {
     QMAKE_POST_LINK += && \
diff -r a822ca3eff41 -r 28b1dd4ee370 match-vamp.pro
--- a/match-vamp.pro	Fri Dec 13 17:03:03 2019 +0000
+++ b/match-vamp.pro	Mon Dec 16 14:37:00 2019 +0000
@@ -35,7 +35,7 @@
     LIBS += -exported_symbols_list $$PWD/match-vamp/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$PWD/deploy/mark-for-signing out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing out
 
 !win* {
     QMAKE_POST_LINK += && \
diff -r a822ca3eff41 -r 28b1dd4ee370 nnls-chroma.pro
--- a/nnls-chroma.pro	Fri Dec 13 17:03:03 2019 +0000
+++ b/nnls-chroma.pro	Mon Dec 16 14:37:00 2019 +0000
@@ -33,7 +33,7 @@
     LIBS += -exported_symbols_list $$PWD/nnls-chroma/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$PWD/deploy/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
 
 !win* {
     QMAKE_POST_LINK += && \
diff -r a822ca3eff41 -r 28b1dd4ee370 noconfig.pri
--- a/noconfig.pri	Fri Dec 13 17:03:03 2019 +0000
+++ b/noconfig.pri	Mon Dec 16 14:37:00 2019 +0000
@@ -10,7 +10,9 @@
 win32-msvc* {
 
     # This config is actually used only for 64-bit Windows builds.
-    
+
+    DEPLOYDIR = $$PWD/deploy/win64
+
     INCLUDEPATH += /Libraries/boost_1_69_0 $$PWD/../boost_1_69_0/ $$PWD/sv-dependency-builds/win64-msvc/include
     LIBS += -L$$PWD -L$$PWD/sv-dependency-builds/win64-msvc/lib
 
@@ -25,6 +27,8 @@
 
     # All Mac builds are 64-bit these days.
 
+    DEPLOYDIR = $$PWD/deploy/osx
+
     INCLUDEPATH += /usr/local/opt/boost/include $$PWD/sv-dependency-builds/osx/include
     LIBS += -L$$PWD -L$$PWD/sv-dependency-builds/osx/lib
 
@@ -33,6 +37,9 @@
 }
 
 linux* {
+
+    DEPLOYDIR = $$PWD/deploy/linux
+
     QMAKE_CXXFLAGS_RELEASE += -O3 -flto
     QMAKE_LFLAGS_RELEASE += -O3 -flto -Wl,--no-undefined
 }
diff -r a822ca3eff41 -r 28b1dd4ee370 pyin.pro
--- a/pyin.pro	Fri Dec 13 17:03:03 2019 +0000
+++ b/pyin.pro	Mon Dec 16 14:37:00 2019 +0000
@@ -34,7 +34,7 @@
     LIBS += -exported_symbols_list $$PWD/pyin/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$PWD/deploy/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
 
 !win* {
     QMAKE_POST_LINK += && \
diff -r a822ca3eff41 -r 28b1dd4ee370 qm-vamp-plugins.pro
--- a/qm-vamp-plugins.pro	Fri Dec 13 17:03:03 2019 +0000
+++ b/qm-vamp-plugins.pro	Mon Dec 16 14:37:00 2019 +0000
@@ -43,7 +43,7 @@
     LIBS += -exported_symbols_list $$PWD/qm-vamp-plugins/vamp-plugin.list -lpthread
 }
 
-QMAKE_POST_LINK += $$PWD/deploy/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
 
 !win* {
     QMAKE_POST_LINK += && \
diff -r a822ca3eff41 -r 28b1dd4ee370 segmentino.pro
--- a/segmentino.pro	Fri Dec 13 17:03:03 2019 +0000
+++ b/segmentino.pro	Mon Dec 16 14:37:00 2019 +0000
@@ -35,7 +35,7 @@
     LIBS += -exported_symbols_list $$PWD/segmentino/segmentino/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$PWD/deploy/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
 
 !win* {
     QMAKE_POST_LINK += && \
diff -r a822ca3eff41 -r 28b1dd4ee370 silvet.pro
--- a/silvet.pro	Fri Dec 13 17:03:03 2019 +0000
+++ b/silvet.pro	Mon Dec 16 14:37:00 2019 +0000
@@ -33,7 +33,7 @@
     LIBS += -exported_symbols_list $$PWD/silvet/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$PWD/deploy/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
 
 !win* {
     QMAKE_POST_LINK += && \
diff -r a822ca3eff41 -r 28b1dd4ee370 tipic.pro
--- a/tipic.pro	Fri Dec 13 17:03:03 2019 +0000
+++ b/tipic.pro	Mon Dec 16 14:37:00 2019 +0000
@@ -36,7 +36,7 @@
     LIBS += -exported_symbols_list $$PWD/tipic/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$PWD/deploy/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
 
 !win* {
     QMAKE_POST_LINK += && \
diff -r a822ca3eff41 -r 28b1dd4ee370 tuning-difference.pro
--- a/tuning-difference.pro	Fri Dec 13 17:03:03 2019 +0000
+++ b/tuning-difference.pro	Mon Dec 16 14:37:00 2019 +0000
@@ -34,7 +34,7 @@
     LIBS += -exported_symbols_list $$PWD/tuning-difference/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$PWD/deploy/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
 
 !win* {
     QMAKE_POST_LINK += && \
diff -r a822ca3eff41 -r 28b1dd4ee370 ua-vamp-plugins.pro
--- a/ua-vamp-plugins.pro	Fri Dec 13 17:03:03 2019 +0000
+++ b/ua-vamp-plugins.pro	Mon Dec 16 14:37:00 2019 +0000
@@ -34,7 +34,7 @@
     LIBS += -exported_symbols_list $$PWD/ua-vamp-plugins/vamp-plugin.list -lfftw3
 }
 
-QMAKE_POST_LINK += $$PWD/deploy/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
 
 !win* {
     QMAKE_POST_LINK += && \
diff -r a822ca3eff41 -r 28b1dd4ee370 vamp-aubio-plugins.pro
--- a/vamp-aubio-plugins.pro	Fri Dec 13 17:03:03 2019 +0000
+++ b/vamp-aubio-plugins.pro	Mon Dec 16 14:37:00 2019 +0000
@@ -34,7 +34,7 @@
     LIBS += -exported_symbols_list $$PWD/vamp-aubio-plugins/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$PWD/deploy/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
 
 !win* {
     QMAKE_POST_LINK += && \
diff -r a822ca3eff41 -r 28b1dd4ee370 vamp-example-plugins.pro
--- a/vamp-example-plugins.pro	Fri Dec 13 17:03:03 2019 +0000
+++ b/vamp-example-plugins.pro	Mon Dec 16 14:37:00 2019 +0000
@@ -33,7 +33,7 @@
     LIBS += -exported_symbols_list $$PWD/vamp-plugin-sdk/build/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$PWD/deploy/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
 
 !win* {
     QMAKE_POST_LINK += && \
diff -r a822ca3eff41 -r 28b1dd4ee370 vamp-fanchirp.pro
--- a/vamp-fanchirp.pro	Fri Dec 13 17:03:03 2019 +0000
+++ b/vamp-fanchirp.pro	Mon Dec 16 14:37:00 2019 +0000
@@ -34,7 +34,7 @@
     LIBS += -exported_symbols_list $$PWD/vamp-fanchirp/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$PWD/deploy/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
 
 !win* {
     QMAKE_POST_LINK += && \
diff -r a822ca3eff41 -r 28b1dd4ee370 vamp-libxtract-plugins.pro
--- a/vamp-libxtract-plugins.pro	Fri Dec 13 17:03:03 2019 +0000
+++ b/vamp-libxtract-plugins.pro	Mon Dec 16 14:37:00 2019 +0000
@@ -37,7 +37,7 @@
     LIBS += -exported_symbols_list $$PWD/vamp-libxtract-plugins/vamp-plugin.list -framework Accelerate
 }
 
-QMAKE_POST_LINK += $$PWD/deploy/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
 
 !win* {
     QMAKE_POST_LINK += && \
diff -r a822ca3eff41 -r 28b1dd4ee370 vamp-simple-cepstrum.pro
--- a/vamp-simple-cepstrum.pro	Fri Dec 13 17:03:03 2019 +0000
+++ b/vamp-simple-cepstrum.pro	Mon Dec 16 14:37:00 2019 +0000
@@ -33,7 +33,7 @@
     LIBS += -exported_symbols_list $$PWD/vamp-simple-cepstrum/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$PWD/deploy/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
 
 !win* {
     QMAKE_POST_LINK += && \
diff -r a822ca3eff41 -r 28b1dd4ee370 vamp-tempogram.pro
--- a/vamp-tempogram.pro	Fri Dec 13 17:03:03 2019 +0000
+++ b/vamp-tempogram.pro	Mon Dec 16 14:37:00 2019 +0000
@@ -33,7 +33,7 @@
     LIBS += -exported_symbols_list $$PWD/vamp-tempogram/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$PWD/deploy/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
 
 !win* {
     QMAKE_POST_LINK += && \
diff -r a822ca3eff41 -r 28b1dd4ee370 vampy.pro
--- a/vampy.pro	Fri Dec 13 17:03:03 2019 +0000
+++ b/vampy.pro	Mon Dec 16 14:37:00 2019 +0000
@@ -42,7 +42,7 @@
     LIBS += -lpython2.7 -lpthread -exported_symbols_list $$PWD/vampy/vamp-plugin.list
 }
 
-QMAKE_POST_LINK += $$PWD/deploy/mark-for-signing $$PWD/out
+QMAKE_POST_LINK += $$DEPLOYDIR/mark-for-signing $$PWD/out
 
 !win* {
     QMAKE_POST_LINK += && \