fix code signing, color checking, other misc for export

benfry · benfry · commit a9942e5f7a43 · 2014-05-12T17:38:15.000-04:00
diff --git a/app/src/processing/app/ColorChooser.java b/app/src/processing/app/ColorChooser.java
@@ -39,7 +39,9 @@
 
 
 /**
- * Generic color selector frame, pulled from the Tool object. 
+ * Generic color selector frame, pulled from the Tool object. API not really
+ * worked out here (what should the constructor be? how flexible?) So use with 
+ * caution and be ready for it to break in future releases.
  */
 public class ColorChooser {  //extends JFrame implements DocumentListener {
 
@@ -60,14 +62,13 @@ public class ColorChooser {  //extends JFrame implements DocumentListener {
   JDialog window;
 
 
-  public String getMenuTitle() {
-    return "Color Selector";
-  }
+//  public String getMenuTitle() {
+//    return "Color Selector";
+//  }
 
 
-  public ColorChooser(Frame owner, boolean modal, 
-                       String buttonName, ActionListener buttonListener) {
-    //window = new jdi
+  public ColorChooser(Frame owner, boolean modal, Color initialColor,
+                      String buttonName, ActionListener buttonListener) {
     //super("Color Selector");
     window = new JDialog(owner, "Color Selector", modal);
     window.getContentPane().setLayout(new BorderLayout());
@@ -93,7 +94,7 @@ public ColorChooser(Frame owner, boolean modal,
     box.add(sliderBox);
     box.add(Box.createHorizontalStrut(10));
 
-    box.add(createColorFields());
+    box.add(createColorFields(buttonName, buttonListener));
 //    System.out.println("1: " + hexField.getInsets());
 
     box.add(Box.createHorizontalStrut(10));
@@ -117,12 +118,12 @@ public ColorChooser(Frame owner, boolean modal,
     window.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
     window.addWindowListener(new WindowAdapter() {
       public void windowClosing(WindowEvent e) {
-          hideSelector();
+          hide();
         }
       });
     Toolkit.registerWindowCloseKeys(window.getRootPane(), new ActionListener() {
         public void actionPerformed(ActionEvent actionEvent) {
-          hideSelector();
+          hide();
         }
       });
 
@@ -137,20 +138,21 @@ public void actionPerformed(ActionEvent actionEvent) {
     blueField.getDocument().addDocumentListener(colorListener);
     hexField.getDocument().addDocumentListener(colorListener);
     
+    setColor(initialColor);
 //    System.out.println("4: " + hexField.getInsets());
   }
 
   
   //hexField.setText("#FFFFFF");
 
   
-  public void showSelector() {
+  public void show() {
     window.setVisible(true);
     window.setCursor(Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR));
   }
   
   
-  public void hideSelector() {
+  public void hide() {
     window.setVisible(false);
   }
   
@@ -160,6 +162,11 @@ public Color getColor() {
   }
   
   
+  public void setColor(Color color) {
+    updateRGB(color.getRGB());
+  }
+  
+  
   public String getHexColor() {
     return "#" + PApplet.hex(red, 2) + PApplet.hex(green, 2) + PApplet.hex(blue, 2);
   }
@@ -313,7 +320,7 @@ public void run() {
   }
 
 
-  protected Container createColorFields() {
+  protected Container createColorFields(String buttonName, ActionListener buttonListener) {
     Box box = Box.createVerticalBox();
     box.setAlignmentY(0);
 
@@ -403,7 +410,8 @@ public void paintComponent(Graphics g) {
     row = Box.createHorizontalBox();
     row.add(createFixedLabel(""));
     // Windows needs extra space, OS X and Linux do not
-    final int hexCount = Base.isWindows() ? 7 : 5;
+    // Mac OS X needs 6 because #CCCCCC is quite wide
+    final int hexCount = Base.isWindows() ? 7 : 6;
     row.add(hexField = new NumberField(hexCount, true));
     row.add(Box.createHorizontalGlue());
     box.add(row);
@@ -421,19 +429,18 @@ public void paintComponent(Graphics g) {
 
     // 
     
-    /*
     row = Box.createHorizontalBox();
     if (Base.isMacOS()) {
       row.add(Box.createHorizontalStrut(11));
     } else {
       row.add(createFixedLabel(""));
     }
-    JButton button = new JButton("Select");
+    JButton button = new JButton(buttonName);
+    button.addActionListener(buttonListener);
     //System.out.println("button: " + button.getInsets());
     row.add(button);
     row.add(Box.createHorizontalGlue());
     box.add(row);
-    */
     
     //
     
@@ -533,8 +540,7 @@ public Dimension getMaximumSize() {
 
     public void keyPressed() {
       if (key == ESC) {
-        //ColorSelector.this.setVisible(false);
-        hideSelector();
+        ColorChooser.this.hide();
         // don't quit out of processing
         // http://dev.processing.org/bugs/show_bug.cgi?id=1006
         key = 0;
@@ -604,8 +610,7 @@ public Dimension getMaximumSize() {
 
     public void keyPressed() {
       if (key == ESC) {
-        //ColorSelector.this.setVisible(false);
-        hideSelector();
+        ColorChooser.this.hide();
         // don't quit out of processing
         // http://dev.processing.org/bugs/show_bug.cgi?id=1006
         key = 0;
diff --git a/app/src/processing/app/Preferences.java b/app/src/processing/app/Preferences.java
@@ -430,8 +430,8 @@ public void actionPerformed(ActionEvent e) {
     deletePreviousBox.setBounds(left, top, d.width + 10, d.height);
     right = Math.max(right, left + d.width);
     top += d.height + GUI_BETWEEN;
-
-
+    
+    
 //    // [ ] Use external editor
 //
 //    externalEditorBox = new JCheckBox("Use external editor");
diff --git a/app/src/processing/app/exec/ProcessHelper.java b/app/src/processing/app/exec/ProcessHelper.java
@@ -128,37 +128,19 @@ public ProcessResult execute(String outgoing) throws InterruptedException, IOExc
   }
   
   
-//  static public ProcessResult execute(String exe, String[] args, File dir) 
-//    throws InterruptedException, IOException {
-//    final StringWriter outWriter = new StringWriter();
-//    final StringWriter errWriter = new StringWriter();
-//    final long startTime = System.currentTimeMillis();
-//
-//    final String prettyCommand = exe + " " + PApplet.join(args, " ");
-//    System.out.println("pretty cmd is " + prettyCommand);
-//    final Process process = dir == null ? 
-//      Runtime.getRuntime().exec(exe, args) :
-//      Runtime.getRuntime().exec(exe, args, dir);
-//    ProcessRegistry.watch(process);
-//    try {
-//      String title = prettyCommand;
-//      new StreamPump(process.getInputStream(), "out: " + title).addTarget(outWriter).start();
-//      new StreamPump(process.getErrorStream(), "err: " + title).addTarget(errWriter).start();
-//      try {
-//        final int result = process.waitFor();
-//        final long time = System.currentTimeMillis() - startTime;
-//        //        System.err.println("ProcessHelper: <<<<< "
-//        //            + Thread.currentThread().getId() + " " + cmd[0] + " (" + time
-//        //            + "ms)");
-//        return new ProcessResult(prettyCommand, result, outWriter.toString(),
-//                                 errWriter.toString(), time);
-//      } catch (final InterruptedException e) {
-//        System.err.println("Interrupted: " + prettyCommand);
-//        throw e;
-//      }
-//    } finally {
-//      process.destroy();
-//      ProcessRegistry.unwatch(process);
-//    }
-//  }
+  static public boolean ffs(final String... cmd) {
+    try {
+      ProcessHelper helper = new ProcessHelper(cmd);
+      ProcessResult result = helper.execute();
+      if (result.succeeded()) {
+        return true;
+      }
+      System.out.println(result.getStdout());
+      System.err.println(result.getStderr());
+      
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+    return false;
+  }
 }
diff --git a/app/src/processing/app/tools/ColorSelector.java b/app/src/processing/app/tools/ColorSelector.java
@@ -23,6 +23,7 @@
 
 import processing.app.*;
 
+import java.awt.Color;
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.StringSelection;
 import java.awt.event.*;
@@ -52,7 +53,8 @@ public String getMenuTitle() {
 
   public void init(Editor editor) {
     if (selector == null) {
-      selector = new ColorChooser(editor, false, "Copy", new ActionListener() {
+      selector = new ColorChooser(editor, false, Color.WHITE, 
+                                  "Copy", new ActionListener() {
         
         @Override
         public void actionPerformed(ActionEvent e) {
@@ -65,6 +67,6 @@ public void actionPerformed(ActionEvent e) {
 
 
   public void run() {
-    selector.showSelector();
+    selector.show();
   }
 }
diff --git a/app/src/processing/mode/java/JavaBuild.java b/app/src/processing/mode/java/JavaBuild.java
@@ -32,6 +32,8 @@
 import org.apache.tools.ant.ProjectHelper;
 
 import processing.app.*;
+import processing.app.exec.ProcessHelper;
+import processing.app.exec.ProcessResult;
 import processing.core.*;
 import processing.data.XML;
 import processing.mode.java.preproc.*;
@@ -1109,32 +1111,36 @@ protected boolean exportApplication() throws IOException, SketchException {
       return false;
     }
 
-    /*
     File folder = null;
     for (String platformName : PConstants.platformNames) {
       int platform = Base.getPlatformIndex(platformName);
+      
+      // Can only embed Java on the native platform
+      boolean embedJava = (platform == PApplet.platform) && 
+        Preferences.getBoolean("export.application.embed_java");
+      
       if (Preferences.getBoolean("export.application.platform." + platformName)) {
         if (Library.hasMultipleArch(platform, importedLibraries)) {
           // export the 32-bit version
           folder = new File(sketch.getFolder(), "application." + platformName + "32");
-          if (!exportApplication(folder, platform, 32)) {
+          if (!exportApplication(folder, platform, 32, embedJava && Base.getNativeBits() == 32)) {
             return false;
           }
           // export the 64-bit version
           folder = new File(sketch.getFolder(), "application." + platformName + "64");
-          if (!exportApplication(folder, platform, 64)) {
+          if (!exportApplication(folder, platform, 64, embedJava && Base.getNativeBits() == 64)) {
             return false;
           }
         } else { // just make a single one for this platform
           folder = new File(sketch.getFolder(), "application." + platformName);
-          if (!exportApplication(folder, platform, 0)) {
+          if (!exportApplication(folder, platform, 0, embedJava)) {
             return false;
           }
         }
       }
     }
-    */
-    
+
+    /*
     File folder = null;
     String platformName = Base.getPlatformName();
     boolean embedJava = Preferences.getBoolean("export.application.embed_java");
@@ -1158,6 +1164,7 @@ protected boolean exportApplication() throws IOException, SketchException {
         return false;
       }
     }
+    */
     return true;  // all good
   }
 
@@ -1200,6 +1207,7 @@ protected boolean exportApplication(File destFolder,
     /// also where the jar files will be placed
     File dotAppFolder = null;
     String jvmRuntime = "";
+    String jdkPath = null;
     if (exportPlatform == PConstants.MACOSX) {
       dotAppFolder = new File(destFolder, sketch.getName() + ".app");
 
@@ -1209,6 +1217,7 @@ protected boolean exportApplication(File destFolder,
         File jdkFolder = new File(Base.getJavaHome(), "../../..");
         String jdkFolderName = jdkFolder.getCanonicalFile().getName();
         jvmRuntime = "<key>JVMRuntime</key>\n    <string>" + jdkFolderName + "</string>";
+        jdkPath = new File(dotAppFolder, "Contents/PlugIns/" + jdkFolderName + ".jdk").getAbsolutePath();
       }
 
       File contentsFolder = new File(dotAppFolder, "Contents");
@@ -1489,6 +1498,15 @@ protected boolean exportApplication(File destFolder,
       pw.flush();
       pw.close();
 
+      // attempt to code sign if the Xcode tools appear to be installed
+      if (Base.isMacOS() && new File("/usr/bin/codesign_allocate").exists()) {
+        if (embedJava) {
+          ProcessHelper.ffs("codesign", "--force", "--sign", "-", jdkPath); 
+        }
+        String appPath = dotAppFolder.getAbsolutePath();
+        ProcessHelper.ffs("codesign", "--force", "--sign", "-", appPath); 
+      }
+
     } else if (exportPlatform == PConstants.WINDOWS) {
       File buildFile = new File(destFolder, "launch4j-build.xml");
       File configFile = new File(destFolder, "launch4j-config.xml");
diff --git a/app/src/processing/mode/java/JavaEditor.java b/app/src/processing/mode/java/JavaEditor.java
diff --git a/todo.txt b/todo.txt
