Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormistria2011-05-30 16:47:50 +0000
committermistria2011-05-30 16:47:50 +0000
commitcf3ef83455fe062e5eb1b45f9d6a504c915ce347 (patch)
treefe89f468d28a0665a52d0a0a80c475dda0ccba13
parent2028831bf1cd93ad2d1a44ac6b0f10410850f127 (diff)
downloadorg.eclipse.gmf-tooling-20110531-2359.tar.gz
org.eclipse.gmf-tooling-20110531-2359.tar.xz
org.eclipse.gmf-tooling-20110531-2359.zip
bug 333270: Investigate moving build to Tychov20110531-2359
Build against Indigo
-rw-r--r--doc/org.eclipse.gmf.doc.ui/pom.xml34
-rw-r--r--doc/org.eclipse.gmf.doc/pom.xml16
-rw-r--r--examples/org.eclipse.gmf.ecore.editor/pom.xml18
-rw-r--r--plugins/org.eclipse.gmf.codegen/pom.xml47
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/build.properties3
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/pom.xml47
-rw-r--r--releng/org.eclipse.gmf.tooling-parent/pom.xml41
7 files changed, 169 insertions, 37 deletions
diff --git a/doc/org.eclipse.gmf.doc.ui/pom.xml b/doc/org.eclipse.gmf.doc.ui/pom.xml
new file mode 100644
index 000000000..3e5c1b3df
--- /dev/null
+++ b/doc/org.eclipse.gmf.doc.ui/pom.xml
@@ -0,0 +1,34 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.gmf</groupId>
+ <artifactId>org.eclipse.gmf.doc.ui</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+
+ <parent>
+ <groupId>org.eclipse.gmf</groupId>
+ <artifactId>org.eclipse.gmf.tooling-parent</artifactId>
+ <version>2.4.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.gmf.tooling-parent</relativePath>
+ </parent>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <executions>
+ <execution>
+ <id>attach-source</id>
+ <goals>
+ <goal>plugin-source</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project> \ No newline at end of file
diff --git a/doc/org.eclipse.gmf.doc/pom.xml b/doc/org.eclipse.gmf.doc/pom.xml
new file mode 100644
index 000000000..db2c5efb2
--- /dev/null
+++ b/doc/org.eclipse.gmf.doc/pom.xml
@@ -0,0 +1,16 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.gmf</groupId>
+ <artifactId>org.eclipse.gmf.doc</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+
+ <parent>
+ <groupId>org.eclipse.gmf</groupId>
+ <artifactId>org.eclipse.gmf.tooling-parent</artifactId>
+ <version>2.4.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.gmf.tooling-parent</relativePath>
+ </parent>
+
+</project> \ No newline at end of file
diff --git a/examples/org.eclipse.gmf.ecore.editor/pom.xml b/examples/org.eclipse.gmf.ecore.editor/pom.xml
index 8d1fa49a6..e0bf2ac2e 100644
--- a/examples/org.eclipse.gmf.ecore.editor/pom.xml
+++ b/examples/org.eclipse.gmf.ecore.editor/pom.xml
@@ -12,4 +12,22 @@
<relativePath>../../releng/org.eclipse.gmf.tooling-parent</relativePath>
</parent>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <executions>
+ <execution>
+ <id>attach-source</id>
+ <goals>
+ <goal>plugin-source</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.codegen/pom.xml b/plugins/org.eclipse.gmf.codegen/pom.xml
index 1b82f7a93..0ec4b440b 100644
--- a/plugins/org.eclipse.gmf.codegen/pom.xml
+++ b/plugins/org.eclipse.gmf.codegen/pom.xml
@@ -1,15 +1,34 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.gmf</groupId>
- <artifactId>org.eclipse.gmf.codegen</artifactId>
- <version>2.2.200-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-
- <parent>
- <groupId>org.eclipse.gmf</groupId>
- <artifactId>org.eclipse.gmf.tooling-parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.gmf.tooling-parent</relativePath>
- </parent>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.gmf</groupId>
+ <artifactId>org.eclipse.gmf.codegen</artifactId>
+ <version>2.2.200-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+
+ <parent>
+ <groupId>org.eclipse.gmf</groupId>
+ <artifactId>org.eclipse.gmf.tooling-parent</artifactId>
+ <version>2.4.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.gmf.tooling-parent</relativePath>
+ </parent>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <executions>
+ <execution>
+ <id>attach-source</id>
+ <goals>
+ <goal>plugin-source</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/build.properties b/plugins/org.eclipse.gmf.graphdef.codegen/build.properties
index 28da64118..0f0ffb3a4 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/build.properties
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/build.properties
@@ -9,7 +9,8 @@
# Borland Software Corporation - initial API and implementation
###############################################################################
source.. = src/,\
- templates.qvtlib/
+ templates.qvtlib/,\
+ templates
output.. = bin/
bin.includes = META-INF/,\
.,\
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/pom.xml b/plugins/org.eclipse.gmf.graphdef.codegen/pom.xml
index e551ec45f..840b8c8e6 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/pom.xml
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/pom.xml
@@ -1,15 +1,34 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.gmf</groupId>
- <artifactId>org.eclipse.gmf.graphdef.codegen</artifactId>
- <version>2.0.101-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-
- <parent>
- <groupId>org.eclipse.gmf</groupId>
- <artifactId>org.eclipse.gmf.tooling-parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.gmf.tooling-parent</relativePath>
- </parent>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.gmf</groupId>
+ <artifactId>org.eclipse.gmf.graphdef.codegen</artifactId>
+ <version>2.0.101-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+
+ <parent>
+ <groupId>org.eclipse.gmf</groupId>
+ <artifactId>org.eclipse.gmf.tooling-parent</artifactId>
+ <version>2.4.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.gmf.tooling-parent</relativePath>
+ </parent>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <executions>
+ <execution>
+ <id>attach-source</id>
+ <goals>
+ <goal>plugin-source</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project> \ No newline at end of file
diff --git a/releng/org.eclipse.gmf.tooling-parent/pom.xml b/releng/org.eclipse.gmf.tooling-parent/pom.xml
index f812d85d7..c5d816f21 100644
--- a/releng/org.eclipse.gmf.tooling-parent/pom.xml
+++ b/releng/org.eclipse.gmf.tooling-parent/pom.xml
@@ -57,6 +57,10 @@
<module>../../plugins/org.eclipse.gmf.xpand.editor</module>
<module>../../plugins/org.eclipse.gmf.xpand.migration</module>
<module>../../plugins/org.eclipse.gmf.xpand.qvtlibrary</module>
+ <module>../../examples/org.eclipse.gmf.ecore.editor</module>
+ <!-- Doc -->
+ <module>../../doc/org.eclipse.gmf.doc</module>
+ <module>../../doc/org.eclipse.gmf.doc.ui</module>
<!-- features -->
<!-- Currently disabled since they require sources, not yet handled -->
@@ -71,7 +75,6 @@
<!-- module>../../features/org.eclipse.gmf.xpand-feature</module -->
<!-- examples -->
- <!-- module>../../examples/org.eclipse.gmf.ecore.editor</module -->
<module>../../examples/org.eclipse.gmf.examples</module>
<module>../../examples/org.eclipse.gmf.examples.design2d</module>
<module>../../examples/org.eclipse.gmf.examples.design2d.notation</module>
@@ -205,11 +208,33 @@
</plugins>
</build>
- <repositories>
- <repository>
- <id>Helios</id>
- <layout>p2</layout>
- <url>http://download.eclipse.org/releases/helios</url>
- </repository>
- </repositories>
+ <profiles>
+ <profile>
+ <id>helios</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>Helios</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/releases/helios</url>
+ </repository>
+ </repositories>
+ </profile>
+ <profile>
+ <id>indigo</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>Indigo</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/releases/indigo</url>
+ </repository>
+ </repositories>
+ </profile>
+ </profiles>
+
</project>

Back to the top