Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2013-07-01 09:36:36 -0400
committerTom Schindl2013-07-01 09:36:36 -0400
commitc33cea81d3ed5dbcd7736eec9ff397e70a333fd2 (patch)
tree009090d8ccb65f37d1c2c53210d64da00b4f71b2
parent58908ef30805dcf5bb36d087ff113d75157e71f7 (diff)
downloadorg.eclipse.efxclipse-c33cea81d3ed5dbcd7736eec9ff397e70a333fd2.tar.gz
org.eclipse.efxclipse-c33cea81d3ed5dbcd7736eec9ff397e70a333fd2.tar.xz
org.eclipse.efxclipse-c33cea81d3ed5dbcd7736eec9ff397e70a333fd2.zip
Bug 411981 - Do not prepackage fx-osgi-launcher-*.jar but generate on
the fly
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.ui.e4/build_bin/fx-osgi-launch-7.jarbin16740 -> 0 bytes
-rw-r--r--bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/build_bin/fx-osgi-launch-8.jarbin17791 -> 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.rtask6
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.ui.e4/src/org/eclipse/fx/ide/pde/ui/e4/project/template/NativeLaunchGenerator.xtend10
-rwxr-xr-xbundles/tooling/org.eclipse.fx.ide.pde.ui/generator-tasks/osgi-app.rtask4
6 files changed, 10 insertions, 10 deletions
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/build_bin/fx-osgi-launch-7.jar b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/build_bin/fx-osgi-launch-7.jar
deleted file mode 100755
index 9a4fb97e0..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/build_bin/fx-osgi-launch-7.jar
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index b35719c4b..000000000
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/build_bin/fx-osgi-launch-8.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 b5ce224f3..ca1c8a1c3 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,10 +497,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-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 #/
+ 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/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 88afb3b84..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
@@ -18,10 +18,9 @@ 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>
+ <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"/>
@@ -34,8 +33,13 @@ 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.launcher.jar}"/>
+ <fx:fileset dir="." includes="fx-osgi-launch.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 07658df9a..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,9 +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-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"
+ 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