# HG changeset patch
# User Chris Cannam
# Date 1386321092 0
# Node ID ea081645b43c569b97250d2652d4554c53c7ea62
# Parent  26784984642af5ec7ccdba8d9244299b76109564# Parent  3e26b0be0b85126926f1ea64dc45227b454fa785
Merge

diff -r 3e26b0be0b85 -r ea081645b43c deploy/osx/deploy.sh
--- a/deploy/osx/deploy.sh	Thu Dec 05 15:31:22 2013 +0000
+++ b/deploy/osx/deploy.sh	Fri Dec 06 09:11:32 2013 +0000
@@ -38,7 +38,7 @@
 echo
 echo "Copying in plugin."
 
-cp ../yintony/yintony.{dylib,cat,n3} "$source/Contents/Resources/"
+cp ../pyin/pyin.{dylib,cat,n3} "$source/Contents/Resources/"
 
 echo
 echo "Fixing up paths."
@@ -56,7 +56,7 @@
 
 ln -s /Applications "$volume"/Applications
 cp README README.OSC COPYING CHANGELOG "$volume/"
-cp -rp "$source" "$target"
+cp -r "$source" "$target"
 
 echo "Done"
 
diff -r 3e26b0be0b85 -r ea081645b43c deploy/osx/sign.sh
--- a/deploy/osx/sign.sh	Thu Dec 05 15:31:22 2013 +0000
+++ b/deploy/osx/sign.sh	Fri Dec 06 09:11:32 2013 +0000
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash 
 
 # Execute this from the top-level directory of the project (the one
 # that contains the .app bundle).  Supply the name of the .app bundle
@@ -11,8 +11,15 @@
 	exit 2
 fi
 for app in "$dir"/*.app; do
+    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
+    codesign -s "Developer ID Application: Chris Cannam" -fv "$app/Contents/Resources/Tony"
     codesign -s "Developer ID Application: Chris Cannam" -fv \
-         --requirements '=designated =>  identifier "uk.ac.qmul.eecs.c4dm.Tony" 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] = "43AQ936H96"))' \
+         --requirements '=designated =>  identifier "uk.ac.qmul.eecs.c4dm.Tony" 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