Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorGoulwen Le Fur2014-08-05 09:08:40 +0000
committerGoulwen Le Fur2014-08-05 09:08:40 +0000
commit5f26cf2f2e29876d23aa461055b334d61b979e7f (patch)
treee12e726bd4ff59ab93fc037042c08bdb06abb155 /releng
parent4eabe34876ddcb67b510777db13cb3dc69531cb9 (diff)
downloadorg.eclipse.eef-5f26cf2f2e29876d23aa461055b334d61b979e7f.tar.gz
org.eclipse.eef-5f26cf2f2e29876d23aa461055b334d61b979e7f.tar.xz
org.eclipse.eef-5f26cf2f2e29876d23aa461055b334d61b979e7f.zip
This commit is a 'manual' merge with 1.4 branch. This move is due to complex lifecycle between the master branch and the other stream branches
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.emf.eef.releng.parent/bridges/xtext-intent/pom.xml170
-rw-r--r--releng/org.eclipse.emf.eef.releng.parent/build.xml99
-rw-r--r--releng/org.eclipse.emf.eef.update/category.xml31
3 files changed, 13 insertions, 287 deletions
diff --git a/releng/org.eclipse.emf.eef.releng.parent/bridges/xtext-intent/pom.xml b/releng/org.eclipse.emf.eef.releng.parent/bridges/xtext-intent/pom.xml
deleted file mode 100644
index b33411759..000000000
--- a/releng/org.eclipse.emf.eef.releng.parent/bridges/xtext-intent/pom.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2011 Obeo. 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: Obeo - initial creator -->
-
-<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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <prerequisites>
- <maven>3.0</maven>
- </prerequisites>
- <groupId>org.eclipse.emf</groupId>
- <artifactId>org.eclipse.emf.eef.releng.bridge.xtext-intent.parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <parent>
- <groupId>org.eclipse.emf</groupId>
- <artifactId>org.eclipse.emf.eef.releng.parent</artifactId>
- <relativePath>../../../org.eclipse.emf.eef.releng.parent</relativePath>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
-
-
- <name>EEF Parent for XText-Intent bridge</name>
-
- <licenses>
- <license>
- <name>Eclipse Public License v1.0</name>
- <comments>
- 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.htm</comments>
- </license>
- </licenses>
-
- <properties>
- <tycho-version>0.14.1</tycho-version>
- <tycho-extras-version>0.14.0</tycho-extras-version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <repositories>
- <repository>
- <id>kepler</id>
- <layout>p2</layout>
- <url>http://download.eclipse.org/releases/kepler</url>
- </repository>
- <repository>
- <id>juno</id>
- <layout>p2</layout>
- <url>http://download.eclipse.org/releases/juno</url>
- </repository>
- <repository>
- <id>indigo</id>
- <layout>p2</layout>
- <url>http://download.eclipse.org/releases/indigo</url>
- </repository>
- <repository>
- <id>Latest EMFCompare</id>
- <layout>p2</layout>
- <url>https://hudson.eclipse.org/hudson/job/emf-compare-master/lastSuccessfulBuild/artifact/packaging/org.eclipse.emf.compare.update/target/repository/</url>
- </repository>
- <repository>
- <id>orbit</id>
- <layout>p2</layout>
- <url>http://download.eclipse.org/tools/orbit/downloads/drops/updateSite</url>
- </repository>
- <repository>
- <id>swtbot</id>
- <layout>p2</layout>
- <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site</url>
- </repository>
- <repository>
- <id>Latest Intent</id>
- <layout>p2</layout>
- <url>https://hudson.eclipse.org/hudson/job/mylyn-docs-intent-0.7-nightly/lastSuccessfulBuild/artifact/features/org.eclipse.mylyn.docs.intent.update/target/repository</url>
- </repository>
- </repositories>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho-version}</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <resolver>p2</resolver>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</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>
- </environments>
- </configuration>
- </plugin>
- <!-- enable source bundle generation -->
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- <version>${tycho-version}</version>
- <executions>
- <execution>
- <id>plugin-source</id>
- <goals>
- <goal>plugin-source</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-compiler-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
diff --git a/releng/org.eclipse.emf.eef.releng.parent/build.xml b/releng/org.eclipse.emf.eef.releng.parent/build.xml
deleted file mode 100644
index 887821889..000000000
--- a/releng/org.eclipse.emf.eef.releng.parent/build.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2011 Obeo. 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: Obeo - initial creator -->
-
-<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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <prerequisites>
- <maven>3.0</maven>
- </prerequisites>
- <groupId>org.eclipse.emf</groupId>
- <artifactId>org.eclipse.emf.eef.releng.build</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>EEF Build</name>
-
- <licenses>
- <license>
- <name>Eclipse Public License v1.0</name>
- <comments>
- 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.htm</comments>
- </license>
- </licenses>
-
- <properties>
- <tycho-version>0.14.1</tycho-version>
- <tycho-extras-version>0.14.0</tycho-extras-version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <modules>
- <module>../../plugins/org.eclipse.emf.eef.runtime</module>
- <module>../../plugins/org.eclipse.emf.eef.runtime.extended</module>
- <!--module>../../plugins/org.eclipse.emf.eef.runtime.tests</module-->
- <module>../../plugins/org.eclipse.emf.eef.cdo.runtime</module>
-
- <module>../../doc/org.eclipse.emf.eef.doc</module>
-
- <module>../../plugins/org.eclipse.emf.eef.components</module>
- <module>../../plugins/org.eclipse.emf.eef.components.edit</module>
- <module>../../plugins/org.eclipse.emf.eef.components.editor</module>
- <module>../../plugins/org.eclipse.emf.eef.eefgen</module>
- <module>../../plugins/org.eclipse.emf.eef.eefgen.edit</module>
- <module>../../plugins/org.eclipse.emf.eef.eefgen.editor</module>
- <module>../../plugins/org.eclipse.emf.eef.mapping</module>
- <module>../../plugins/org.eclipse.emf.eef.mapping.edit</module>
- <module>../../plugins/org.eclipse.emf.eef.views</module>
- <module>../../plugins/org.eclipse.emf.eef.views.edit</module>
- <module>../../plugins/org.eclipse.emf.eef.views.editor</module>
- <module>../../plugins/org.eclipse.emf.eef.editor.model</module>
- <module>../../plugins/org.eclipse.emf.eef.extended.widgets.richtext</module>
-
- <module>../../plugins/org.eclipse.emf.eef.modelingbot</module>
- <module>../../plugins/org.eclipse.emf.eef.modelingbot.edit</module>
- <module>../../plugins/org.eclipse.emf.eef.modelingbot.editor</module>
-
- <module>../../plugins/org.eclipse.emf.eef.codegen</module>
- <module>../../plugins/org.eclipse.emf.eef.codegen.launcher</module>
- <module>../../plugins/org.eclipse.emf.eef.codegen.ecore</module>
- <module>../../plugins/org.eclipse.emf.eef.codegen.extended</module>
-
- <!--module>../../plugins/org.eclipse.emf.modelingbot.xtext</module-->
- <!--module>../../plugins/org.eclipse.emf.modelingbot.xtext.ui</module-->
- <!--module>../../plugins/org.eclipse.mylyn.docs.intent.bridge.modelingbot</module-->
-
- <module>../../plugins/org.eclipse.emf.eef.branding</module>
- <module>../../features/org.eclipse.emf.eef.runtime-feature</module>
- <module>../../features/org.eclipse.emf.eef.collab.runtime-feature</module>
- <module>../../features/org.eclipse.emf.eef.extended-feature</module>
- <module>../../features/org.eclipse.emf.eef.richtext-feature</module>
- <module>../../features/org.eclipse.emf.eef.edt-feature</module>
- <module>../../features/org.eclipse.emf.eef.codegen.ecore-feature</module>
- <module>../../features/org.eclipse.emf.eef.sdk-feature</module>
- <module>../../features/org.eclipse.emf.eef.tests-feature</module>
- <!--module>../../features/org.eclipse.emf.eef.tests.intent-feature</module-->
-
- <module>../org.eclipse.emf.eef.update</module>
-
- <module>../../tests/org.eclipse.emf.examples.eef</module>
- <module>../../tests/org.eclipse.emf.examples.eef.edit</module>
- <module>../../tests/org.eclipse.emf.examples.eef.editor</module>
- <module>../../tests/org.eclipse.emf.examples.eef.tests.junit</module>
- <module>../../tests/org.eclipse.emf.eef.tests.nonreg</module>
- <module>../../tests/org.eclipse.emf.eef.tests.nonreg.edit</module>
- <module>../../tests/org.eclipse.emf.eef.tests.nonreg.editor</module>
- <module>../../tests/org.eclipse.emf.eef.tests.nonreg.junit</module>
-
- </modules>
-
-</project>
diff --git a/releng/org.eclipse.emf.eef.update/category.xml b/releng/org.eclipse.emf.eef.update/category.xml
index c10234012..e54fc9c59 100644
--- a/releng/org.eclipse.emf.eef.update/category.xml
+++ b/releng/org.eclipse.emf.eef.update/category.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2008, 2010 Obeo.
- 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:
- Obeo - initial API and implementation
- -->
+<!--
+ Copyright (c) 2008, 2010 Obeo.
+ 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:
+ Obeo - initial API and implementation
+ -->
<site>
<description>
To install these features, point Eclipse at this site.
@@ -27,19 +27,19 @@
</feature>
<feature id="org.eclipse.emf.eef.extended-feature" version="0.0.0">
<category name="eef.extension"/>
- </feature>
+ </feature>
<feature id="org.eclipse.emf.eef.collab.runtime-feature" version="0.0.0">
<category name="eef.extension"/>
</feature>
<category-def name="eef.sdk" label="EEF SDK">
<description>
- EEF SDK package. It contains runtime, metamodels, generators,
+ EEF SDK package. It contains runtime, metamodels, generators,
documentation and extended capabilities (with source).
</description>
</category-def>
<category-def name="eef.features" label="EEF Common">
<description>
- Contains all necessary features for EEF : EEF runtime, EEF metamodels, EEF
+ Contains all necessary features for EEF : EEF runtime, EEF metamodels, EEF
generators and EEF documentation.
</description>
</category-def>
@@ -48,11 +48,6 @@
EEF integration for specific cases, like UML2.
</description>
</category-def>
- <category-def name="eef.tests" label="EEF Tests Utilities">
- <description>
- Several utilities for testing EEF forms.
- </description>
- </category-def>
<category-def name="eef.extension" label="EEF Extension">
<description>
EEF Extensions.

Back to the top