Skip to content

Commit 03790e9

Browse files
benfrybenfry
committed
simplify layout a bit more
1 parent bdb61ab commit 03790e9

3 files changed

Lines changed: 15 additions & 13 deletions

File tree

‎build/build.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -802,21 +802,34 @@
802802
<delete dir="${target.path}/modes/java/libraries/video/library/windows${video.delete}" />
803803

804804

805+
<!-- TODO It would be better to not copy these, but use them in place.
806+
I believe it's handled this way b/c launch4j was finicky about paths.
807+
(i.e. it needed the lib/pde.jar to be present during build) -->
808+
<!--
805809
<copy todir="windows/work">
806810
<fileset dir="windows"
807811
includes="about.bmp, application.ico, config.xml, config-cmd.xml"/>
808812
</copy>
813+
-->
809814
<taskdef name="launch4j"
810815
classname="net.sf.launch4j.ant.Launch4jTask"
811816
classpath="${launch4j.dir}/launch4j.jar; ${launch4j.dir}/lib/xstream.jar" />
812817

813818
<!-- not all launch4j options are available when embedded inside this
814819
file (i.e. the icon param doesn't work), so use a config file -->
820+
821+
<!--
815822
<launch4j configFile="windows/work/config.xml" />
816823
<launch4j configFile="windows/work/config-cmd.xml" />
824+
-->
825+
826+
<launch4j configFile="windows/config.xml" />
827+
<launch4j configFile="windows/config-cmd.xml" />
817828

829+
<!--
818830
<delete dir="windows/work"
819831
includes="about.bmp, application.ico, config.xml, config-cmd.xml" />
832+
-->
820833

821834
<!--
822835
<launch4j>

‎build/windows/config-cmd.xml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<dontWrapJar>true</dontWrapJar>
33
<headerType>console</headerType>
44
<jar>lib</jar>
5-
<outfile>processing-java.exe</outfile>
5+
<outfile>work/processing-java.exe</outfile>
66
<errTitle></errTitle>
77
<cmdLine></cmdLine>
88
<chdir>.</chdir>
@@ -13,7 +13,6 @@
1313
<stayAlive>false</stayAlive>
1414
<manifest></manifest>
1515
<!-- avoid confusion w/ the real app by not setting the icon -->
16-
<!--<icon>application.ico</icon>-->
1716
<classPath>
1817
<mainClass>processing.mode.java.Commander</mainClass>
1918
<cp>lib/pde.jar</cp>
@@ -35,11 +34,6 @@
3534
<opt>-Djna.nosys=true</opt>
3635
<!-- for 2.2, set a minimum version -->
3736
<minVersion>1.7.0_40</minVersion>
38-
<!--
39-
<maxVersion></maxVersion>
40-
<jdkPreference>jdkOnly</jdkPreference>
41-
<opt>-Xms128m -Xmx128m</opt>
42-
-->
4337
</jre>
4438
<messages>
4539
<startupErr>An error occurred while starting the application.</startupErr>

‎build/windows/config.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<dontWrapJar>true</dontWrapJar>
33
<headerType>gui</headerType>
44
<jar>lib</jar>
5-
<outfile>processing.exe</outfile>
5+
<outfile>work/processing.exe</outfile>
66
<errTitle></errTitle>
77
<cmdLine></cmdLine>
88
<chdir>.</chdir>
@@ -34,11 +34,6 @@
3434
<opt>-Djna.nosys=true</opt>
3535
<!-- for 2.2, set a minimum version -->
3636
<minVersion>1.7.0_40</minVersion>
37-
<!--
38-
<maxVersion></maxVersion>
39-
<jdkPreference>jdkOnly</jdkPreference>
40-
<opt>-Xms128m -Xmx128m</opt>
41-
-->
4237
</jre>
4338
<splash>
4439
<file>about.bmp</file>

0 commit comments

Comments
 (0)