[Bug 411980] - launcher.jar for native OSGi-Binary creation does not

work on java7

6 files changed, 9 insertions, 3 deletions

diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/build_bin/at.bestsolution.efxclipse.tooling.build-0.0.1.jar b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/build_bin/at.bestsolution.efxclipse.tooling.build-0.0.1.jar
deleted file mode 100755
index 82629ad44..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/build_bin/at.bestsolution.efxclipse.tooling.build-0.0.1.jar
+++ /dev/null
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/build_bin/fx-osgi-launch.jar b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/build_bin/fx-osgi-launch-7.jar
index e17ac5e3f..9a4fb97e0 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/build_bin/fx-osgi-launch.jar
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/build_bin/fx-osgi-launch-7.jar
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/build_bin/fx-osgi-launch-8.jar b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/build_bin/fx-osgi-launch-8.jar
new file mode 100644
index 000000000..b35719c4b
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/build_bin/fx-osgi-launch-8.jar
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/generator-tasks/e4App.rtask b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/generator-tasks/e4App.rtask
index 6bbe9761d..b5ce224f3 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/generator-tasks/e4App.rtask
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/generator-tasks/e4App.rtask
@@ -497,7 +497,9 @@ RobotTask {
 				DynamicFile "build.xml" 
 					generated-from "bundleclass://org.eclipse.fx.ide.pde.ui.e4/org.eclipse.fx.ide.pde.ui.e4.project.template.NativeLaunchGenerator" by "java"
 					excluded-if "javascript" /# !NativeExport #/,
-				URLFile "fx-osgi-launch.jar" "platform:/plugin/org.eclipse.fx.ide.pde.ui.e4/build_bin/fx-osgi-launch.jar"
+				URLFile "fx-osgi-launch-7.jar" "platform:/plugin/org.eclipse.fx.ide.pde.ui.e4/build_bin/fx-osgi-launch-7.jar"
+					excluded-if "javascript" /# !NativeExport #/, 
+				URLFile "fx-osgi-launch-8.jar" "platform:/plugin/org.eclipse.fx.ide.pde.ui.e4/build_bin/fx-osgi-launch-8.jar"
 					excluded-if "javascript" /# !NativeExport #/ 
 			}
 		} excluded-if "javascript" /# !TychoIntegration; #/
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/src/org/eclipse/fx/ide/pde/ui/e4/project/template/NativeLaunchGenerator.xtend b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/src/org/eclipse/fx/ide/pde/ui/e4/project/template/NativeLaunchGenerator.xtend
index 1517d7026..88afb3b84 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/src/org/eclipse/fx/ide/pde/ui/e4/project/template/NativeLaunchGenerator.xtend
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/src/org/eclipse/fx/ide/pde/ui/e4/project/template/NativeLaunchGenerator.xtend
@@ -18,8 +18,10 @@ class NativeLaunchGenerator implements Generator<DynamicFile> {
 	

 	def generate(NativeLaunchData data) '''<project name="native-build" default="do-deploy" basedir="."  xmlns:fx="javafx:com.sun.javafx.tools.ant">

 	<property name="eclipse-app-dir" value="«data.tychoOutDir»" />

+	<property name="fx.launcher.jar" value="fx-osgi-launch-7.jar" />

 	

 	<target name="init-fx-tasks">

+		<available classname="javafx.application.Application" property="fx.launcher.jar" value="fx-osgi-launch-8.jar"></available>

 		<path id="fxant">

 			<filelist>

 				<file name="${java.home}\..\lib\ant-javafx.jar"/>

@@ -33,7 +35,7 @@ class NativeLaunchGenerator implements Generator<DynamicFile> {
 		

 	<target name="do-deploy" depends="init-fx-tasks">

 		<fx:resources id="appRes">

-			<fx:fileset dir="." includes="fx-osgi-launch.jar"/>

+			<fx:fileset dir="." includes="${fx.launcher.jar}"/>

 			<fx:fileset dir="${eclipse-app-dir}" includes="**/*"/>

 		</fx:resources>

 		

diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui/generator-tasks/osgi-app.rtask b/bundles/tooling/org.eclipse.fx.ide.pde.ui/generator-tasks/osgi-app.rtask
index 310ea3304..07658df9a 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui/generator-tasks/osgi-app.rtask
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui/generator-tasks/osgi-app.rtask
@@ -478,7 +478,9 @@ RobotTask {
 				DynamicFile "build.xml" 

 					generated-from "bundleclass://org.eclipse.fx.ide.pde.ui.e4/org.eclipse.fx.ide.pde.ui.e4.project.template.NativeLaunchGenerator" by "java"

 					excluded-if "javascript" /# !NativeExport #/,

-				URLFile "fx-osgi-launch.jar" "platform:/plugin/org.eclipse.fx.ide.pde.ui.e4/build_bin/fx-osgi-launch.jar"

+				URLFile "fx-osgi-launch-7.jar" "platform:/plugin/org.eclipse.fx.ide.pde.ui.e4/build_bin/fx-osgi-launch-7.jar"

+					excluded-if "javascript" /# !NativeExport #/, 

+				URLFile "fx-osgi-launch-8.jar" "platform:/plugin/org.eclipse.fx.ide.pde.ui.e4/build_bin/fx-osgi-launch-8.jar"

 					excluded-if "javascript" /# !NativeExport #/ 

 			}

 		} excluded-if "javascript" /# !TychoIntegration; #/