From 91f70c3c447788277b5c8771efa5010ca6b960ea Mon Sep 17 00:00:00 2001
From: codeanticode <andres.colubri@gmail.com>
Date: Sat, 11 Jul 2015 10:58:54 -0400
Subject: [PATCH] rolling back manual copy of keytool on mac

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

diff --git a/build/build.xml b/build/build.xml
index ce91bb27b..5f4315b57 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -99,7 +99,7 @@
     <include name="bin/klist.exe" />
     <include name="bin/ktab.exe" />
 
-    <!--<include name="bin/keytool" />--> <!-- needed for Android -->
+    <include name="bin/keytool" /> <!-- needed for Android -->
     <include name="bin/orbd" />
     <include name="bin/policytool" />
     <include name="bin/rmid" />
@@ -114,7 +114,7 @@
   </fileset>
 
   <fileset dir="linux/work/java" id="jre-optional-linux">
-    <!--<include name="bin/keytool" />--> <!-- needed for Android -->
+    <include name="bin/keytool" /> <!-- needed for Android -->
 
     <include name="lib/ext/dnsns.jar" />
 
@@ -547,6 +547,18 @@
 -->
     </bundleapp>
 
+    <!-- Temporary fix until new appbundler is included again after solving 
+      https://github.com/processing/processing/issues/3359
+      https://github.com/processing/processing/issues/3360
+      The 'keytool' file is deleted by our appbundler. Add it back so that
+	  Android signing works properly. (Not modifying our appbundler since
+	  most of the time that appbundler is used, keytool isn't needed). 
+	  Also, because Ant's copy task does not retain file permissions on Unix systems, 
+	  we need to use <exec executable="cp" ... > instead -->
+    <exec executable="cp">
+      <arg line="${jdk.path.macosx}/Contents/Home/bin/keytool macosx/work/Processing.app/Contents/PlugIns/jdk${jdk.esoteric}.jdk/Contents/Home/jre/bin"/>
+    </exec>
+
     <!-- Replace libjli.dylib symlink with actual file. 
          Deals with code signing issues on OS X 10.9.5+ -->
     <property name="jli.path" value="macosx/work/Processing.app/Contents/PlugIns/jdk${jdk.esoteric}.jdk/Contents/MacOS/libjli.dylib" />