From 8eb7c833e6f54ae085392b18babeb8ee19bb9fe6 Mon Sep 17 00:00:00 2001 From: "nor..67" Date: Tue, 2 Oct 2012 13:09:32 +0000 Subject: [PATCH] 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 --- .../DesktopExeCompositeProvider.java | 2 +- .../desktop/executables/launch4j-targets.xml | 17 +++--- .../gde/desktop/executables/macapp-data.zip | Bin 198262 -> 198262 bytes .../gde/desktop/executables/winapp-data.zip | Bin 55479 -> 56237 bytes .../winapp-data/winapp-config.xml | 49 ++++++++++++++++++ 5 files changed, 61 insertions(+), 7 deletions(-) create mode 100644 sdk/jme3-desktop-executables/winapp-data/winapp-config.xml diff --git a/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/DesktopExeCompositeProvider.java b/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/DesktopExeCompositeProvider.java index 07b102b93..4efaa5c29 100644 --- a/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/DesktopExeCompositeProvider.java +++ b/sdk/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"}); diff --git a/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/launch4j-targets.xml b/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/launch4j-targets.xml index 310593bf7..1aa2cd22c 100644 --- a/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/launch4j-targets.xml +++ b/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/launch4j-targets.xml @@ -1,12 +1,17 @@ Windows EXE Creation - - - - - - + + + + + + + + + + + diff --git a/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/macapp-data.zip b/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/macapp-data.zip index 3b4e486bc874d86face69518a1ff5bd5cc5a55d9..25d2f89159bd118172ddc351ee124b355da14c70 100644 GIT binary patch delta 84 zcmey?!}G0&hcCdJnT3mifq{eJ2H!u2jeHVJEFea+7E`+x6XSL*CZ>PS!6MsrUNKFV X1~aE0XJs~lu>P|$n?qPuY|J(Qm$e+% delta 84 zcmey?!}G0&hcCdJnT3mifq{b|x4YDSBcB8l%k{~n_RU&M?OIHX+qIaO{yk?&?h>@$ huJej%x-<(&)%4@6%qC!E)Bm$Fn}emNTd^_Q002S48Vvvd diff --git a/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/winapp-data.zip b/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/winapp-data.zip index 016e7ad2fabc036bb621b2ce7ab6b7087c1d53a0..e90b502030029e03c2224019ab39f33cdc8e936a 100644 GIT binary patch delta 828 zcmdnKk$LTQX1)M#W)?061_lm>TYUczR<8|ImvKjjs`fMh? zl=XUf;mOUk;1tQ=J=Yig{P2ObRQ0uza*OE!Z-d>=?5=mc-O}GH_Uv7~q$%ldjMwW= zL9@bl)jf+{zU0BV>65KritKr|f!)pBYE8|9`m~s*^6`?qP8A$@fJy>H*?j=k#o+Y>FN_6|%wT>Tqw+C2UuAZ-+^kB{W z)~4)S+3QMPaXHoOzdP2HhG`&>`l z*`31Jo22SF!V2ezYPH&h`d*k&UBb)R+^cQ%Zq}oH*OxX;x>K`X$uYs?l(T8j{iU`M zbDqn8HjY2GM1{rr`QO=b&-wdx%}ZC9W?cOEK(AtR-Q=5w`7)I|46Xd^x3qX~cm1q= zP4@S{pu$w!Ej=o?PKy0`r>XNJa@w>%|4P2KUkr>j2tTHCss8MfD>q)~epRiIJ$HBO zx`MQdHP!QvYe&YL9e#VaOzl^v_5ZC)EmZ$-g-P7p$!QxZti8cnBGNo>!Lsj(eQc-W zcGUlw`@+3@yZ7H0pT6nVc}(haQh9zVW5e4Wc4ubnoFuVQR^n{v6sNhj?0+;{OmCNc znmsx07T<-5a{nZjKeRY>)9b`C%WVm|>ksmE{@rP~?){^@4!v|IrMANb$q7x# ZZ(vE@0p6^@l+VDx1ca49TJAQ82LLREY*zpP delta 65 zcmZ3xoq794X1)M#W)?061_lm>Et5;_H}XZ_;A3PGVMYi|*1N4E!pa6z!oUcGRzN!a H28ag$0dox* diff --git a/sdk/jme3-desktop-executables/winapp-data/winapp-config.xml b/sdk/jme3-desktop-executables/winapp-data/winapp-config.xml new file mode 100644 index 000000000..80a80554e --- /dev/null +++ b/sdk/jme3-desktop-executables/winapp-data/winapp-config.xml @@ -0,0 +1,49 @@ + + + + + gui + ${dist.dir}/${application.title}.exe + ${dist.jar} + ${application.title} + resources/launch4j/win-icon.ico + . + true + + ${main.class} + ${application.title} + + + + bundled JRE path + 1.5.0 + ${run.jvmargs} + + + + + \ No newline at end of file