Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGoulwen Le Fur2014-08-07 16:13:03 +0000
committerGoulwen Le Fur2014-08-07 16:13:03 +0000
commit22dcbc2c3a554a7f3204b5dbaec17e89c2a04a7b (patch)
tree17d9b4102a73bc190fffadeaab1646b93441d29d
parent1d6bdb525e2b757fb876f0ddedb488eedd00f2de (diff)
downloadorg.eclipse.eef-v1_4_0_BRANCH.tar.gz
org.eclipse.eef-v1_4_0_BRANCH.tar.xz
org.eclipse.eef-v1_4_0_BRANCH.zip
ADDED: uml codegen plugin buildv1_4_0_BRANCH
UPDATED: build system for Acceleo generator (except for codegen ecore at this time)
-rw-r--r--features/org.eclipse.emf.eef.codegen.uml.feature/feature.xml10
-rw-r--r--plugins/org.eclipse.emf.eef.codegen.extended.widgets.richtext/pom.xml71
-rw-r--r--plugins/org.eclipse.emf.eef.codegen.extended/pom.xml74
-rw-r--r--plugins/org.eclipse.emf.eef.codegen.uml/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.emf.eef.codegen.uml/pom.xml74
-rw-r--r--plugins/org.eclipse.emf.eef.codegen/pom.xml70
-rw-r--r--releng/org.eclipse.emf.eef.releng.parent/pom.xml30
7 files changed, 244 insertions, 88 deletions
diff --git a/features/org.eclipse.emf.eef.codegen.uml.feature/feature.xml b/features/org.eclipse.emf.eef.codegen.uml.feature/feature.xml
index 17ceb43cf..99048a79f 100644
--- a/features/org.eclipse.emf.eef.codegen.uml.feature/feature.xml
+++ b/features/org.eclipse.emf.eef.codegen.uml.feature/feature.xml
@@ -40,16 +40,16 @@ http://www.eclipse.org/legal/epl-v10.html
</url>
<plugin
- id="org.eclipse.emf.eef.codegen.ecore"
+ id="org.eclipse.emf.eef.branding"
download-size="0"
install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
<plugin
- id="org.eclipse.emf.eef.branding"
+ id="org.eclipse.emf.eef.codegen.uml"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="0.0.0"
+ unpack="false"/>
</feature>
diff --git a/plugins/org.eclipse.emf.eef.codegen.extended.widgets.richtext/pom.xml b/plugins/org.eclipse.emf.eef.codegen.extended.widgets.richtext/pom.xml
index bdfd0c37a..9a32eebdb 100644
--- a/plugins/org.eclipse.emf.eef.codegen.extended.widgets.richtext/pom.xml
+++ b/plugins/org.eclipse.emf.eef.codegen.extended.widgets.richtext/pom.xml
@@ -27,30 +27,49 @@
<name>EEF RichText Codegen Plug-in</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.1.1</version>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>java</goal>
- </goals>
- <configuration>
- <mainClass>org.eclipse.emf.eef.codegen.extended.widgets.richtext.compiler.EEFRichTextCodegenCompiler</mainClass>
- <arguments>
- <argument>${basedir}/src/</argument>
- <argument>${basedir}/target/classes</argument>
- <argument>true</argument>
- <argument>${basedir}/../org.eclipse.emf.eef.codegen/target/classes;${basedir}/../org.eclipse.emf.eef.codegen.ecore/target/classes</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+<build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.acceleo</groupId>
+ <artifactId>org.eclipse.acceleo.maven</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>acceleo-compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <useBinaryResources>false</useBinaryResources>
+ <usePlatformResourcePath>true</usePlatformResourcePath>
+ <acceleoProject>
+ <root>${project.basedir}</root>
+ <entries>
+ <entry>
+ <input>src</input>
+ <output>target/classes</output>
+ </entry>
+ </entries>
+ <jars>
+ <jar>org.eclipse.emf:org.eclipse.emf.eef.codegen</jar>
+ </jars>
+ </acceleoProject>
+ <packagesToRegister>
+ <packageToRegister>org.eclipse.emf.ecore.EcorePackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.components.ComponentsPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.mapping.MappingPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.views.ViewsPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.EEFGen.EEFGenPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.mapping.filters.FiltersPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.mapping.navigation.NavigationPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.extended.editor.EditorPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage</packageToRegister>
+ </packagesToRegister>
+ <uriHandler>org.eclipse.acceleo.maven.AcceleoURIHandler</uriHandler>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/plugins/org.eclipse.emf.eef.codegen.extended/pom.xml b/plugins/org.eclipse.emf.eef.codegen.extended/pom.xml
index ce8f060f1..5fba1f4b3 100644
--- a/plugins/org.eclipse.emf.eef.codegen.extended/pom.xml
+++ b/plugins/org.eclipse.emf.eef.codegen.extended/pom.xml
@@ -27,30 +27,50 @@
<name>EEF Extended Codegen Plug-in</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.1.1</version>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>java</goal>
- </goals>
- <configuration>
- <mainClass>org.eclipse.emf.eef.codegen.extended.EEFCodegenExtendedCompiler</mainClass>
- <arguments>
- <argument>${basedir}/src/</argument>
- <argument>${basedir}/target/classes</argument>
- <argument>true</argument>
- <argument>${basedir}/../org.eclipse.emf.eef.codegen/target/classes;${basedir}/../org.eclipse.emf.eef.codegen.ecore/target/classes</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
+<build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.acceleo</groupId>
+ <artifactId>org.eclipse.acceleo.maven</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>acceleo-compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <useBinaryResources>false</useBinaryResources>
+ <usePlatformResourcePath>true</usePlatformResourcePath>
+ <acceleoProject>
+ <root>${project.basedir}</root>
+ <entries>
+ <entry>
+ <input>src</input>
+ <output>target/classes</output>
+ </entry>
+ </entries>
+ <jars>
+ <jar>org.eclipse.emf:org.eclipse.emf.eef.codegen</jar>
+ <jar>org.eclipse.emf:org.eclipse.emf.eef.codegen.ecore</jar>
+ </jars>
+ </acceleoProject>
+ <packagesToRegister>
+ <packageToRegister>org.eclipse.emf.ecore.EcorePackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.components.ComponentsPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.mapping.MappingPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.views.ViewsPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.EEFGen.EEFGenPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.mapping.filters.FiltersPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.mapping.navigation.NavigationPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.extended.editor.EditorPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage</packageToRegister>
+ </packagesToRegister>
+ <uriHandler>org.eclipse.acceleo.maven.AcceleoURIHandler</uriHandler>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </project>
diff --git a/plugins/org.eclipse.emf.eef.codegen.uml/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.eef.codegen.uml/META-INF/MANIFEST.MF
index d295a913e..5bb56e0d9 100644
--- a/plugins/org.eclipse.emf.eef.codegen.uml/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.eef.codegen.uml/META-INF/MANIFEST.MF
@@ -2,10 +2,9 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: MTL Uml Module Runtime Plug-in
Bundle-SymbolicName: org.eclipse.emf.eef.codegen.uml;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.4.0.qualifier
Bundle-Vendor: Eclipse.org
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.uml2.uml,
org.eclipse.emf.ecore,
org.eclipse.emf.ecore.xmi,
org.eclipse.ocl,
diff --git a/plugins/org.eclipse.emf.eef.codegen.uml/pom.xml b/plugins/org.eclipse.emf.eef.codegen.uml/pom.xml
new file mode 100644
index 000000000..d7a592436
--- /dev/null
+++ b/plugins/org.eclipse.emf.eef.codegen.uml/pom.xml
@@ -0,0 +1,74 @@
+<?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>
+
+ <parent>
+ <groupId>org.eclipse.emf</groupId>
+ <artifactId>org.eclipse.emf.eef.releng.parent</artifactId>
+ <relativePath>../../releng/org.eclipse.emf.eef.releng.parent</relativePath>
+ <version>1.4.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.eclipse.emf</groupId>
+ <artifactId>org.eclipse.emf.eef.codegen.uml</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+
+ <name>EEF Codegen for UML Plug-in</name>
+
+<build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.acceleo</groupId>
+ <artifactId>org.eclipse.acceleo.maven</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>acceleo-compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <useBinaryResources>false</useBinaryResources>
+ <usePlatformResourcePath>true</usePlatformResourcePath>
+ <acceleoProject>
+ <root>${project.basedir}</root>
+ <entries>
+ <entry>
+ <input>src</input>
+ <output>target/classes</output>
+ </entry>
+ </entries>
+ <jars>
+ <jar>org.eclipse.emf:org.eclipse.emf.eef.codegen</jar>
+ </jars>
+ </acceleoProject>
+ <packagesToRegister>
+ <packageToRegister>org.eclipse.emf.ecore.EcorePackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.components.ComponentsPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.mapping.MappingPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.views.ViewsPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.EEFGen.EEFGenPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.mapping.filters.FiltersPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.mapping.navigation.NavigationPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage</packageToRegister>
+ </packagesToRegister>
+ <uriHandler>org.eclipse.acceleo.maven.AcceleoURIHandler</uriHandler>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </project>
diff --git a/plugins/org.eclipse.emf.eef.codegen/pom.xml b/plugins/org.eclipse.emf.eef.codegen/pom.xml
index f27eb0de0..f8342e29d 100644
--- a/plugins/org.eclipse.emf.eef.codegen/pom.xml
+++ b/plugins/org.eclipse.emf.eef.codegen/pom.xml
@@ -27,30 +27,48 @@
<name>EEF Codegen Plug-in</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.1.1</version>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>java</goal>
- </goals>
- <configuration>
- <mainClass>org.eclipse.emf.eef.codegen.EEFCodegenCompiler</mainClass>
- <arguments>
- <argument>${basedir}/src/</argument>
- <argument>${basedir}/target/classes</argument>
- <argument>true</argument>
- <argument>${basedir}/../org.eclipse.emf.eef.codegen.ecore/target/classes</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+<build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.acceleo</groupId>
+ <artifactId>org.eclipse.acceleo.maven</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>acceleo-compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <useBinaryResources>false</useBinaryResources>
+ <usePlatformResourcePath>true</usePlatformResourcePath>
+ <acceleoProject>
+ <root>${project.basedir}</root>
+ <entries>
+ <entry>
+ <input>src</input>
+ <output>target/classes</output>
+ </entry>
+ </entries>
+ <jars>
+ <jar>org.eclipse.emf:org.eclipse.emf.eef.codegen.ecore</jar>
+ </jars>
+ </acceleoProject>
+ <packagesToRegister>
+ <packageToRegister>org.eclipse.emf.ecore.EcorePackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.components.ComponentsPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.mapping.MappingPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.views.ViewsPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.EEFGen.EEFGenPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.mapping.filters.FiltersPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.eef.mapping.navigation.NavigationPackage</packageToRegister>
+ <packageToRegister>org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage</packageToRegister>
+ </packagesToRegister>
+ <uriHandler>org.eclipse.acceleo.maven.AcceleoURIHandler</uriHandler>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/releng/org.eclipse.emf.eef.releng.parent/pom.xml b/releng/org.eclipse.emf.eef.releng.parent/pom.xml
index 645eea605..fac07ccbf 100644
--- a/releng/org.eclipse.emf.eef.releng.parent/pom.xml
+++ b/releng/org.eclipse.emf.eef.releng.parent/pom.xml
@@ -39,6 +39,17 @@
<maven-resources-version>2.6</maven-resources-version>
<resource-encoding>UTF-8</resource-encoding>
</properties>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>Eclipse - Acceleo Snapshots</id>
+ <url>https://repo.eclipse.org/content/repositories/acceleo-snapshots</url>
+ </pluginRepository>
+ <pluginRepository>
+ <id>Eclipse - Acceleo Release</id>
+ <url>https://repo.eclipse.org/content/repositories/acceleo-releases</url>
+ </pluginRepository>
+ </pluginRepositories>
<profiles>
<profile>
@@ -243,9 +254,10 @@
<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.ecore</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.uml</module>
<module>../../plugins/org.eclipse.emf.eef.codegen.extended</module>
<module>../../plugins/org.eclipse.emf.eef.codegen.extended.widgets.richtext</module>
<!-- <module>../../plugins/org.eclipse.emf.eef.tests.codegen</module> -->
@@ -365,7 +377,21 @@
<encoding>${resource-encoding}</encoding>
</configuration>
</plugin>
- </plugins>
+ <plugin>
+ <groupId>org.eclipse.acceleo</groupId>
+ <artifactId>org.eclipse.acceleo.maven</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>acceleo-compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>acceleo-compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</pluginManagement>
</build>

Back to the top