# HG changeset patch
# User Chris Cannam
# Date 1461752809 -3600
# Node ID 1e63105fc82d55976e1f53072ce8388d9cceda16
# Parent  2e83525cf638d86f64c8bfb447c412f695e436a2
Deploy plugin checker helper; update deployment for current Qt

diff -r 2e83525cf638 -r 1e63105fc82d deploy/osx/copy-qt.sh
--- a/deploy/osx/copy-qt.sh	Wed Apr 27 11:04:32 2016 +0100
+++ b/deploy/osx/copy-qt.sh	Wed Apr 27 11:26:49 2016 +0100
@@ -11,7 +11,7 @@
 
 frameworks="QtCore QtNetwork QtGui QtXml QtSvg QtWidgets QtPrintSupport QtDBus"
 
-plugins="dds gif icns ico jp2 jpeg mng tga tiff wbmp webp cocoa minimal offscreen"
+plugins="dds gif icns ico jpeg tga tiff wbmp webp cocoa minimal offscreen"
 
 qtdir=$(grep "Command:" Makefile | head -1 | awk '{ print $3; }' | sed s,/bin/.*,,)
 
diff -r 2e83525cf638 -r 1e63105fc82d deploy/osx/deploy.sh
--- a/deploy/osx/deploy.sh	Wed Apr 27 11:04:32 2016 +0100
+++ b/deploy/osx/deploy.sh	Wed Apr 27 11:26:49 2016 +0100
@@ -45,6 +45,11 @@
 cp deploy/osx/qt.conf "$source"/Contents/Resources/qt.conf
 
 echo
+echo "Copying in plugin load checker helper."
+cp checker/plugin-checker-helper.app/Contents/MacOS/plugin-checker-helper \
+    "$source"/Contents/MacOS/
+
+echo
 echo "Writing version $bundleVersion in to bundle."
 echo "(This should be a three-part number: major.minor.point)"
 
diff -r 2e83525cf638 -r 1e63105fc82d deploy/osx/sign.sh
--- a/deploy/osx/sign.sh	Wed Apr 27 11:04:32 2016 +0100
+++ b/deploy/osx/sign.sh	Wed Apr 27 11:26:49 2016 +0100
@@ -17,6 +17,9 @@
     find "$app" -name \*.dylib -print | while read fr; do
 	codesign -s "Developer ID Application: Chris Cannam" -fv "$fr"
     done
+    find "$app/Contents/MacOS" -type f -print | while read fr; do
+	codesign -s "Developer ID Application: Chris Cannam" -fv "$fr"
+    done
     codesign -s "Developer ID Application: Chris Cannam" -fv \
          --requirements '=designated =>  identifier "org.sonicvisualiser.SonicVisualiser" and ( (anchor apple generic and    certificate leaf[field.1.2.840.113635.100.6.1.9] ) or (anchor apple generic and    certificate 1[field.1.2.840.113635.100.6.2.6]  and    certificate leaf[field.1.2.840.113635.100.6.1.13] and    certificate leaf[subject.OU] = "M2H8666U82"))' \
          "$app"