include keytool in distribution and build

benfry · benfry · commit 59df32c23732 · 2014-08-05T17:14:08.000-04:00
diff --git a/build/build.xml b/build/build.xml
@@ -50,7 +50,7 @@
     <include name="bin/klist.exe" />
     <include name="bin/ktab.exe" />
 
-    <include name="bin/keytool" />
+    <!--<include name="bin/keytool" />-->
     <include name="bin/orbd" />
     <include name="bin/policytool" />
     <include name="bin/rmid" />
@@ -66,7 +66,7 @@
   </fileset>
 
   <fileset dir="linux/work/java" id="jre-optional-linux">
-    <include name="bin/keytool" />
+    <!--<include name="bin/keytool" />-->
     <include name="bin/orbd" />
     <include name="bin/policytool" />
     <include name="bin/rmid" />
@@ -471,6 +471,13 @@
 -->
     </bundleapp>
 
+    <!-- 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. -->
+    <copy file="${jdk.path.macosx}/Contents/Home/bin/keytool"
+	  todir="macosx/work/Processing.app/Contents/PlugIns/jdk1.7.0_${jdk.update.macosx}.jdk/Contents/Home/jre/bin" />
+
+
     <copy todir="macosx/work/Processing.app/Contents/Java">
       <fileset dir=".." includes="core/library/**" /> <!-- why this? -->
       <!--<fileset dir="shared" includes="launch4j/**" />-->
diff --git a/build/macosx/appbundler/src/com/oracle/appbundler/AppBundlerTask.java b/build/macosx/appbundler/src/com/oracle/appbundler/AppBundlerTask.java
@@ -78,7 +78,7 @@ public class AppBundlerTask extends Task {
   private boolean highResolutionCapable = true;
   // Oracle Java 7 requires 10.7.3 or later, so require it here.
   private String minimumSystem = "10.7.3";
-  // By default, don't embed Java FX. 
+  // By default, don't embed Java FX.
   private boolean javafx = false;
 
   // JVM info properties
@@ -174,12 +174,12 @@ public void setMinimumSystem(String minimumSystem) {
     this.minimumSystem = minimumSystem;
   }
 
-  
+
   public void setHighResolutionCapable(boolean highResolutionCapable) {
     this.highResolutionCapable = highResolutionCapable;
   }
-  
-  
+
+
   public void setJavaFX(boolean javafx) {
     this.javafx = javafx;
   }
@@ -203,10 +203,10 @@ public void addConfiguredRuntime(FileSet runtime) throws BuildException {
 
     runtime.appendExcludes(new String[] {
       "bin/",
-      
+
       // original version, removed entire bin folder
 //      "jre/bin/",
-      
+
       // remove everything except 'java'
       "jre/bin/keytool",
       "jre/bin/orbd",
@@ -226,12 +226,12 @@ public void addConfiguredRuntime(FileSet runtime) throws BuildException {
       "jre/lib/plugin.jar",
       "jre/lib/security/javaws.policy"
     });
-    
+
     if (!javafx) {
       // http://www.oracle.com/technetwork/java/javase/jdk-7-readme-429198.html
       runtime.appendExcludes(new String[] {
         "jre/THIRDPARTYLICENSEREADME-JAVAFX.txt",
-        
+
         "jre/lib/javafx.properties",
         "jre/lib/jfxrt.jar",
         "jre/lib/security/javafx.policy",
@@ -423,7 +423,7 @@ public void execute() throws BuildException {
 
       // Copy icon to Resources folder
       copyIcon(resourcesDirectory);
-      
+
       // Copy the bundle/document icons as well
       copyBundleIcons(resourcesDirectory);
 
@@ -446,7 +446,7 @@ private void copyResources(File resourcesDirectory) throws IOException {
         if (zipEntry.isDirectory()) {
           file.mkdir();
         } else {
-          OutputStream outputStream = 
+          OutputStream outputStream =
             new BufferedOutputStream(new FileOutputStream(file), BUFFER_SIZE);
           try {
             int b = zipInputStream.read();
@@ -554,14 +554,14 @@ private void copyLibraryPathEntries(File macOSDirectory) throws IOException {
 
   private void copyIcon(File resourcesDirectory) throws IOException {
     if (iconFile == null) {
-      copy(getClass().getResource(DEFAULT_ICON_NAME), 
+      copy(getClass().getResource(DEFAULT_ICON_NAME),
            new File(resourcesDirectory, DEFAULT_ICON_NAME));
     } else {
       copy(iconFile, new File(resourcesDirectory, iconFile.getName()));
     }
   }
-  
-  
+
+
   private void copyBundleIcons(File resourcesDirectory) throws IOException {
     for (BundleDocument bundleDocument : bundleDocuments) {
       if (bundleDocument.hasIcon()) {
@@ -570,12 +570,12 @@ private void copyBundleIcons(File resourcesDirectory) throws IOException {
       }
     }
   }
-  
+
 
   private void writeInfoPlist(File file) throws IOException {
     FileOutputStream output = new FileOutputStream(file);
     PropertyLister plist = new PropertyLister(output);
-    
+
     // Get started, write all necessary header info and open plist element
     plist.writeStartDocument();
 
@@ -595,15 +595,15 @@ private void writeInfoPlist(File file) throws IOException {
     plist.writeProperty("CFBundleVersion", version);
     plist.writeProperty("CFBundleSignature", signature);
     plist.writeProperty("NSHumanReadableCopyright", copyright);
-    
+
     if (getInfo != null) {
       plist.writeProperty("CFBundleGetInfoString", getInfo);
     }
 
     if (applicationCategory != null) {
       plist.writeProperty("LSApplicationCategoryType", applicationCategory);
     }
-    
+
     if (minimumSystem != null) {
       plist.writeProperty("LSMinimumSystemVersion", minimumSystem);
     }
