Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/tooling')
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.ant/.classpath26
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.ant/.gitignore1
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.ant/.project23
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.ant/.settings/org.eclipse.jdt.core.prefs12
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.ant/.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.ant/pom.xml25
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.ant/src/main/java/org/eclipse/fx/ide/ant/FXOsgiLaunchTask.java110
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.fxgraph/src/org/eclipse/fx/ide/fxgraph/converter/FXMLSaxHandler.xtend78
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.jdt.core/src/org/eclipse/fx/ide/jdt/core/internal/BuildPathSupport.java13
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.jdt.ui/plugin.properties4
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.ui.e4/build_bin/at.bestsolution.efxclipse.tooling.build-0.0.1.jarbin3955 -> 0 bytes
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.ui.e4/build_bin/fx-osgi-launch.jarbin16855 -> 0 bytes
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/build_bin/org.eclipse.fx.ide.ant-0.9.0.jarbin0 -> 4743 bytes
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.ui.e4/generator-tasks/e4App.rtask5
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.ui.e4/generator-tasks/mediaSample.rtask1
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.ui.e4/src/org/eclipse/fx/ide/pde/ui/e4/project/template/NativeLaunchGenerator.xtend6
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.ui/generator-tasks/osgi-app.rtask2
17 files changed, 302 insertions, 8 deletions
diff --git a/bundles/tooling/org.eclipse.fx.ide.ant/.classpath b/bundles/tooling/org.eclipse.fx.ide.ant/.classpath
new file mode 100644
index 000000000..007e9818c
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.ant/.classpath
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/bundles/tooling/org.eclipse.fx.ide.ant/.gitignore b/bundles/tooling/org.eclipse.fx.ide.ant/.gitignore
new file mode 100644
index 000000000..ea8c4bf7f
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.ant/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/bundles/tooling/org.eclipse.fx.ide.ant/.project b/bundles/tooling/org.eclipse.fx.ide.ant/.project
new file mode 100644
index 000000000..11376dc30
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.ant/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.fx.ide.ant</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/bundles/tooling/org.eclipse.fx.ide.ant/.settings/org.eclipse.jdt.core.prefs b/bundles/tooling/org.eclipse.fx.ide.ant/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..62492222a
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.ant/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/bundles/tooling/org.eclipse.fx.ide.ant/.settings/org.eclipse.m2e.core.prefs b/bundles/tooling/org.eclipse.fx.ide.ant/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 000000000..f897a7f1c
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.ant/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/bundles/tooling/org.eclipse.fx.ide.ant/pom.xml b/bundles/tooling/org.eclipse.fx.ide.ant/pom.xml
new file mode 100644
index 000000000..9e2801d86
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.ant/pom.xml
@@ -0,0 +1,25 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.fx.ide.ant</groupId>
+ <artifactId>org.eclipse.fx.ide.ant</artifactId>
+ <version>0.9.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.8.4</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project> \ No newline at end of file
diff --git a/bundles/tooling/org.eclipse.fx.ide.ant/src/main/java/org/eclipse/fx/ide/ant/FXOsgiLaunchTask.java b/bundles/tooling/org.eclipse.fx.ide.ant/src/main/java/org/eclipse/fx/ide/ant/FXOsgiLaunchTask.java
new file mode 100644
index 000000000..a5724a13c
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.ant/src/main/java/org/eclipse/fx/ide/ant/FXOsgiLaunchTask.java
@@ -0,0 +1,110 @@
+/*******************************************************************************
+ * Copyright (c) 2012 BestSolution.at and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Tom Schindl<tom.schindl@bestsolution.at> - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.fx.ide.ant;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+import java.util.jar.Attributes;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.resources.FileResource;
+import org.apache.tools.ant.util.ClasspathUtils;
+import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.ant.util.ResourceUtils;
+
+public class FXOsgiLaunchTask extends Task {
+ private String classpathRef;
+ private String outDir;
+ private String equinoxLauncherJarRef;
+
+ private static final String PREFIX = "resources/classes/";
+
+ private static final String[] LAUNCHER_FILES = new String[] {
+ "com/javafx/main/Main.class",
+ "com/javafx/main/Main$1.class",
+ "com/javafx/main/Main$2.class",
+ "com/javafx/main/NoJavaFXFallback.class"
+ };
+
+ public void setClasspathRef(String classpathRef) {
+ this.classpathRef = classpathRef;
+ }
+
+ public void setOutDir(String outDir) {
+ this.outDir = outDir;
+ }
+
+ public void setEquinoxLauncherJarRef(String equinoxLauncherJarRef) {
+ this.equinoxLauncherJarRef = equinoxLauncherJarRef;
+ }
+
+ public void execute() throws BuildException {
+ try {
+ ClassLoader cl = ClasspathUtils.getClassLoaderForPath(getProject(), (Path) getProject().getReference(classpathRef), UUID.randomUUID().toString());
+
+ FileSet p = (FileSet) getProject().getReference(equinoxLauncherJarRef);
+ FileResource r = (FileResource) p.iterator().next();
+ String equinoxLauncherJar = "plugins/"+r.getFile().getName();
+
+ Manifest m = new Manifest();
+ m.getMainAttributes().put(Attributes.Name.MANIFEST_VERSION, "1.0");
+ m.getMainAttributes().put(new Attributes.Name("JavaFX-Version"), "2.2");
+ m.getMainAttributes().put(Attributes.Name.IMPLEMENTATION_VENDOR, "BestSolution.at");
+ m.getMainAttributes().put(Attributes.Name.IMPLEMENTATION_TITLE, "JavaFX App");
+ m.getMainAttributes().put(Attributes.Name.IMPLEMENTATION_VERSION, "1.0.0");
+ m.getMainAttributes().put(new Attributes.Name("JavaFX-Application-Class"), "org.eclipse.equinox.launcher.Main");
+ m.getMainAttributes().put(new Attributes.Name("JavaFX-Class-Path"), equinoxLauncherJar);
+ m.getMainAttributes().put(new Attributes.Name("Main-Class"), "com/javafx/main/Main");
+
+ FileOutputStream out = new FileOutputStream(new File(outDir,"fx-osgi-launcher.jar"));
+
+ JarOutputStream jOut = new JarOutputStream(out,m);
+ jOut.putNextEntry(new JarEntry("com/"));
+ jOut.closeEntry();
+
+ jOut.putNextEntry(new JarEntry("com/javafx/"));
+ jOut.closeEntry();
+
+ jOut.putNextEntry(new JarEntry("com/javafx/main"));
+ jOut.closeEntry();
+
+ for( String f : LAUNCHER_FILES ) {
+ JarEntry e = new JarEntry(f);
+ jOut.putNextEntry(e);
+
+ byte[] buf = new byte[1024];
+ int len;
+ InputStream in = cl.getResourceAsStream(PREFIX+f);
+
+ while( (len = in.read(buf)) != -1 ) {
+ jOut.write(buf, 0, len);
+ }
+ jOut.closeEntry();
+ }
+ jOut.close();
+ } catch (Exception e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/bundles/tooling/org.eclipse.fx.ide.fxgraph/src/org/eclipse/fx/ide/fxgraph/converter/FXMLSaxHandler.xtend b/bundles/tooling/org.eclipse.fx.ide.fxgraph/src/org/eclipse/fx/ide/fxgraph/converter/FXMLSaxHandler.xtend
new file mode 100644
index 000000000..eb38202f2
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.fxgraph/src/org/eclipse/fx/ide/fxgraph/converter/FXMLSaxHandler.xtend
@@ -0,0 +1,78 @@
+package org.eclipse.fx.ide.fxgraph.converter
+
+import java.util.Stack
+import org.eclipse.fx.ide.fxgraph.fXGraph.Element
+import org.eclipse.fx.ide.fxgraph.fXGraph.FXGraphFactory
+import org.eclipse.fx.ide.fxgraph.fXGraph.Model
+import org.xml.sax.Attributes
+import org.xml.sax.SAXException
+import org.xml.sax.helpers.DefaultHandler
+import org.eclipse.xtext.common.types.TypesFactory
+import javax.inject.Inject
+import org.eclipse.xtext.common.types.access.IJvmTypeProvider
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl
+
+class FXMLSaxHandler extends DefaultHandler {
+ Model model;
+
+ Stack<Object> stack = new Stack;
+
+// @Inject
+// private IJvmTypeProvider.Factory jdtTypeProviderFactory;
+
+ private IJvmTypeProvider jdtTypeProvider;
+
+ override startDocument() throws SAXException {
+// jdtTypeProvider = jdtTypeProviderFactory.findOrCreateTypeProvider(new ResourceSetImpl)
+ model = FXGraphFactory.eINSTANCE.createModel
+ val componentDef = FXGraphFactory.eINSTANCE.createComponentDefinition
+
+ model.componentDef = componentDef
+ }
+
+ override processingInstruction(String target, String data) throws SAXException {
+ if ("import" == target) {
+ val i = FXGraphFactory.eINSTANCE.createImport
+ i.importedNamespace = data
+ model.imports += i
+ }
+ }
+
+ override startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+ if( localName.contains('.') ) {
+ // A static property
+ val e = stack.peek as Element
+ val prop = FXGraphFactory.eINSTANCE.createStaticValueProperty
+
+ e.staticProperties.add(prop);
+ stack.push(prop)
+ } else if( Character.isLowerCase(localName.charAt(0)) ) {
+ // A property
+ val e = stack.peek as Element
+ val prop = FXGraphFactory.eINSTANCE.createProperty
+ e.properties.add(prop)
+
+ stack.push(prop)
+ } else {
+ // An element
+ val e = FXGraphFactory.eINSTANCE.createElement
+
+ val t = TypesFactory.eINSTANCE.createJvmParameterizedTypeReference()
+ val jvmType = TypesFactory.eINSTANCE.createJvmPrimitiveType()
+ jvmType.simpleName = localName
+ t.type = jvmType
+ e.type = t
+
+ stack.push(e)
+ }
+ }
+
+ override endElement(String uri, String localName, String qName) throws SAXException {
+ stack.pop
+ }
+
+ def static void main(String[] args) {
+ val h = new FXMLSaxHandler()
+
+ }
+} \ No newline at end of file
diff --git a/bundles/tooling/org.eclipse.fx.ide.jdt.core/src/org/eclipse/fx/ide/jdt/core/internal/BuildPathSupport.java b/bundles/tooling/org.eclipse.fx.ide.jdt.core/src/org/eclipse/fx/ide/jdt/core/internal/BuildPathSupport.java
index 1fb743a81..41e273456 100755
--- a/bundles/tooling/org.eclipse.fx.ide.jdt.core/src/org/eclipse/fx/ide/jdt/core/internal/BuildPathSupport.java
+++ b/bundles/tooling/org.eclipse.fx.ide.jdt.core/src/org/eclipse/fx/ide/jdt/core/internal/BuildPathSupport.java
@@ -15,6 +15,8 @@ import java.io.File;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
+import org.eclipse.fx.core.log.Logger;
+import org.eclipse.fx.osgi.util.LoggerCreator;
import org.eclipse.jdt.core.IAccessRule;
import org.eclipse.jdt.core.IClasspathAttribute;
import org.eclipse.jdt.core.IClasspathEntry;
@@ -26,6 +28,8 @@ import org.eclipse.jdt.launching.LibraryLocation;
public class BuildPathSupport {
public static final String WEB_JAVADOC_LOCATION = "http://docs.oracle.com/javafx/2/api/";
+
+ private static final Logger LOGGER = LoggerCreator.createLogger(BuildPathSupport.class);
public static IClasspathEntry getJavaFXLibraryEntry(IJavaProject project) {
IPath[] paths = getFxJarPath(project);
@@ -93,7 +97,7 @@ public class BuildPathSupport {
};
jarLocationPath = checkPaths[0];
-
+
if( ! jarLocationPath.toFile().exists() ) {
for( IPath p : checkPaths ) {
if( p.toFile().exists() ) {
@@ -104,6 +108,13 @@ public class BuildPathSupport {
}
if( ! jarLocationPath.toFile().exists() ) {
+ LOGGER.error("Unable to detect JavaFX jar for JRE " + i.getName());
+ LOGGER.error(" JRE: " + installDir.getAbsolutePath());
+ LOGGER.error(" Checked paths:" );
+ for( IPath p : checkPaths ) {
+ LOGGER.error(" " + p.toFile().getAbsolutePath());
+ }
+
return null;
}
diff --git a/bundles/tooling/org.eclipse.fx.ide.jdt.ui/plugin.properties b/bundles/tooling/org.eclipse.fx.ide.jdt.ui/plugin.properties
deleted file mode 100755
index 63ec2d93c..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.jdt.ui/plugin.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-
-pluginName = JavaFXAntTask Model
-providerName = www.example.org
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
Binary files differ
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.jar
deleted file mode 100755
index e17ac5e3f..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/build_bin/fx-osgi-launch.jar
+++ /dev/null
Binary files differ
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/build_bin/org.eclipse.fx.ide.ant-0.9.0.jar b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/build_bin/org.eclipse.fx.ide.ant-0.9.0.jar
new file mode 100644
index 000000000..45ddf0390
--- /dev/null
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/build_bin/org.eclipse.fx.ide.ant-0.9.0.jar
Binary files differ
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..fdbef2042 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
@@ -211,6 +211,7 @@ RobotTask {
"org.eclipse.fx.ui.workbench.fx.controls",
"org.eclipse.fx.ui.workbench.renderers.base",
"org.eclipse.fx.ui.workbench.renderers.fx",
+ "org.eclipse.fx.ui.lifecycle",
"com.ibm.icu",
// TODO NEED TO SUPPORT CONDITIONALS HERE "com.ibm.icu.base",
"javax.annotation",
@@ -497,8 +498,8 @@ 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"
- excluded-if "javascript" /# !NativeExport #/
+ URLFile "org.eclipse.fx.ide.ant.jar" "platform:/plugin/org.eclipse.fx.ide.pde.ui.e4/build_bin/org.eclipse.fx.ide.ant-0.9.0.jar"
+ excluded-if "javascript" /# !NativeExport #/
}
} excluded-if "javascript" /# !TychoIntegration; #/
}
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/generator-tasks/mediaSample.rtask b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/generator-tasks/mediaSample.rtask
index 7676f73c0..c5ea672eb 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/generator-tasks/mediaSample.rtask
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/generator-tasks/mediaSample.rtask
@@ -249,6 +249,7 @@ RobotTask {
"org.eclipse.fx.ui.workbench.fx.controls",
"org.eclipse.fx.ui.workbench.renderers.base",
"org.eclipse.fx.ui.workbench.renderers.fx",
+ "org.eclipse.fx.ui.lifecycle",
"com.ibm.icu",
// TODO NEED TO SUPPORT CONDITIONALS HERE "com.ibm.icu.base",
"javax.annotation",
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..f92adb9a4 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
@@ -20,6 +20,7 @@ class NativeLaunchGenerator implements Generator<DynamicFile> {
<property name="eclipse-app-dir" value="«data.tychoOutDir»" />
<target name="init-fx-tasks">
+ <taskdef name="fxosgilauncher" classpath="org.eclipse.fx.ide.ant.jar" classname="org.eclipse.fx.ide.ant.FXOsgiLaunchTask" />
<path id="fxant">
<filelist>
<file name="${java.home}\..\lib\ant-javafx.jar"/>
@@ -32,6 +33,11 @@ class NativeLaunchGenerator implements Generator<DynamicFile> {
</target>
<target name="do-deploy" depends="init-fx-tasks">
+ <fileset id="equinox-launcher" dir="«data.tychoOutDir»">
+ <filename name="plugins/org.eclipse.equinox.launcher_*.jar"/>
+ </fileset>
+ <fxosgilauncher classpathref="fxant" equinoxlauncherjarref="equinox-launcher"/>
+
<fx:resources id="appRes">
<fx:fileset dir="." includes="fx-osgi-launch.jar"/>
<fx:fileset dir="${eclipse-app-dir}" includes="**/*"/>
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..85676f10f 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,7 @@ 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 "org.eclipse.fx.ide.ant.jar" "platform:/plugin/org.eclipse.fx.ide.pde.ui.e4/build_bin/org.eclipse.fx.ide.ant-0.9.0.jar"
excluded-if "javascript" /# !NativeExport #/
}
} excluded-if "javascript" /# !TychoIntegration; #/

Back to the top