# HG changeset patch
# User Chris Cannam
# Date 1541169789 0
# Node ID 4f4eb416fcb470fc3bcc620a901c89770b6426ce
# Parent  c643094e4709efb467124735b1fe1435ee4e42b3
Deployment tweaks

diff -r c643094e4709 -r 4f4eb416fcb4 deploy/osx/deploy.sh
--- a/deploy/osx/deploy.sh	Fri Nov 02 14:42:48 2018 +0000
+++ b/deploy/osx/deploy.sh	Fri Nov 02 14:43:09 2018 +0000
@@ -97,4 +97,9 @@
 hdiutil create -srcfolder "$volume" "$dmg" -volname "$volume" -fs HFS+ && 
 	rm -r "$volume"
 
+echo
+echo "Signing dmg..."
+
+codesign -s "Developer ID Application: Chris Cannam" -fv "$dmg"
+
 echo "Done"
diff -r c643094e4709 -r 4f4eb416fcb4 deploy/osx/sign.sh
--- a/deploy/osx/sign.sh	Fri Nov 02 14:42:48 2018 +0000
+++ b/deploy/osx/sign.sh	Fri Nov 02 14:43:09 2018 +0000
@@ -12,19 +12,19 @@
 	echo "All .app bundles in pkgdir will be signed"
 	exit 2
 fi
+
+# NB at some point we are going to have to include "--options runtime"
+# in all of these codesign invocations, and figure out what to do
+# about signing plugins...
+
 for app in "$dir"/*.app; do
+    find "$app" -name \*.dylib -print | while read fr; do
+	codesign -s "Developer ID Application: Chris Cannam" -fv --deep "$fr"
+    done
+    codesign -s "Developer ID Application: Chris Cannam" -fv --deep "$app/Contents/MacOS/Sonic Visualiser"
     codesign -s "Developer ID Application: Chris Cannam" -fv --deep "$app"
-#    find "$app" -name Qt\* -print | while read fr; do
-#	codesign -s "Developer ID Application: Chris Cannam" -fv "$fr"
-#    done
-#    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"
+#    codesign -s "Developer ID Application: Chris Cannam" -fv --deep \
+#         --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"
 done