From 2d8d4f41317450680d482949c7b37b1043979956 Mon Sep 17 00:00:00 2001
From: Normen Hansen <normen667@gmail.com>
Date: Tue, 27 Jan 2015 17:21:58 +0100
Subject: [PATCH] - update desktop deployment to use binary extraction and
 exclude binar jar files

---
 .../linux-x64/package.cfg                     |   2 +-
 .../linux-x86/package.cfg                     |   2 +-
 .../macosx-x64/Info.plist                     |   2 +-
 .../windows-x64/package.cfg                   |   2 +-
 .../windows-x86/package.cfg                   |   2 +-
 .../executables/desktop-deployment-data.zip   | Bin 424399 -> 424409 bytes
 .../desktop-deployment-targets.xml            |  43 +++++++++++++++---
 7 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/sdk/jme3-desktop-executables/desktop-deployment-data/linux-x64/package.cfg b/sdk/jme3-desktop-executables/desktop-deployment-data/linux-x64/package.cfg
index e7a68dd19..05e739377 100755
--- a/sdk/jme3-desktop-executables/desktop-deployment-data/linux-x64/package.cfg
+++ b/sdk/jme3-desktop-executables/desktop-deployment-data/linux-x64/package.cfg
@@ -2,5 +2,5 @@ app.mainjar=${jar.name}
 app.version=1.0
 app.preferences.id=${application.title}
 app.mainclass=${main.class}
-app.classpath=
+app.classpath=jni
 ${launcher.jvmargs}
diff --git a/sdk/jme3-desktop-executables/desktop-deployment-data/linux-x86/package.cfg b/sdk/jme3-desktop-executables/desktop-deployment-data/linux-x86/package.cfg
index e7a68dd19..05e739377 100755
--- a/sdk/jme3-desktop-executables/desktop-deployment-data/linux-x86/package.cfg
+++ b/sdk/jme3-desktop-executables/desktop-deployment-data/linux-x86/package.cfg
@@ -2,5 +2,5 @@ app.mainjar=${jar.name}
 app.version=1.0
 app.preferences.id=${application.title}
 app.mainclass=${main.class}
-app.classpath=
+app.classpath=jni
 ${launcher.jvmargs}
diff --git a/sdk/jme3-desktop-executables/desktop-deployment-data/macosx-x64/Info.plist b/sdk/jme3-desktop-executables/desktop-deployment-data/macosx-x64/Info.plist
index 005deef27..35bf57d0d 100644
--- a/sdk/jme3-desktop-executables/desktop-deployment-data/macosx-x64/Info.plist
+++ b/sdk/jme3-desktop-executables/desktop-deployment-data/macosx-x64/Info.plist
@@ -36,7 +36,7 @@
   <key>JVMMainClassName</key>
   <string>${main.class}</string>
   <key>JVMAppClasspath</key>
-  <string></string>
+  <string>jni</string>
   <key>JVMMainJarName</key>
   <string>${jar.name}</string>
   <key>JVMPreferencesID</key>
diff --git a/sdk/jme3-desktop-executables/desktop-deployment-data/windows-x64/package.cfg b/sdk/jme3-desktop-executables/desktop-deployment-data/windows-x64/package.cfg
index 0384a0e59..b9c6ca1f3 100755
--- a/sdk/jme3-desktop-executables/desktop-deployment-data/windows-x64/package.cfg
+++ b/sdk/jme3-desktop-executables/desktop-deployment-data/windows-x64/package.cfg
@@ -3,5 +3,5 @@ app.version=1.0
 app.id=${application.title}
 app.preferences.id=${application.title}
 app.mainclass=${main.class}
-app.classpath=
+app.classpath=jni
 ${launcher.jvmargs}
diff --git a/sdk/jme3-desktop-executables/desktop-deployment-data/windows-x86/package.cfg b/sdk/jme3-desktop-executables/desktop-deployment-data/windows-x86/package.cfg
index 0384a0e59..b9c6ca1f3 100755
--- a/sdk/jme3-desktop-executables/desktop-deployment-data/windows-x86/package.cfg
+++ b/sdk/jme3-desktop-executables/desktop-deployment-data/windows-x86/package.cfg
@@ -3,5 +3,5 @@ app.version=1.0
 app.id=${application.title}
 app.preferences.id=${application.title}
 app.mainclass=${main.class}
-app.classpath=
+app.classpath=jni
 ${launcher.jvmargs}
diff --git a/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/desktop-deployment-data.zip b/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/desktop-deployment-data.zip
index 1e166e653bf0d1fc0a4dae2da22b9f4506152158..a09bb71bdcf1d38c023e36167c0cd7afc17d201a 100644
GIT binary patch
delta 1122
zcmX^AS@Py*$qCna-*;NO{Ww{qoyEYwFlpiwh5AWA1_*!zKtQ+WAYZcqkMsK)_U9SD
z8|r$lrcPMJ8ydA^!QbCb50h@5D-O^W?NE!D;U69(^3V6fzl7{fnH86_pJe?>P42zp
zVb@nZQ+1KGOKeqL+4cQ1F3wV(zFhF#?G2)}yq>AE&iBMVKIQgOW5dyv_5t3^EL@u#
z8SfhKzD0J`<ZPn>ch+=+ayIeJ^2Y62W_=yjZq0J<Gn<$g7#i6a7(^LF7;+Pn^NTBV
zE6hyvJ@eA?^$Kz_i%S?81i%VFq1d$fPOKJF^1kpt0?Q`NF}kc&alU8yhgS<?G7=cs
zLU_uIe(kSxn6|nm|EocA#NW`l;$|jiobS)@{4VD|pE3HBG<VwkX*uQ}pUvJEbvhzy
z&2`fV-7a7Mr|i>Xwu+W-*{)-^w!HqoJSYUGuPbMhXs%CauTNkEVkRJF24a@&^$Dz}
zyLsOLLpERT-^2o-qqa^Df5WO&zZK*_AOH!0Ky9xf-ys7Y*Y93?UDLVwCLFF|b(U3C
zD{`9Nwfpgw4Vxm)*ZCV|EoHjM!hQPPWRceUpIOAEqbDzK(~dpYe8;BfgwVyi0n_Kz
zmzwU|ywNT1|KX4NX<MG1O|Y7_-e$+5^@=OcT;7zv$7Eg3lx<AaJ?|Kqw|{@b`XxyC
z6|&QS?ht1XnI2!sCQ%Ox$N_XDC&-n|;IOR)I%oS92e$pDs2OK^Lm69$Z5<;6Lr!L1
zDI_5jmy{+2cr!AIFmo|5aBwi7q-mh{L_uK<1xp&krVEy{IoYxs!;P>o(?>S~GwHz$
zU|?9%xM2DOpb^ZO2@I1P5=5uJDreJTteY-c!DhqAHa)0<O<55o@_|~#5!!+J-QKWH
zkA1@`F@0SHQ0M>YH!Ij28COo1u4Ge|$BY|<)+LQEr^i;ZxiBu8zNnH-oh_skm@60n
DylSOH

delta 1024
zcmcclS@Qg6$qCnmEtXig1s1f4WH2x=^aHUdgUIxGWo%-T7+LB;d=LQ1fq-t0BVUUF
z5A*vy&BaIT7W8lQD&x#@o?5n3;h&#IjLvOI_N4)BFSxiLKlJK4^PJ&*`8KWDZT!Br
z;*a&Ev!8ewS-(r2)bUKfH1p-%yZ@7%*7n_*S5=XBS8R(a&*O<7uJ71zaaa0{^AouP
zyqQ_J7#KFUGTt`eHA8mb<Xj_#0e2Rk@f<DQU`9)~{^J*4H83$S)J@(VtH4>u1_`Bx
z%@1O=m}2c%R(x4@X3L7Z#*a1kSgjD1ifCXIZJyinFJEH9Q?2{At<Ok=)rUTB<-Pmq
zf=Sw?z0)tJADH&(Skukrs<%z|{9Lxa%;=hEcPVdJchcp6p9guv*B+65tK04W`sn@t
z?9G`8?U@OTK+FWh%s|YtJu`vzc{i^yFu0n67S-he9kXeA>>F04`b`jbF@S_XptjeL
zui1ddwOl3dV9r+d6N&qRwo9n06$Oc1*?qmSEOq0&zw=V2I7u$z*74cxAC&U1hdCxE
zCp3(=eAis|%8DlwR2J=AsHXe(b<&@d<ldO|hyUrTU3ul3ZZ&Pb&5i|U6J?g!K3rRv
zwm9|lhVcG<0o&fPeh%XOx){k_(;V0a+*#WfJFwj{<wZ&V)4R&pLKthN-!Eg6l}AZ<
zz+e*v2Ofl2(ik#bx}434k$HMtIZ!Q1Y5=AKRJC)a&jP7Uo_@ES&5^NUx_kwj4I{(!
zm<l#!d6f798ZM4vi^KGJ6>Khy-={yW0P0*gU9}RZ1tlmkv^<=iUdiUdJi~!)`hEvC
XQLzATR&c@;Vi01;XJKIQDg|)?2abJE

diff --git a/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/desktop-deployment-targets.xml b/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/desktop-deployment-targets.xml
index 2ebc9331c..5e116cd17 100644
--- a/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/desktop-deployment-targets.xml
+++ b/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/desktop-deployment-targets.xml
@@ -1,4 +1,4 @@
-    <target name="-desktop-deployment" depends="-create-launcher-jvmargs, -test-platforms-enabled, -windows-x86-app, -windows-x64-app, -linux-x86-app, -linux-x64-app, -macosx-x64-app"/>
+    <target name="-desktop-deployment" depends="-extract-native-binaries, -create-launcher-jvmargs, -test-platforms-enabled, -windows-x86-app, -windows-x64-app, -linux-x86-app, -linux-x64-app, -macosx-x64-app"/>
     
     <target name="-windows-x86-app" if="is.windows-x86.app.enabled">
         <echo>Windows 32bit Application Creation</echo>
@@ -16,7 +16,8 @@
             <zipfileset file="resources/desktop-deployment/windows-x86/_package.cfg" fullpath="${application.title}/app/package.cfg"/>
             <zipfileset file="resources/desktop-deployment/windows-x86/icon.ico" fullpath="${application.title}/${application.title}.ico"/>
             <zipfileset file="${dist.jar}" prefix="${application.title}/app"/>
-            <zipfileset dir="${dist.dir}/lib" prefix="${application.title}/app/lib"/>
+            <zipfileset dir="${dist.dir}/lib" excludes="${deployment.jarexcludes}" prefix="${application.title}/app/lib"/>
+            <zipfileset dir="${build.dir}/natives/windows-x86" prefix="${application.title}/app/jni" erroronmissingdir="false"/>
         </zip>
         <delete file="resources/desktop-deployment/windows-x86/_package.cfg"/>
         <antcall target="-package-windows-x86-jre"/>
@@ -50,7 +51,8 @@
             <zipfileset file="resources/desktop-deployment/windows-x64/_package.cfg" fullpath="${application.title}/app/package.cfg"/>
             <zipfileset file="resources/desktop-deployment/windows-x64/icon.ico" fullpath="${application.title}/${application.title}.ico"/>
             <zipfileset file="${dist.jar}" prefix="${application.title}/app"/>
-            <zipfileset dir="${dist.dir}/lib" prefix="${application.title}/app/lib"/>
+            <zipfileset dir="${dist.dir}/lib" excludes="${deployment.jarexcludes}" prefix="${application.title}/app/lib"/>
+            <zipfileset dir="${build.dir}/natives/windows-x64" prefix="${application.title}/app/jni" erroronmissingdir="false"/>
         </zip>
         <delete file="resources/desktop-deployment/windows-x64/_package.cfg"/>
         <antcall target="-package-windows-x64-jre"/>
@@ -83,7 +85,8 @@
             <zipfileset file="resources/desktop-deployment/linux-x86/stub" filemode="755" fullpath="${application.title}/${application.title}"/>
             <zipfileset file="resources/desktop-deployment/linux-x86/_package.cfg" fullpath="${application.title}/app/package.cfg"/>
             <zipfileset file="${dist.jar}" prefix="${application.title}/app"/>
-            <zipfileset dir="${dist.dir}/lib" prefix="${application.title}/app/lib"/>
+            <zipfileset dir="${dist.dir}/lib" excludes="${deployment.jarexcludes}" prefix="${application.title}/app/lib"/>
+            <zipfileset dir="${build.dir}/natives/linux-x86" prefix="${application.title}/app/jni" erroronmissingdir="false"/>
         </zip>
         <delete file="resources/desktop-deployment/linux-x86/_package.cfg"/>
         <antcall target="-package-linux-x86-jre"/>
@@ -117,7 +120,8 @@
             <zipfileset file="resources/desktop-deployment/linux-x64/stub" filemode="755" fullpath="${application.title}/${application.title}"/>
             <zipfileset file="resources/desktop-deployment/linux-x64/_package.cfg" fullpath="${application.title}/app/package.cfg"/>
             <zipfileset file="${dist.jar}" prefix="${application.title}/app"/>
-            <zipfileset dir="${dist.dir}/lib" prefix="${application.title}/app/lib"/>
+            <zipfileset dir="${dist.dir}/lib" excludes="${deployment.jarexcludes}" prefix="${application.title}/app/lib"/>
+            <zipfileset dir="${build.dir}/natives/linux-x64" prefix="${application.title}/app/jni" erroronmissingdir="false"/>
         </zip>
         <delete file="resources/desktop-deployment/linux-x64/_package.cfg"/>
         <antcall target="-package-linux-x64-jre"/>
@@ -154,7 +158,8 @@
             <zipfileset file="resources/desktop-deployment/macosx-x64/_Info.plist" fullpath="${application.title}.app/Contents/Info.plist"/>
             <zipfileset file="resources/desktop-deployment/macosx-x64/icon.icns" fullpath="${application.title}.app/Contents/Resources/GenericApp.icns"/>
             <zipfileset file="${dist.jar}" prefix="${application.title}.app/Contents/Java"/>
-            <zipfileset dir="${dist.dir}/lib" prefix="${application.title}.app/Contents/Java/lib"/>
+            <zipfileset dir="${dist.dir}/lib" excludes="${deployment.jarexcludes}" prefix="${application.title}.app/Contents/Java/lib"/>
+            <zipfileset dir="${build.dir}/natives/macosx-x64" prefix="${application.title}.app/Contents/Java/jni" erroronmissingdir="false"/>
         </zip>
         <delete file="resources/desktop-deployment/macosx-x64/_Info.plist"/>
         <antcall target="-package-macosx-x64-jre"/>
@@ -244,4 +249,30 @@
                 </tokenfilter>
             </filterchain>
         </loadresource>
+    </target>
+    
+    <target name="-extract-native-binaries">
+        <java outputproperty="deployment.jarexcludes" dir="${basedir}" classname="com.jme3.system.ExtractNativeLibraries" fork="true" failonerror="false" classpath="${dist.jar}">
+            <arg value="getjarexcludes"/>
+        </java>        
+        <java dir="${basedir}" classname="com.jme3.system.ExtractNativeLibraries" fork="true" failonerror="false" classpath="${dist.jar}">
+            <arg value="Windows32"/>
+            <arg value="${build.dir}/natives/windows-x86"/>
+        </java>
+        <java dir="${basedir}" classname="com.jme3.system.ExtractNativeLibraries" fork="true" failonerror="false" classpath="${dist.jar}">
+            <arg value="Windows64"/>
+            <arg value="${build.dir}/natives/windows-x64"/>
+        </java>
+        <java dir="${basedir}" classname="com.jme3.system.ExtractNativeLibraries" fork="true" failonerror="false" classpath="${dist.jar}">
+            <arg value="Linux32"/>
+            <arg value="${build.dir}/natives/linux-x86"/>
+        </java>
+        <java dir="${basedir}" classname="com.jme3.system.ExtractNativeLibraries" fork="true" failonerror="false" classpath="${dist.jar}">
+            <arg value="Linux64"/>
+            <arg value="${build.dir}/natives/linux-x64"/>
+        </java>
+        <java dir="${basedir}" classname="com.jme3.system.ExtractNativeLibraries" fork="true" failonerror="false" classpath="${dist.jar}">
+            <arg value="MacOSX64"/>
+            <arg value="${build.dir}/natives/macosx-x64"/>
+        </java>
     </target>
\ No newline at end of file