Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Johnston2011-12-02 20:00:37 +0000
committerJeff Johnston2011-12-02 20:00:37 +0000
commit4156e11b3ab21bfa43ec94df98d812dd022082e8 (patch)
treee611d3a7a51b3e1ff88dc8cc3d106871d8e9b0cb
parent7dfecd15b36e9971d642a3d31c4fd21a0a6535d3 (diff)
downloadorg.eclipse.linuxtools-4156e11b3ab21bfa43ec94df98d812dd022082e8.tar.gz
org.eclipse.linuxtools-4156e11b3ab21bfa43ec94df98d812dd022082e8.tar.xz
org.eclipse.linuxtools-4156e11b3ab21bfa43ec94df98d812dd022082e8.zip
Fix RDT branch so it builds using tycho.
-rw-r--r--autotools/org.eclipse.linuxtools.cdt.autotools.core/pom.xml2
-rw-r--r--profiling/org.eclipse.linuxtools.profiling.launch/pom.xml2
-rw-r--r--profiling/org.eclipse.linuxtools.profiling.remote-feature/feature.xml7
-rw-r--r--profiling/org.eclipse.linuxtools.profiling.remote-feature/pom.xml2
-rw-r--r--profiling/org.eclipse.linuxtools.rdt.proxy/pom.xml44
-rw-r--r--profiling/pom.xml3
-rw-r--r--releng/org.eclipse.linuxtools.releng-site/category.xml3
7 files changed, 60 insertions, 3 deletions
diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/pom.xml b/autotools/org.eclipse.linuxtools.cdt.autotools.core/pom.xml
index 619b08a7e6..9d64114217 100644
--- a/autotools/org.eclipse.linuxtools.cdt.autotools.core/pom.xml
+++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/pom.xml
@@ -23,7 +23,7 @@
</parent>
<artifactId>org.eclipse.linuxtools.cdt.autotools.core</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<name>Linux Tools Autotools Core Plug-in</name>
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/pom.xml b/profiling/org.eclipse.linuxtools.profiling.launch/pom.xml
index 6781b447bb..d9a7f736ee 100644
--- a/profiling/org.eclipse.linuxtools.profiling.launch/pom.xml
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/pom.xml
@@ -18,7 +18,7 @@
</parent>
<artifactId>org.eclipse.linuxtools.profiling.launch</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.8.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<name>Linux Tools Profiling Launch Plug-in</name>
diff --git a/profiling/org.eclipse.linuxtools.profiling.remote-feature/feature.xml b/profiling/org.eclipse.linuxtools.profiling.remote-feature/feature.xml
index 5be06eb23c..35a55c0f0c 100644
--- a/profiling/org.eclipse.linuxtools.profiling.remote-feature/feature.xml
+++ b/profiling/org.eclipse.linuxtools.profiling.remote-feature/feature.xml
@@ -40,4 +40,11 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.linuxtools.rdt.proxy"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/profiling/org.eclipse.linuxtools.profiling.remote-feature/pom.xml b/profiling/org.eclipse.linuxtools.profiling.remote-feature/pom.xml
index 0050efa1a8..29941b0043 100644
--- a/profiling/org.eclipse.linuxtools.profiling.remote-feature/pom.xml
+++ b/profiling/org.eclipse.linuxtools.profiling.remote-feature/pom.xml
@@ -18,7 +18,7 @@
</parent>
<artifactId>org.eclipse.linuxtools.profiling.remote</artifactId>
- <version>0.7.0-SNAPSHOT</version>
+ <version>0.8.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<name>Linux Tools Profiling Remote Capabilities Feature</name>
diff --git a/profiling/org.eclipse.linuxtools.rdt.proxy/pom.xml b/profiling/org.eclipse.linuxtools.rdt.proxy/pom.xml
new file mode 100644
index 0000000000..f7b36f5818
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.rdt.proxy/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2011, Red Hat, Inc.
+
+ 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>linuxtools-profiling-parent</artifactId>
+ <groupId>org.eclipse.linuxtools.profiling</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.linuxtools.rdt.proxy</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+
+ <name>Linux Tools RDT Proxy Plug-in</name>
+
+ <build>
+ <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/profiling/pom.xml b/profiling/pom.xml
index 0f4c409314..0fd139b449 100644
--- a/profiling/pom.xml
+++ b/profiling/pom.xml
@@ -64,10 +64,13 @@
<module>org.eclipse.linuxtools.dataviewers.annotatedsourceeditor</module>
<module>org.eclipse.linuxtools.profiling-feature</module>
<module>org.eclipse.linuxtools.profiling.launch</module>
+ <module>org.eclipse.linuxtools.profiling.launch.remote</module>
+ <module>org.eclipse.linuxtools.profiling.remote-feature</module>
<module>org.eclipse.linuxtools.profiling.test-feature</module>
<module>org.eclipse.linuxtools.profiling.tests</module>
<module>org.eclipse.linuxtools.profiling.ui</module>
<module>org.eclipse.linuxtools.profiling.ui.capability</module>
+ <module>org.eclipse.linuxtools.rdt.proxy</module>
</modules>
</project>
diff --git a/releng/org.eclipse.linuxtools.releng-site/category.xml b/releng/org.eclipse.linuxtools.releng-site/category.xml
index 5f2bef05d3..c61551229b 100644
--- a/releng/org.eclipse.linuxtools.releng-site/category.xml
+++ b/releng/org.eclipse.linuxtools.releng-site/category.xml
@@ -31,6 +31,9 @@
<feature url="features/org.eclipse.linuxtools.profiling_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.profiling" version="0.0.0">
<category name="Linux Tools"/>
</feature>
+ <feature url="features/org.eclipse.linuxtools.profiling.remote_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.profiling.remote" version="0.0.0">
+ <category name="Linux Tools"/>
+ </feature>
<feature url="features/org.eclipse.linuxtools.rpm_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.rpm" version="0.0.0">
<category name="Linux Tools"/>
</feature>

Back to the top