X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=pom.xml;h=426e955a81e504be5356511c359685d5010b4336;hb=cd7c36d21ce2d05f07acdcdc8df30bac57d3e8f2;hp=38d6cb55c3604f9638a6345259e8e4f9154a563a;hpb=15e89960c44f8b01fe8c8c7a68cdc5a91f62379c;p=deliverable%2Ftracecompass.git

diff --git a/pom.xml b/pom.xml
index 38d6cb55c3..426e955a81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,12 +20,12 @@
   <parent>
     <groupId>org.eclipse.linuxtools</groupId>
     <artifactId>linuxtools-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.linuxtools.lttng</groupId>
   <artifactId>linuxtools-lttng-parent</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>3.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Eclipse Linux Tools LTTng Parent</name>
@@ -46,44 +46,11 @@
   
 <profiles>
   <profile>
-    <id>jcoverage</id>
-      <properties>
-      <!-- Properties to enable jacoco code coverage analysis -->
-      <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-      <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-      <sonar.jacoco.reportPath>../target/jacoco.exec</sonar.jacoco.reportPath>
-    </properties>
-
-    <build>
-      <plugins>
-        <!-- Enabling use of jacoco -->
-        <plugin>
-          <groupId>org.jacoco</groupId>
-          <artifactId>jacoco-maven-plugin</artifactId>
-          <version>0.5.6.201201232323</version>
-          <executions>
-            <execution>
-              <goals>
-                <goal>prepare-agent</goal>
-              </goals>
-              <configuration>
-                <!-- Where to put jacoco coverage report -->
-                <destFile>${sonar.jacoco.reportPath}</destFile>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-      </plugins>
-    </build>
-  </profile>
-
-  <profile>
-    <id>lttngTests</id>
+    <id>tracingRcp</id>
       <modules>
-        <module>org.eclipse.linuxtools.lttng2.core.tests</module>
+        <module>org.eclipse.linuxtools.tracing.rcp.product</module>
       </modules>
   </profile>
-  
   <profile>
     <id>lttngPackage</id>
       <properties>
@@ -93,33 +60,13 @@
         <module>org.eclipse.linuxtools.lttng.releng-site</module>
       </modules>
   </profile> 
-	
-</profiles>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>../src.xml</descriptor>
-          </descriptors>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>sonar-maven-plugin</artifactId>
-        <version>2.0</version>
-      </plugin>
-
-    </plugins>
-  </build>
+</profiles>
 
   <modules>
     <module>org.eclipse.linuxtools.ctf</module>
     <module>org.eclipse.linuxtools.ctf.core</module>
-    <!-- <module>org.eclipse.linuxtools.ctf.core.tests</module> -->
+    <module>org.eclipse.linuxtools.ctf.core.tests</module>
     <module>org.eclipse.linuxtools.ctf.parser</module>
 
     <module>org.eclipse.linuxtools.tmf</module>
@@ -127,20 +74,90 @@
     <module>org.eclipse.linuxtools.tmf.core.tests</module>
     <module>org.eclipse.linuxtools.tmf.ui</module>
     <module>org.eclipse.linuxtools.tmf.ui.tests</module>
+    <module>org.eclipse.linuxtools.tmf.help</module>
 
-    <module>org.eclipse.linuxtools.lttng.help</module>
+    <module>org.eclipse.linuxtools.tmf.analysis.xml.core</module>
+    <module>org.eclipse.linuxtools.tmf.analysis.xml.core.tests</module>
+    <module>org.eclipse.linuxtools.tmf.analysis.xml.ui</module>
+    <module>org.eclipse.linuxtools.tmf.analysis.xml.ui.tests</module>
 
     <module>org.eclipse.linuxtools.lttng2</module>
     <module>org.eclipse.linuxtools.lttng2.core</module>
-    <!--  module>org.eclipse.linuxtools.lttng2.core.tests</module> activated by the lttngTests package -->
+    <module>org.eclipse.linuxtools.lttng2.core.tests</module>
     <module>org.eclipse.linuxtools.lttng2.ui</module>
     <module>org.eclipse.linuxtools.lttng2.ui.tests</module>
+    <module>org.eclipse.linuxtools.lttng.help</module>
 
     <module>org.eclipse.linuxtools.lttng2.kernel</module>
     <module>org.eclipse.linuxtools.lttng2.kernel.core</module>
     <module>org.eclipse.linuxtools.lttng2.kernel.core.tests</module>
     <module>org.eclipse.linuxtools.lttng2.kernel.ui</module>
     <module>org.eclipse.linuxtools.lttng2.kernel.ui.tests</module>
+
+    <module>org.eclipse.linuxtools.lttng2.ust</module>
+    <module>org.eclipse.linuxtools.lttng2.ust.core</module>
+    <module>org.eclipse.linuxtools.lttng2.ust.core.tests</module>
+    <module>org.eclipse.linuxtools.lttng2.ust.ui</module>
+    <module>org.eclipse.linuxtools.lttng2.ust.ui.tests</module>
+
+    <module>org.eclipse.linuxtools.gdbtrace</module>
+    <module>org.eclipse.linuxtools.gdbtrace.core</module>
+    <module>org.eclipse.linuxtools.gdbtrace.core.tests</module>
+    <module>org.eclipse.linuxtools.gdbtrace.ui</module>
+    <module>org.eclipse.linuxtools.gdbtrace.ui.tests</module>
+    <module>org.eclipse.linuxtools.gdbtrace.help</module>
+
+    <module>org.eclipse.linuxtools.tracing.rcp.branding</module>
+    <module>org.eclipse.linuxtools.tracing.rcp.branding.feature</module>
+    <module>org.eclipse.linuxtools.tracing.rcp</module>
+    <module>org.eclipse.linuxtools.tracing.rcp.help</module>
+    <module>org.eclipse.linuxtools.tracing.rcp.ui</module>
+
   </modules>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>target-platform-configuration</artifactId>
+                <version>${tycho-version}</version>
+                <configuration>
+                    <environments>
+                        <environment>
+                            <os>win32</os>
+                            <ws>win32</ws>
+                            <arch>x86</arch>
+                        </environment>
+                        <environment>
+                            <os>win32</os>
+                            <ws>win32</ws>
+                            <arch>x86_64</arch>
+                        </environment>
+                        <environment>
+                            <os>macosx</os>
+                            <ws>cocoa</ws>
+                            <arch>x86_64</arch>
+                        </environment>
+                        <environment>
+                            <os>linux</os>
+                            <ws>gtk</ws>
+                            <arch>x86</arch>
+                        </environment>
+                        <environment>
+                            <os>linux</os>
+                            <ws>gtk</ws>
+                            <arch>x86_64</arch>
+                        </environment>
+                    </environments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>tycho-maven-plugin</artifactId>
+                <version>${tycho-version}</version>
+                <extensions>true</extensions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>