Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorJan Belle2017-08-31 10:47:34 -0400
committerJan Belle2017-08-31 10:47:34 -0400
commit2b3ac6e99310df76f704e7231748bcc236e708a6 (patch)
treeb0b917dc95d45b5f628fba7ed1dba3e293539bf8 /releng
parentf3b5f39f725e0993bd713ff863c75ddd50bda41c (diff)
downloadorg.eclipse.etrice-2b3ac6e99310df76f704e7231748bcc236e708a6.tar.gz
org.eclipse.etrice-2b3ac6e99310df76f704e7231748bcc236e708a6.tar.xz
org.eclipse.etrice-2b3ac6e99310df76f704e7231748bcc236e708a6.zip
Bug 521698 - Tycho build
maven tycho build for plugins, plugin tests, features, update site Change-Id: Ic16d1fee6913a4b31c69c2d865b62931a421abfe
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.etrice.parent/pom.xml425
-rw-r--r--releng/org.eclipse.etrice.site/category.xml7
-rw-r--r--releng/org.eclipse.etrice.site/pom.xml15
3 files changed, 126 insertions, 321 deletions
diff --git a/releng/org.eclipse.etrice.parent/pom.xml b/releng/org.eclipse.etrice.parent/pom.xml
index 8b1646af9..da916c785 100644
--- a/releng/org.eclipse.etrice.parent/pom.xml
+++ b/releng/org.eclipse.etrice.parent/pom.xml
@@ -3,196 +3,111 @@
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>
-
- <prerequisites>
- <maven>3.0</maven>
- </prerequisites>
-
<groupId>org.eclipse.etrice</groupId>
- <artifactId>java-generator</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <artifactId>org.eclipse.etrice.parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>eTrice Java generator</name>
-
- <description>code generator from ROOM (Real-Time Object Oriented Modeling)
- models to the Java target language</description>
- <url>http://eclipse.org/etrice</url>
- <inceptionYear>2010</inceptionYear>
-
+ <modules>
+ <!-- Plugins -->
+ <module>../../plugins/org.eclipse.etrice.abstractexec.behavior</module>
+ <module>../../plugins/org.eclipse.etrice.core.common</module>
+ <module>../../plugins/org.eclipse.etrice.core.common.ui</module>
+ <module>../../plugins/org.eclipse.etrice.core.config</module>
+ <module>../../plugins/org.eclipse.etrice.core.config.ui</module>
+ <module>../../plugins/org.eclipse.etrice.core.etmap</module>
+ <module>../../plugins/org.eclipse.etrice.core.etmap.ui</module>
+ <module>../../plugins/org.eclipse.etrice.core.etphys</module>
+ <module>../../plugins/org.eclipse.etrice.core.etphys.ui</module>
+ <module>../../plugins/org.eclipse.etrice.core.fsm</module>
+ <module>../../plugins/org.eclipse.etrice.core.fsm.ui</module>
+ <module>../../plugins/org.eclipse.etrice.core.genmodel</module>
+ <module>../../plugins/org.eclipse.etrice.core.genmodel.fsm</module>
+ <module>../../plugins/org.eclipse.etrice.core.room</module>
+ <module>../../plugins/org.eclipse.etrice.core.room.ui</module>
+ <module>../../plugins/org.eclipse.etrice.doc</module>
+ <module>../../plugins/org.eclipse.etrice.etunit.converter</module>
+ <module>../../plugins/org.eclipse.etrice.expressions.ui</module>
+ <module>../../plugins/org.eclipse.etrice.generator</module>
+ <module>../../plugins/org.eclipse.etrice.generator.c</module>
+ <module>../../plugins/org.eclipse.etrice.generator.config</module>
+ <module>../../plugins/org.eclipse.etrice.generator.cpp</module>
+ <module>../../plugins/org.eclipse.etrice.generator.doc</module>
+ <module>../../plugins/org.eclipse.etrice.generator.fsm</module>
+ <module>../../plugins/org.eclipse.etrice.generator.fsmtest</module>
+ <module>../../plugins/org.eclipse.etrice.generator.fsmtest.ui</module>
+ <module>../../plugins/org.eclipse.etrice.generator.gnuplot</module>
+ <module>../../plugins/org.eclipse.etrice.generator.java</module>
+ <module>../../plugins/org.eclipse.etrice.generator.launch</module>
+ <module>../../plugins/org.eclipse.etrice.generator.launch.c</module>
+ <module>../../plugins/org.eclipse.etrice.generator.launch.cpp</module>
+ <module>../../plugins/org.eclipse.etrice.generator.launch.java</module>
+ <module>../../plugins/org.eclipse.etrice.generator.ui</module>
+ <module>../../plugins/org.eclipse.etrice.generator.ui.cdt</module>
+ <module>../../plugins/org.eclipse.etrice.logging</module>
+ <module>../../plugins/org.eclipse.etrice.ui.behavior</module>
+ <module>../../plugins/org.eclipse.etrice.ui.behavior.actioneditor</module>
+ <module>../../plugins/org.eclipse.etrice.ui.behavior.fsm</module>
+ <module>../../plugins/org.eclipse.etrice.ui.commands</module>
+ <module>../../plugins/org.eclipse.etrice.ui.common</module>
+ <module>../../plugins/org.eclipse.etrice.ui.common.base</module>
+ <module>../../plugins/org.eclipse.etrice.ui.runtime</module>
+ <module>../../plugins/org.eclipse.etrice.ui.structure</module>
+
+ <!-- Tests -->
+ <module>../../tests/org.eclipse.etrice.abstractexec.behavior.tests</module>
+ <module>../../tests/org.eclipse.etrice.core.common.tests</module>
+ <module>../../tests/org.eclipse.etrice.core.config.tests</module>
+ <module>../../tests/org.eclipse.etrice.core.etmap.tests</module>
+ <module>../../tests/org.eclipse.etrice.core.etphys.tests</module>
+ <module>../../tests/org.eclipse.etrice.core.fsm.tests</module>
+ <module>../../tests/org.eclipse.etrice.core.genmodel.tests</module>
+ <module>../../tests/org.eclipse.etrice.core.room.tests</module>
+ <module>../../tests/org.eclipse.etrice.etunit.converter.tests</module>
+ <module>../../tests/org.eclipse.etrice.generator.fsmtest.tests</module>
+ <module>../../tests/org.eclipse.etrice.generator.tests</module>
+ <module>../../tests/org.eclipse.etrice.ui.base.tests</module>
+ <module>../../tests/org.eclipse.etrice.ui.behavior.tests</module>
+ <module>../../tests/org.eclipse.etrice.ui.structure.tests</module>
+
+ <!-- Features -->
+ <module>../../features/org.eclipse.etrice.cdt-integration.feature</module>
+ <module>../../features/org.eclipse.etrice.feature</module>
+ <module>../../features/org.eclipse.etrice.fsm.feature</module>
+ <module>../../features/org.eclipse.etrice.tests.feature</module>
+
+ <!-- Repositories -->
+ <module>../../releng/org.eclipse.etrice.site</module>
+
+ </modules>
+
<properties>
- <project.build.sourceEncoding>Cp1252</project.build.sourceEncoding>
-
- <etrice.version>${project.version}</etrice.version>
-
- <tycho.version>0.19.0</tycho.version>
- <tycho-extras.version>${tycho.version}</tycho-extras.version>
-
- <!-- eclipse version etrice is built against -->
- <eclipse-repo.url>http://download.eclipse.org/releases/luna</eclipse-repo.url>
-
- <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository</orbit-site>
+ <xtext.version>2.10.0</xtext.version>
+ <tycho.version>1.0.0</tycho.version>
+
+ <eclipse.url>http://download.eclipse.org/releases/oxygen</eclipse.url>
+ <license.url>http://download.eclipse.org/cbi/updates/license</license.url>
+ <orbit.url>http://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository</orbit.url>
</properties>
-
- <organization>
- <name>Protos Software GmbH</name>
- <url>http://www.protos.de</url>
- </organization>
-
- <licenses>
- <license>
- <name>Eclipse Public License - v 1.0</name>
- <url>http://www.eclipse.org/legal/epl-v10.html</url>
- </license>
- </licenses>
-
- <issueManagement>
- <system>Bugzilla</system>
- <url>https://bugs.eclipse.org/bugs/enter_bug.cgi?product=eTrice</url>
- </issueManagement>
- <ciManagement>
- <system>Hudson</system>
- <url>https://hudson.eclipse.org/etrice/job/etrice-maven3/</url>
- </ciManagement>
-
- <scm>
- <url>http://git.eclipse.org/c/etrice/org.eclipse.etrice.git/</url>
- <connection>http://git.eclipse.org/gitroot/etrice/org.eclipse.etrice.git</connection>
- <developerConnection>ssh://userid@git.eclipse.org/gitroot/etrice/org.eclipse.etrice.git</developerConnection>
- </scm>
-
- <developers>
- <developer>
- <name>Thomas Schuetz</name>
- </developer>
- <developer>
- <name>Henrik Rentz-Reichert</name>
- </developer>
- <developer>
- <name>Thomas Jung</name>
- </developer>
- <developer>
- <name>Juergen Haug</name>
- </developer>
- <developer>
- <name>Eyrak Paen</name>
- </developer>
- <developer>
- <name>Peter Karlitschek</name>
- </developer>
- </developers>
-
<repositories>
<repository>
<id>eclipse</id>
+ <url>${eclipse.url}</url>
<layout>p2</layout>
- <url>${eclipse-repo.url}</url>
</repository>
<repository>
- <id>orbit</id>
+ <id>license</id>
+ <url>${license.url}</url>
<layout>p2</layout>
- <url>${orbit-site}</url>
</repository>
<repository>
- <id>repository.jboss.org-public</id>
- <name>JBoss.org Maven repository</name>
- <url>https://repository.jboss.org/nexus/content/groups/public</url>
+ <id>orbit</id>
+ <url>${orbit.url}</url>
+ <layout>p2</layout>
</repository>
</repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>repo.eclipse.org.cbi-releases</id>
- <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
- </pluginRepository>
- </pluginRepositories>
-
- <modules>
- <module>../../plugins/org.eclipse.etrice.core.common</module>
- <module>../../plugins/org.eclipse.etrice.core.fsm</module>
- <module>../../plugins/org.eclipse.etrice.core.room</module>
- <module>../../plugins/org.eclipse.etrice.core.config</module>
- <module>../../plugins/org.eclipse.etrice.core.etphys</module>
- <module>../../plugins/org.eclipse.etrice.core.etmap</module>
- <module>../../plugins/org.eclipse.etrice.core.genmodel.fsm</module>
- <module>../../plugins/org.eclipse.etrice.core.genmodel</module>
- <module>../../plugins/org.eclipse.etrice.generator.fsm</module>
- <module>../../plugins/org.eclipse.etrice.generator</module>
- <module>../../plugins/org.eclipse.etrice.generator.config</module>
- <module>../../plugins/org.eclipse.etrice.generator.doc</module>
- <module>../../plugins/org.eclipse.etrice.generator.java</module>
- <module>../../plugins/org.eclipse.etrice.generator.java.mvn</module>
- <module>../../runtime/org.eclipse.etrice.modellib.java</module>
- <module>../../runtime/org.eclipse.etrice.runtime.java</module>
- </modules>
-
- <profiles>
- <profile>
- <id>fast</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
- <profile>
- <id>full</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
- <configuration>
- <tags>
- <tag>
- <name>generated</name>
- <placement>a</placement>
- <head>Generated:</head>
- </tag>
- <tag>
- <name>ordered</name>
- <placement>X</placement>
- <head>Ordered:</head>
- </tag>
- <tag>
- <name>model</name>
- <placement>X</placement>
- <head>Model:</head>
- </tag>
- <tag>
- <name>parameter</name>
- <placement>X</placement>
- <head>Parameter:</head>
- </tag>
- </tags>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
+
<build>
<plugins>
<plugin>
@@ -201,148 +116,26 @@
<version>${tycho.version}</version>
<extensions>true</extensions>
</plugin>
+ <!-- plugin>
+ <groupId>org.eclipse.xtend</groupId>
+ <artifactId>xtend-maven-plugin</artifactId>
+ <version>${xtext.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ <goal>xtend-install-debug-info</goal>
+ </goals>
+ <configuration>
+ <xtendAsPrimaryDebugSource>true</xtendAsPrimaryDebugSource>
+ <writeTraceFiles>true</writeTraceFiles>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <outputDirectory>xtend-gen</outputDirectory>
+ </configuration>
+ </plugin -->
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho.version}</version>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-compiler-plugin</artifactId>
- <version>${tycho.version}</version>
- <configuration>
- <excludeResources>
- <!-- avoid error markers in the target folder by excluding ecore models -->
- <excludeResource>**/*.ecore</excludeResource>
- </excludeResources>
- <compilerArguments>
- <enableJavadoc />
- <encoding>ISO-8859-1</encoding>
- </compilerArguments>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-buildtimestamp-jgit</artifactId>
- <version>${tycho-extras.version}</version>
- </dependency>
- </dependencies>
- <configuration>
- <strictBinIncludes>false</strictBinIncludes>
- <format>'v'yyyyMMdd-HHmm</format>
- <timestampProvider>jgit</timestampProvider>
- <jgit.ignore>
- </jgit.ignore>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-director-plugin</artifactId>
- <version>${tycho.version}</version>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-repository-plugin</artifactId>
- <version>${tycho.version}</version>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-plugin</artifactId>
- <version>${tycho.version}</version>
- <configuration>
- <baselineMode>warn</baselineMode>
- <baselineReplace>none</baselineReplace>
- <baselineRepositories>
- <repository>
- <url>http://download.eclipse.org/eclipse/updates/4.2</url>
- </repository>
- </baselineRepositories>
- </configuration>
- </plugin>
- <!--This plugin's configuration is used to store Eclipse m2e settings
- only. It has no influence on the Maven build itself. -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.eclipse.tycho
- </groupId>
- <artifactId>
- tycho-packaging-plugin
- </artifactId>
- <versionRange>
- [0.19.0,)
- </versionRange>
- <goals>
- <goal>validate-id</goal>
- <goal>validate-version</goal>
- <goal>build-qualifier</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.eclipse.tycho
- </groupId>
- <artifactId>
- tycho-compiler-plugin
- </artifactId>
- <versionRange>
- [0.19.0,)
- </versionRange>
- <goals>
- <goal>compile</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <distributionManagement>
- <repository>
- <id>repo.eclipse.org</id>
- <name>eTrice Repository - Releases</name>
- <url>https://repo.eclipse.org/content/repositories/etrice-releases/</url>
- </repository>
- <snapshotRepository>
- <id>repo.eclipse.org</id>
- <name>eTrice Repository - Snapshots</name>
- <url>https://repo.eclipse.org/content/repositories/etrice-snapshots/</url>
- <uniqueVersion>true</uniqueVersion>
- </snapshotRepository>
- </distributionManagement>
+ </build>
</project>
diff --git a/releng/org.eclipse.etrice.site/category.xml b/releng/org.eclipse.etrice.site/category.xml
index 54ec264e2..b09fe076d 100644
--- a/releng/org.eclipse.etrice.site/category.xml
+++ b/releng/org.eclipse.etrice.site/category.xml
@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature id="org.eclipse.etrice.core" version="0.0.0">
+ <feature url="features/org.eclipse.etrice.feature_1.1.1.qualifier.jar" id="org.eclipse.etrice.feature" version="1.1.1.qualifier">
<category name="org.eclipse.etrice"/>
</feature>
- <feature id="org.eclipse.etrice.examples" version="0.0.0">
- <category name="org.eclipse.etrice"/>
- </feature>
- <feature id="org.eclipse.etrice.tests" version="0.0.0">
+ <feature url="features/org.eclipse.etrice.cdt-integration.feature_1.1.1.qualifier.jar" id="org.eclipse.etrice.cdt-integration.feature" version="1.1.1.qualifier">
<category name="org.eclipse.etrice"/>
</feature>
<category-def name="org.eclipse.etrice" label="eTrice">
diff --git a/releng/org.eclipse.etrice.site/pom.xml b/releng/org.eclipse.etrice.site/pom.xml
new file mode 100644
index 000000000..77bcbfd22
--- /dev/null
+++ b/releng/org.eclipse.etrice.site/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <groupId>org.eclipse.etrice</groupId>
+ <artifactId>org.eclipse.etrice.parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.etrice.parent/pom.xml</relativePath>
+ </parent>
+ <groupId>org.eclipse.etrice</groupId>
+ <artifactId>org.eclipse.etrice.site</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-repository</packaging>
+</project>

Back to the top