From c43003496f422f4fa78ac1aaa719c00adb3cf7ab Mon Sep 17 00:00:00 2001
From: Ben Fry <fry@processing.org>
Date: Sat, 10 May 2014 15:53:35 -0400
Subject: [PATCH] simplify layout a bit more

---
 build/build.xml              | 13 +++++++++++++
 build/windows/config-cmd.xml |  8 +-------
 build/windows/config.xml     |  7 +------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index e636b0d2a..6c900f97a 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -802,21 +802,34 @@
     <delete dir="${target.path}/modes/java/libraries/video/library/windows${video.delete}" />
     
 
+    <!-- TODO It would be better to not copy these, but use them in place.
+         I believe it's handled this way b/c launch4j was finicky about paths.
+         (i.e. it needed the lib/pde.jar to be present during build) -->
+<!--
     <copy todir="windows/work">
       <fileset dir="windows" 
 	       includes="about.bmp, application.ico, config.xml, config-cmd.xml"/>
     </copy>
+-->
     <taskdef name="launch4j" 
 	     classname="net.sf.launch4j.ant.Launch4jTask" 
 	     classpath="${launch4j.dir}/launch4j.jar; ${launch4j.dir}/lib/xstream.jar" />
 
     <!-- not all launch4j options are available when embedded inside this 
 	 file (i.e. the icon param doesn't work), so use a config file -->
+
+<!--
     <launch4j configFile="windows/work/config.xml" />
     <launch4j configFile="windows/work/config-cmd.xml" />
+-->
 
+    <launch4j configFile="windows/config.xml" />
+    <launch4j configFile="windows/config-cmd.xml" />
+
+<!--
     <delete dir="windows/work" 
 	    includes="about.bmp, application.ico, config.xml, config-cmd.xml" />
+-->
 
 <!--
     <launch4j>
diff --git a/build/windows/config-cmd.xml b/build/windows/config-cmd.xml
index 016060e0c..44c7b4aa7 100755
--- a/build/windows/config-cmd.xml
+++ b/build/windows/config-cmd.xml
@@ -2,7 +2,7 @@
   <dontWrapJar>true</dontWrapJar>
   <headerType>console</headerType>
   <jar>lib</jar>
-  <outfile>processing-java.exe</outfile>
+  <outfile>work/processing-java.exe</outfile>
   <errTitle></errTitle>
   <cmdLine></cmdLine>
   <chdir>.</chdir>
@@ -13,7 +13,6 @@
   <stayAlive>false</stayAlive>
   <manifest></manifest>
   <!-- avoid confusion w/ the real app by not setting the icon -->
-  <!--<icon>application.ico</icon>-->
   <classPath>
     <mainClass>processing.mode.java.Commander</mainClass>
     <cp>lib/pde.jar</cp>
@@ -35,11 +34,6 @@
     <opt>-Djna.nosys=true</opt>
     <!-- for 2.2, set a minimum version -->
     <minVersion>1.7.0_40</minVersion>
-<!--
-    <maxVersion></maxVersion>
-    <jdkPreference>jdkOnly</jdkPreference>
-    <opt>-Xms128m -Xmx128m</opt>
--->
   </jre>
   <messages>
     <startupErr>An error occurred while starting the application.</startupErr>
diff --git a/build/windows/config.xml b/build/windows/config.xml
index 6b553ecf7..4a3e91c5c 100755
--- a/build/windows/config.xml
+++ b/build/windows/config.xml
@@ -2,7 +2,7 @@
   <dontWrapJar>true</dontWrapJar>
   <headerType>gui</headerType>
   <jar>lib</jar>
-  <outfile>processing.exe</outfile>
+  <outfile>work/processing.exe</outfile>
   <errTitle></errTitle>
   <cmdLine></cmdLine>
   <chdir>.</chdir>
@@ -34,11 +34,6 @@
     <opt>-Djna.nosys=true</opt>
     <!-- for 2.2, set a minimum version -->
     <minVersion>1.7.0_40</minVersion>
-<!--
-    <maxVersion></maxVersion>
-    <jdkPreference>jdkOnly</jdkPreference>
-    <opt>-Xms128m -Xmx128m</opt>
--->
   </jre>
   <splash>
     <file>about.bmp</file>