Skip to content

Commit 000f62b

Browse files
benfrybenfry
committed
additional launcher cleanups
1 parent 4676b02 commit 000f62b

4 files changed

Lines changed: 15 additions & 8 deletions

File tree

‎build/build.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -807,6 +807,8 @@
807807
classname="net.sf.launch4j.ant.Launch4jTask"
808808
classpath="${launch4j.dir}/launch4j.jar; ${launch4j.dir}/lib/xstream.jar" />
809809

810+
<!-- not all launch4j options are available when embedded inside this
811+
file (i.e. the icon param doesn't work), so use a config file -->
810812
<launch4j configFile="windows/work/config.xml" />
811813
<launch4j configFile="windows/work/config-cmd.xml" />
812814

‎build/windows/launcher/config-cmd.xml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,16 @@
1212
<customProcName>false</customProcName>
1313
<stayAlive>false</stayAlive>
1414
<manifest></manifest>
15-
<!-- <icon>application.ico</icon>-->
15+
<!-- avoid confusion w/ the real app by not setting the icon -->
16+
<!--<icon>application.ico</icon>-->
1617
<classPath>
1718
<mainClass>processing.mode.java.Commander</mainClass>
1819
<cp>lib/pde.jar</cp>
1920
<cp>core/library/core.jar</cp>
2021
<cp>lib/jna.jar</cp>
2122
<cp>lib/antlr.jar</cp>
2223
<cp>lib/ant.jar</cp>
23-
<cp>lib/ant-launcher.jar</cp>
24+
<cp>lib/ant-launcher.jar</cp>
2425
<cp>lib/org-netbeans-swing-outline.jar</cp>
2526
<cp>lib/com.ibm.icu_4.4.2.v20110823.jar</cp>
2627
<cp>lib/jdi.jar</cp>
@@ -32,8 +33,9 @@
3233
<path>java</path>
3334
<!-- https://github.com/processing/processing/issues/2239 -->
3435
<opt>-Djna.nosys=true</opt>
36+
<!-- for 2.2, set a minimum version -->
37+
<minVersion>1.7.0_40</minVersion>
3538
<!--
36-
<minVersion>1.6.0</minVersion>
3739
<maxVersion></maxVersion>
3840
<jdkPreference>jdkOnly</jdkPreference>
3941
<opt>-Xms128m -Xmx128m</opt>
@@ -42,8 +44,8 @@
4244
<messages>
4345
<startupErr>An error occurred while starting the application.</startupErr>
4446
<bundledJreErr>This application was configured to use a bundled Java Runtime Environment but the runtime is missing or corrupted.</bundledJreErr>
45-
<jreVersionErr>This application requires at least Java Development Kit (not JRE)</jreVersionErr>
46-
<launcherErr>The registry refers to a nonexistent Java Development Kit installation or the runtime is corrupted.</launcherErr>
47+
<jreVersionErr>This application requires Java to be installed</jreVersionErr>
48+
<launcherErr>The registry refers to a nonexistent Java installation or the runtime is corrupted.</launcherErr>
4749
<instanceAlreadyExistsMsg>An application instance is already running.</instanceAlreadyExistsMsg>
4850
</messages>
4951
</launch4jConfig>

‎build/windows/launcher/config.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@
3232
<path>java</path>
3333
<!-- https://github.com/processing/processing/issues/2239 -->
3434
<opt>-Djna.nosys=true</opt>
35+
<!-- for 2.2, set a minimum version -->
36+
<minVersion>1.7.0_40</minVersion>
3537
<!--
36-
<minVersion>1.6.0</minVersion>
3738
<maxVersion></maxVersion>
3839
<jdkPreference>jdkOnly</jdkPreference>
3940
<opt>-Xms128m -Xmx128m</opt>
@@ -48,8 +49,8 @@
4849
<messages>
4950
<startupErr>An error occurred while starting the application.</startupErr>
5051
<bundledJreErr>This application was configured to use a bundled Java Runtime Environment but the runtime is missing or corrupted.</bundledJreErr>
51-
<jreVersionErr>This application requires at least Java Development Kit (not JRE)</jreVersionErr>
52-
<launcherErr>The registry refers to a nonexistent Java Development Kit installation or the runtime is corrupted.</launcherErr>
52+
<jreVersionErr>This application requires Java to be installed</jreVersionErr>
53+
<launcherErr>The registry refers to a nonexistent Java installation or the runtime is corrupted.</launcherErr>
5354
<instanceAlreadyExistsMsg>An application instance is already running.</instanceAlreadyExistsMsg>
5455
</messages>
5556
</launch4jConfig>

‎todo.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ X http://sourceforge.net/projects/launch4j/files/launch4j-3/3.4/
2828
X change Windows export to use launch4j instead of the launcher.cpp file
2929
X actually call ant from inside p5?
3030
_ re-implement an icon for exported applications on Windows
31+
_ make sure that Windows export uses the local Java
32+
_ make sure Windows export includes library DLLs
3133
_ remove build/windows/export from repo
3234
_ exported apps reporting as "damaged" on OS X
3335
_ https://github.com/processing/processing/issues/2095

0 commit comments

Comments
 (0)