roll up to new OS X 10.10 SDK, keep keytool, other updates

benfry · benfry · commit 7ae8e1a6f118 · 2015-01-19T19:17:00.000-05:00
diff --git a/build/build.xml b/build/build.xml
@@ -497,15 +497,6 @@
 -->
     </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). 
-	  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" />
diff --git a/build/macosx/appbundler.jar b/build/macosx/appbundler.jar
diff --git a/build/macosx/appbundler/build.xml b/build/macosx/appbundler/build.xml
@@ -84,9 +84,13 @@ questions.
             <arg value="Cocoa"/>
             <arg value="-F"/>
             <arg value="${env.JAVA_HOME}/../.."/>
-            <arg value="-isysroot"/>                                           
+            <arg value="-isysroot"/>
+            <!--
             <arg value="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk"/>
             <arg value="-mmacosx-version-min=10.7"/> 
+            -->
+            <arg value="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk"/>
+            <arg value="-mmacosx-version-min=10.8"/> 
             <arg value="native/main.m"/>
         </exec>
     </target>
diff --git a/build/macosx/appbundler/src/com/oracle/appbundler/AppBundlerTask.java b/build/macosx/appbundler/src/com/oracle/appbundler/AppBundlerTask.java
@@ -76,8 +76,8 @@ public class AppBundlerTask extends Task {
 
   private String applicationCategory = null;
   private boolean highResolutionCapable = true;
-  // Oracle Java 7 requires 10.7.3 or later, so require it here.
-  private String minimumSystem = "10.7.3";
+  // Oracle Java 8 requires 10.8.3 or later, so require it here.
+  private String minimumSystem = "10.8.3";
   // By default, don't embed Java FX.
   private boolean javafx = false;
 
@@ -205,10 +205,10 @@ public void addConfiguredRuntime(FileSet runtime) throws BuildException {
       "bin/",
 
       // original version, removed entire bin folder
-//      "jre/bin/",
+      //"jre/bin/",
 
       // remove everything except 'java'
-      "jre/bin/keytool",
+      // also keep 'keytool' (needed by Android)
       "jre/bin/orbd",
       "jre/bin/pack200",
       "jre/bin/policytool",
diff --git a/todo.txt b/todo.txt
@@ -5,9 +5,12 @@ X Deal with ctrl-alt-n regression
 X   https://github.com/processing/processing/issues/2979
 X splash screen for Linux
 X   https://github.com/processing/processing/pull/3005
+
+update components
 X moving to Java 8 because Java 7 will be discontinued
 X   http://www.oracle.com/technetwork/java/javase/eol-135779.html
-_   requires Vista SP2 (ok, just say 7), and OS X 10.8.3, Ubuntu 12.04
+X   requires Vista SP2 (ok, just say 7), and OS X 10.8.3, Ubuntu 12.04
+X   requires 10.10 to build appbundler (for the Xcode SDK)
 X requires ECJ update (using 4.4.1)
 X   http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.1-201409250400/
 X update to launch4j 3.6
