From 3492911527f4afcb7981933a50e453111bfe7c61 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@bug.st>
Date: Fri, 1 Feb 2013 23:51:50 +0100
Subject: [PATCH 1/2] MacOSX code sign procedure

---
 build/build.xml | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/build/build.xml b/build/build.xml
index 00f995944..99c0fb1ca 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -262,6 +262,45 @@
     </exec>
   </target>
 
+  <!-- - - - - - - - - - - - - - - - -->
+  <!-- Sign application for MacOSX.  -->
+  <!-- - - - - - - - - - - - - - - - -->
+  <target name="macosx-signed-dist" if="macosx" depends="macosx-singed-dist-check, dist"
+    description="Create a downloadable and signed .zip for the Mac OS X version">
+    <fail unless="version" message="Please set the property 'version' to correctly sign distribution file" />
+
+    <!-- Remove everything from working folder -->
+    <delete dir="macosx/work/Arduino.app" />
+
+    <!-- Unzip unsigned app into working dir -->
+    <unzip dest="macosx/work" src="macosx/arduino-${version}-${platform}.zip" overwrite="false"/>
+
+    <!-- Sign app -->
+    <exec executable="codesign" dir="macosx/work" failonerror="true">
+      <arg line="-s &quot;${macosx-sign-id}&quot; -v Arduino.app/" />
+    </exec>
+
+    <!-- Create signed zip file -->
+    <exec executable="zip" dir="macosx/work">
+      <arg line="-q -r ../arduino-${version}-${platform}-signed.zip ." />
+    </exec>
+
+    <echo>
+      =======================================================
+      Arduino for Mac OS X built and signed.
+
+      macosx/arduino-${version}-${platform}-signed.zip
+      =======================================================
+    </echo>
+  </target>
+
+  <target name="macosx-singed-dist-check">
+    <fail unless="macosx-sign-id" message="Please set the property 'macosx-sign-id' to correctly sign distribution file" />
+  </target>
+
+  <!-- - - - - - - - - - - - - - - - - - - -->
+  <!-- Build distribution file for MacOSX. -->
+  <!-- - - - - - - - - - - - - - - - - - - -->
   <target name="macosx-dist" if="macosx" depends="macosx-build" description="Create a downloadable .zip for the Mac OS X version">
     <!-- The ant copy command does not preserve permissions. -->
     <chmod file="macosx/work/Arduino.app/Contents/MacOS/JavaApplicationStub" perm="+x" />

From 9b16f7baa5796989731cc8f5768dca50b34ef19f Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@bug.st>
Date: Mon, 4 Feb 2013 14:46:27 +0100
Subject: [PATCH 2/2] MacOSX code sign procedure (part 2)

---
 build/build.xml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 99c0fb1ca..fff0e2ec0 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -275,9 +275,14 @@
     <!-- Unzip unsigned app into working dir -->
     <unzip dest="macosx/work" src="macosx/arduino-${version}-${platform}.zip" overwrite="false"/>
 
+    <!-- Unlock keychain file -->
+    <exec executable="security" dir="macosx/work">
+      <arg line="unlock-keychain -p &quot;${macosx-sign-keychain-pass}&quot; &quot;${macosx-sign-keychain}&quot;" />
+    </exec>
+
     <!-- Sign app -->
     <exec executable="codesign" dir="macosx/work" failonerror="true">
-      <arg line="-s &quot;${macosx-sign-id}&quot; -v Arduino.app/" />
+      <arg line="--keychain &quot;${macosx-sign-keychain}&quot; -s &quot;${macosx-sign-id}&quot; -v Arduino.app/" />
     </exec>
 
     <!-- Create signed zip file -->
@@ -295,7 +300,9 @@
   </target>
 
   <target name="macosx-singed-dist-check">
-    <fail unless="macosx-sign-id" message="Please set the property 'macosx-sign-id' to correctly sign distribution file" />
+    <fail unless="macosx-sign-keychain" message="Please set the property 'macosx-sign-keychain' to the correct keychain file" />
+    <fail unless="macosx-sign-keychain-pass" message="Please set the property 'macosx-sign-keychain-pass' with the password to unlock the keychain" />
+    <fail unless="macosx-sign-id" message="Please set the property 'macosx-sign-id' to the correct cert identifier" />
   </target>
 
   <!-- - - - - - - - - - - - - - - - - - - -->