Add BTF feature to update site and RCP

Change-Id: Ia1770a3d35e6bd592f8dc8063b951a4375e4de2b
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/37761
Reviewed-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Tested-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-by: Hudson CI

diff --git a/org.eclipse.tracecompass.btf.ui/build.properties b/org.eclipse.tracecompass.btf.ui/build.properties
index eb8eb768245b0f73d76e6ba0ac3f10028df72f2b..5167bbb94e16d17e2b31f82ed80a704dbf5d8ed3 100644 (file)
--- a/org.eclipse.tracecompass.btf.ui/build.properties
+++ b/org.eclipse.tracecompass.btf.ui/build.properties
@@ -16,7 +16,8 @@ bin.includes = META-INF/,\
                plugin.properties,\
                plugin.xml,\
                about.html,\
-               .
+               .,\
+               icons/
 src.includes = about.html
 additional.bundles = org.eclipse.jdt.annotation
 jars.extra.classpath = platform:/plugin/org.eclipse.jdt.annotation

diff --git a/org.eclipse.tracecompass.btf/.project b/org.eclipse.tracecompass.btf/.project
new file mode 100644 (file)
index 0000000..adfec95
--- /dev/null
+++ b/org.eclipse.tracecompass.btf/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.eclipse.tracecompass.btf</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.pde.FeatureBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.FeatureNature</nature>
+       </natures>
+</projectDescription>

diff --git a/org.eclipse.tracecompass.btf/.settings/org.eclipse.core.resources.prefs b/org.eclipse.tracecompass.btf/.settings/org.eclipse.core.resources.prefs
new file mode 100644 (file)
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.tracecompass.btf/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

diff --git a/org.eclipse.tracecompass.btf/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.tracecompass.btf/.settings/org.eclipse.core.runtime.prefs
new file mode 100644 (file)
index 0000000..5a0ad22
--- /dev/null
+++ b/org.eclipse.tracecompass.btf/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n

diff --git a/org.eclipse.tracecompass.btf/build.properties b/org.eclipse.tracecompass.btf/build.properties
new file mode 100644 (file)
index 0000000..37f79c2
--- /dev/null
+++ b/org.eclipse.tracecompass.btf/build.properties
@@ -0,0 +1,14 @@
+###############################################################################
+# Copyright (c) 2014 Ericsson
+#
+# 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:
+#     Ericsson - Initial API and implementation
+###############################################################################
+
+bin.includes = feature.xml,\
+               feature.properties

diff --git a/org.eclipse.tracecompass.btf/feature.properties b/org.eclipse.tracecompass.btf/feature.properties
new file mode 100644 (file)
index 0000000..44b874a
--- /dev/null
+++ b/org.eclipse.tracecompass.btf/feature.properties
@@ -0,0 +1,20 @@
+###############################################################################
+# Copyright (c) 2014 Ericsson
+#
+# 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:
+#     Ericsson - Initial API and implementation
+###############################################################################
+
+featureName=Trace Compass BTF (Best Trace Format) Analysis
+
+description=Plug-ins to integrate BTF into the workbench.
+
+featureProvider=Eclipse Trace Compass
+
+copyright=Copyright 2014 Ericsson
+

diff --git a/org.eclipse.tracecompass.btf/feature.xml b/org.eclipse.tracecompass.btf/feature.xml
new file mode 100644 (file)
index 0000000..7f284b2
--- /dev/null
+++ b/org.eclipse.tracecompass.btf/feature.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.tracecompass.btf"
+      label="%featureName"
+      version="0.1.0.qualifier"
+      provider-name="%featureProvider"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
+
+   <description url="http://www.example.com/description">
+      %description
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <update label="Linux Tools Update Site" url="http://download.eclipse.org/linuxtools/update"/>
+   </url>
+
+   <includes
+         id="org.eclipse.tracecompass.tmf"
+         version="0.0.0"
+         name="Tracing and Monitoring Framework (TMF)"/>
+
+   <plugin
+         id="org.eclipse.tracecompass.btf.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.tracecompass.btf.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>

diff --git a/org.eclipse.tracecompass.btf/pom.xml b/org.eclipse.tracecompass.btf/pom.xml
new file mode 100644 (file)
index 0000000..1c00126
--- /dev/null
+++ b/org.eclipse.tracecompass.btf/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright (C) 2014 Ericsson
+
+   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
+-->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <artifactId>org.eclipse.tracecompass</artifactId>
+    <groupId>org.eclipse.tracecompass</groupId>
+    <version>0.1.0-SNAPSHOT</version>
+  </parent>
+
+  <name>Trace Compass BTF (Best Trace Format) Feature</name>
+  <artifactId>org.eclipse.tracecompass.btf</artifactId>
+  <groupId>org.eclipse.tracecompass</groupId>
+  <version>0.1.0-SNAPSHOT</version>
+
+  <packaging>eclipse-feature</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho.extras</groupId>
+        <artifactId>tycho-source-feature-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>source-feature</id>
+            <phase>package</phase>
+            <goals>
+              <goal>source-feature</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-p2-plugin</artifactId>
+        <version>${tycho-version}</version>
+        <executions>
+          <execution>
+            <id>attached-p2-metadata</id>
+            <phase>package</phase>
+            <goals>
+              <goal>p2-metadata</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

diff --git a/org.eclipse.tracecompass.rcp.product/tracing.product b/org.eclipse.tracecompass.rcp.product/tracing.product
index 26db5ea2fb2727f34054a2d62acebe2c5fcb6529..7014fb5247ec977ad781a63576dba7819ee1c550 100644 (file)
--- a/org.eclipse.tracecompass.rcp.product/tracing.product
+++ b/org.eclipse.tracecompass.rcp.product/tracing.product
@@ -208,6 +208,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <feature id="org.eclipse.e4.rcp"/>
       <feature id="org.eclipse.emf.common"/>
       <feature id="org.eclipse.equinox.p2.extras.feature"/>
+      <feature id="org.eclipse.tracecompass.btf"/>
       <feature id="org.eclipse.tracecompass.ctf"/>
       <feature id="org.eclipse.tracecompass.tmf.ctf"/>
       <feature id="org.eclipse.tracecompass.tmf.pcap"/>

diff --git a/org.eclipse.tracecompass.releng-site/category.xml b/org.eclipse.tracecompass.releng-site/category.xml
index 5983970b9c88337e42183c49ab1cc011e11cec6a..f993df6a3aa78596c2e1c5b0c6ad4fd4b2091f9a 100644 (file)
--- a/org.eclipse.tracecompass.releng-site/category.xml
+++ b/org.eclipse.tracecompass.releng-site/category.xml
@@ -3,6 +3,9 @@
    <description>
       Nightly builds of Trace Compass project.
    </description>
+   <feature url="features/org.eclipse.tracecompass.btf_0.0.0.qualifier.jar" id="org.eclipse.tracecompass.btf" version="0.0.0">
+      <category name="Trace Compass"/>
+   </feature>
    <feature url="features/org.eclipse.tracecompass.lttng2.kernel_0.0.0.qualifier.jar" id="org.eclipse.tracecompass.lttng2.kernel" version="0.0.0">
       <category name="Trace Compass"/>
    </feature>

diff --git a/pom.xml b/pom.xml
index 66966723ba289f3dc54b67f9935e87829f295c50..74cf06160409b86fec9cfdf0a86595a943971bb9 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -122,6 +122,7 @@
   <modules>
     <module>org.eclipse.tracecompass.common.core</module>
 
+    <module>org.eclipse.tracecompass.btf</module>
     <module>org.eclipse.tracecompass.btf.core</module>
     <module>org.eclipse.tracecompass.btf.core.tests</module>
     <module>org.eclipse.tracecompass.btf.ui</module>