adding ico file for Windows and other todo notes

benfry · benfry · commit 68176875140b · 2014-05-10T10:40:19.000-04:00
diff --git a/app/src/processing/mode/java/JavaBuild.java b/app/src/processing/mode/java/JavaBuild.java
@@ -1497,6 +1497,9 @@ protected boolean exportApplication(File destFolder,
       config.setString("dontWrapJar", "true");
       config.setString("jarPath", "lib\\" + jarList[0]);
       
+      File iconFile = mode.getContentFile("application/sketch.ico");
+      config.addChild("icon").setContent(iconFile.getAbsolutePath());
+      
       XML clazzPath = config.addChild("classPath");
       clazzPath.setString("mainClass", sketch.getName());
       for (int i = 1; i < jarList.length; i++) {
@@ -1512,7 +1515,11 @@ protected boolean exportApplication(File destFolder,
       
       File buildFile = new File(destFolder, "build-launch4j.xml");
       project.save(buildFile);
-      buildWindowsLauncher(buildFile, "windows");
+      if (!buildWindowsLauncher(buildFile, "windows")) {
+        // don't delete the build file, might be useful for debugging 
+        return false;
+      }
+      buildFile.delete();
 
     } else {
       File shellScript = new File(destFolder, sketch.getName());
diff --git a/java/application/sketch.ico b/java/application/sketch.ico
diff --git a/todo.txt b/todo.txt
@@ -20,13 +20,20 @@ X sketch sometimes simply does not launch
 X   https://github.com/processing/processing/issues/2402
 X   https://github.com/processing/processing/pull/2455
 X   helpful fix contributed by David Fokkema
-X new launch4j 3.4
+X remove the google code uploader
+
+export
+X incorporate new launch4j 3.4
 X   http://sourceforge.net/projects/launch4j/files/launch4j-3/3.4/
+X change Windows export to use launch4j instead of the launcher.cpp file
+X   actually call ant from inside p5?
+_ re-implement an icon for exported applications on Windows
+_ remove build/windows/export from repo
+_ exported apps reporting as "damaged" on OS X
+_   https://github.com/processing/processing/issues/2095
 
 
 high
-_ exported apps reporting as "damaged" on OS X
-_   https://github.com/processing/processing/issues/2095
 _ JNA conflicts can be avoided with "-Djna.nosys=true"
 _   https://github.com/processing/processing/issues/2239
 X   fix for Windows launchers
@@ -95,8 +102,6 @@ _ "String index out of range" error
 _   https://github.com/processing/processing/issues/1940
 _ look through all isPopupTrigger() code 
 _   make sure both press/release are implemented
-_ change Windows export to use launch4j instead of the launcher.cpp file
-_   actually call ant from inside p5?
 _ emacs style errors in commander aren't quite right
 _   https://github.com/processing/processing/issues/2158
 _ add documentation for how to run mode development from Eclipse
