From a49d99e0cb54db028370cbff4ec52fdd95ea7503 Mon Sep 17 00:00:00 2001
From: Normen Hansen <normen667@gmail.com>
Date: Sun, 25 Jan 2015 01:34:02 +0100
Subject: [PATCH] - fix newline and main class issue in Desktop Deployment for
 linux and windows

---
 .../desktop-deployment-targets.xml            | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

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 2ffd430dc..2ebc9331c 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
@@ -4,7 +4,7 @@
         <echo>Windows 32bit Application Creation</echo>
         <copy file="resources/desktop-deployment/windows-x86/package.cfg" tofile="resources/desktop-deployment/windows-x86/_package.cfg">
             <filterchain>
-                <replacestring from="$${main.class}" to="${main.class}"/>
+                <replacestring from="$${main.class}" to="${main.class.launcher}"/>
                 <replacestring from="$${launcher.jvmargs}" to="${launcher.jvmargs}"/>
                 <replacestring from="$${application.title}" to="${application.title}"/>
                 <replacestring from="$${jar.name}" to="${application.title}.jar"/>
@@ -38,7 +38,7 @@
         <echo>Windows 64bit Application Creation</echo>
         <copy file="resources/desktop-deployment/windows-x64/package.cfg" tofile="resources/desktop-deployment/windows-x64/_package.cfg">
             <filterchain>
-                <replacestring from="$${main.class}" to="${main.class}"/>
+                <replacestring from="$${main.class}" to="${main.class.launcher}"/>
                 <replacestring from="$${launcher.jvmargs}" to="${launcher.jvmargs}"/>
                 <replacestring from="$${application.title}" to="${application.title}"/>
                 <replacestring from="$${jar.name}" to="${application.title}.jar"/>
@@ -72,7 +72,7 @@
         <echo>Linux 32bit Application Creation</echo>
         <copy file="resources/desktop-deployment/linux-x86/package.cfg" tofile="resources/desktop-deployment/linux-x86/_package.cfg">
             <filterchain>
-                <replacestring from="$${main.class}" to="${main.class}"/>
+                <replacestring from="$${main.class}" to="${main.class.launcher}"/>
                 <replacestring from="$${launcher.jvmargs}" to="${launcher.jvmargs}"/>
                 <replacestring from="$${application.title}" to="${application.title}"/>
                 <replacestring from="$${jar.name}" to="${application.title}.jar"/>
@@ -106,7 +106,7 @@
         <echo>Linux 64bit Application Creation</echo>
         <copy file="resources/desktop-deployment/linux-x64/package.cfg" tofile="resources/desktop-deployment/linux-x64/_package.cfg">
             <filterchain>
-                <replacestring from="$${main.class}" to="${main.class}"/>
+                <replacestring from="$${main.class}" to="${main.class.launcher}"/>
                 <replacestring from="$${launcher.jvmargs}" to="${launcher.jvmargs}"/>
                 <replacestring from="$${application.title}" to="${application.title}"/>
                 <replacestring from="$${jar.name}" to="${application.title}.jar"/>
@@ -230,9 +230,18 @@
             var res = args.split(" ");
             var out = "";
             for (var i = 1; i < res.length+1; i++) {
-                out = out + "jvmarg." + i + "=" + res[i-1] + "\n";
+                out = out + "jvmarg." + i + "=" + res[i-1] + "\r\n";
             }
             project.setProperty("launcher.jvmargs", out);
             ]]>
-        </script>        
+        </script>
+        <loadresource property="main.class.launcher">
+            <propertyresource name="main.class"/>
+            <filterchain>
+                <tokenfilter>
+                    <filetokenizer/>
+                    <replacestring from="." to="/"/>
+                </tokenfilter>
+            </filterchain>
+        </loadresource>
     </target>
\ No newline at end of file