From 130db1f2e0956bac2b38e2c6c871ae5d8fcf1461 Mon Sep 17 00:00:00 2001
From: Alexandre Montplaisir <alexmonthy@efficios.com>
Date: Thu, 15 Sep 2016 14:05:02 -0400
Subject: [PATCH] releng: Add e(fx)clipse minimal feature to the target

This allows using embedded JavaFX components.

Only the minimal feature is needed, the "Target" one contains
a complete Eclipse IDE, and doesn't work in planner mode.

TODO: Add to the staging target too

Change-Id: I220df6f55e5cc73fbcadf6e5df72fc6e366d83ba
Signed-off-by: Alexandre Montplaisir <alexmonthy@efficios.com>
---
 pom.xml                                                | 10 ++++++++++
 .../tracing.product                                    |  1 +
 .../tracecompass-e4.6.target                           |  4 ++++
 3 files changed, 15 insertions(+)

diff --git a/pom.xml b/pom.xml
index 7c3f4343c0..65ab45a6cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -468,6 +468,16 @@
             <compilerArguments>
               <annotationpath>common/org.eclipse.tracecompass.common.core/annotations</annotationpath>
             </compilerArguments>
+            <extraClasspathElements>
+              <!-- Include the jfxswt.jar, which contains the JavaFX embedding functionality -->
+              <extraClasspathElement>
+                <groupId>com.oracle</groupId>
+                <artifactId>javafx</artifactId>
+                <version>8.0.0-SNAPSHOT</version>
+                <systemPath>${java.home}/lib/jfxswt.jar</systemPath>
+                <scope>system</scope>
+              </extraClasspathElement>
+            </extraClasspathElements> 
           </configuration>
         </plugin>
 
diff --git a/rcp/org.eclipse.tracecompass.rcp.product/tracing.product b/rcp/org.eclipse.tracecompass.rcp.product/tracing.product
index 166f331cdf..09c18f6566 100644
--- a/rcp/org.eclipse.tracecompass.rcp.product/tracing.product
+++ b/rcp/org.eclipse.tracecompass.rcp.product/tracing.product
@@ -218,6 +218,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
       <feature id="org.eclipse.ecf.core.feature"/>
       <feature id="org.eclipse.ecf.filetransfer.feature"/>
+      <feature id="org.eclipse.fx.runtime.min.feature"/>
    </features>
 
    <configurations>
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.6.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.6.target
index 2daf7bf220..b43bf00db3 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.6.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.6.target
@@ -67,6 +67,10 @@
 <unit id="org.eclipse.wst.xml.ui" version="0.0.0"/>
 <repository location="http://download.eclipse.org/webtools/downloads/drops/R3.8.1/R-3.8.1-20160912100321/repository/"/>
 </location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.fx.runtime.min.feature.feature.group" version="2.4.0.201605100504"/>
+<repository location="http://download.eclipse.org/efxclipse/runtime-released/2.4.0/site/"/>
+</location>
 </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <launcherArgs>
-- 
2.34.1