Browse Source

SDK:
- change exe creation to use config file
- fix run args not going to exe file

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9793 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

nor..67 13 years ago
parent
commit
7254383d0b

+ 1 - 1
jme3-desktop-executables/src/com/jme3/gde/desktop/executables/DesktopExeCompositeProvider.java

@@ -62,7 +62,7 @@ public class DesktopExeCompositeProvider implements ProjectCustomizer.CompositeC
         public SavePropsListener(ProjectExtensionProperties props, Project project) {
             this.properties = props;
             this.project = project;
-            launch4j = new ProjectExtensionManager("launch4j", "v1.2", new String[]{"jar", "-launch4j-exe"});
+            launch4j = new ProjectExtensionManager("launch4j", "v1.3", new String[]{"jar", "-launch4j-exe"});
             launch4j.setAntTaskLibrary("launch4j");
             launch4j.setDataZip("nbres:/com/jme3/gde/desktop/executables/winapp-data.zip");
             macapp = new ProjectExtensionManager("macapp", "v1.2", new String[]{"jar", "-mac-app"});

+ 11 - 6
jme3-desktop-executables/src/com/jme3/gde/desktop/executables/launch4j-targets.xml

@@ -1,12 +1,17 @@
     <target name="-launch4j-exe" depends="-test-launch4j-exe-enabled" if="is.launch4j.exe.enabled">
         <echo>Windows EXE Creation</echo>
         <taskdef classname="net.sf.launch4j.ant.Launch4jTask" classpath="${libs.launch4j.classpath}" name="launch4j"/>
-        <launch4j>
-            <config jar="${dist.jar}" outfile="${dist.dir}/${application.title}.exe" errTitle="${application.title}" icon="resources/launch4j/win-icon.ico" headertype="gui" chdir="." customProcName="true">
-                <singleInstance mutexName="${main.class}"/>
-                <jre minVersion="1.5.0" maxheapsize="512"/>
-            </config>
-        </launch4j>
+        <copy file="resources/launch4j/winapp-config.xml" tofile="launch4j-config.xml" overwrite="true">
+            <filterchain>
+                <replacestring from="$${dist.dir}" to="${dist.dir}"/>
+                <replacestring from="$${dist.jar}" to="${dist.jar}"/>
+                <replacestring from="$${main.class}" to="${main.class}"/>
+                <replacestring from="$${run.jvmargs}" to="${run.jvmargs}"/>
+                <replacestring from="$${application.title}" to="${application.title}"/>
+            </filterchain>
+        </copy>
+        <launch4j configFile="launch4j-config.xml"/>
+        <delete file="launch4j-config.xml"/>
         <zip destfile="${dist.dir}/${application.title}-Windows.zip">
             <zipfileset file="${dist.dir}/${application.title}.exe" prefix=""/>
             <zipfileset dir="${dist.dir}/lib" prefix="lib/"/>

BIN
jme3-desktop-executables/src/com/jme3/gde/desktop/executables/macapp-data.zip


BIN
jme3-desktop-executables/src/com/jme3/gde/desktop/executables/winapp-data.zip


+ 49 - 0
jme3-desktop-executables/winapp-data/winapp-config.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+To change this template, choose Tools | Templates
+and open the template in the editor.
+-->
+
+<launch4jConfig>
+  <headerType>gui</headerType>
+  <outfile>${dist.dir}/${application.title}.exe</outfile>
+  <jar>${dist.jar}</jar>
+  <errTitle>${application.title}</errTitle>
+  <icon>resources/launch4j/win-icon.ico</icon>
+  <chdir>.</chdir>
+  <customProcName>true</customProcName>
+  <singleInstance>
+    <mutexName>${main.class}</mutexName>
+    <windowTitle>${application.title}</windowTitle>
+  </singleInstance> 
+  <jre>
+    <!-- Specify one of the following or both -->
+    <path>bundled JRE path</path>
+    <minVersion>1.5.0</minVersion>
+    <opt>${run.jvmargs}</opt>
+  </jre>
+  <!--splash>
+    <file>file</file>
+    <waitForWindow>true|false</waitForWindow>
+    <timeout>seconds [60]</timeout>
+    <timeoutErr>true|false</timeoutErr>
+  </splash-->
+  <!--versionInfo>
+    <fileVersion>x.x.x.x</fileVersion>
+    <txtFileVersion>text</txtFileVersion>
+    <fileDescription>text</fileDescription>
+    <copyright>text</copyright>
+    <productVersion>x.x.x.x</productVersion>
+    <txtProductVersion>text</txtProductVersion>
+    <productName>text</productName>
+    <companyName>text</companyName>
+    <internalName>filename</internalName>
+    <originalFilename>filename.exe</originalFilename>
+  </versionInfo-->
+  <!--messages>
+    <startupErr>text</startupErr>
+    <bundledJreErr>text</bundledJreErr>
+    <jreVersionErr>text</jreVersionErr>
+    <launcherErr>text</launcherErr>
+  </messages-->
+</launch4jConfig>