Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorStéphane Bégaudeau2016-05-06 09:57:04 +0000
committerStéphane Bégaudeau2016-05-06 10:09:35 +0000
commitb555d766e44b72f7cd574e90f524b29369c70a88 (patch)
treee84963b21a79b3b0d336e9222181bac24cebb0c9 /releng
parent8988e553d6a7c70a54d0a0e8d003d5311c55e1d7 (diff)
downloadorg.eclipse.eef-b555d766e44b72f7cd574e90f524b29369c70a88.tar.gz
org.eclipse.eef-b555d766e44b72f7cd574e90f524b29369c70a88.tar.xz
org.eclipse.eef-b555d766e44b72f7cd574e90f524b29369c70a88.zip
Fix various releng issues
1) Add build.html to the source bundles 2) Add missing license.html and epl-v10.html to the feature 3) Add support for Eclipse source references 4) Add support for signing and pack200 during the build 5) Add the Eclipse License bundle to the target platforms Change-Id: Ie8d31407ba6951718abec46d6bea8feb18699c8f Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.eef.releng/pom.xml89
-rw-r--r--releng/org.eclipse.eef.releng/targetplatforms/luna/luna.target7
-rw-r--r--releng/org.eclipse.eef.releng/targetplatforms/luna/luna.tpd20
-rw-r--r--releng/org.eclipse.eef.releng/targetplatforms/neon/neon.target7
-rw-r--r--releng/org.eclipse.eef.releng/targetplatforms/neon/neon.tpd20
5 files changed, 109 insertions, 34 deletions
diff --git a/releng/org.eclipse.eef.releng/pom.xml b/releng/org.eclipse.eef.releng/pom.xml
index 186ca383c..863dd067b 100644
--- a/releng/org.eclipse.eef.releng/pom.xml
+++ b/releng/org.eclipse.eef.releng/pom.xml
@@ -16,6 +16,7 @@
<tycho-extras-version>0.24.0</tycho-extras-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<platform-version-name>neon</platform-version-name>
+ <tycho.scmUrl>scm:git:http://git.eclipse.org/gitroot/eef/org.eclipse.eef.git</tycho.scmUrl>
</properties>
<build>
@@ -90,6 +91,23 @@
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-packaging-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <sourceReferences>
+ <generate>true</generate>
+ </sourceReferences>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-sourceref-jgit</artifactId>
+ <version>${tycho-extras-version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho-version}</version>
<extensions>true</extensions>
@@ -122,4 +140,75 @@
<module>../../releng/org.eclipse.eef.update</module>
</modules>
+
+ <profiles>
+ <profile>
+ <id>sign</id>
+ <activation>
+ <property>
+ <name>BUILD_SIGN</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200a-plugin</artifactId>
+ <version>${tycho-extras-version}</version>
+ <executions>
+ <execution>
+ <id>pack200-normalize</id>
+ <goals>
+ <goal>normalize</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-jarsigner-plugin</artifactId>
+ <version>1.0.4</version>
+ <executions>
+ <execution>
+ <id>sign</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200b-plugin</artifactId>
+ <version>${tycho-extras-version}</version>
+ <executions>
+ <execution>
+ <id>pack200-pack</id>
+ <goals>
+ <goal>pack</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>cbi</id>
+ <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
</project>
diff --git a/releng/org.eclipse.eef.releng/targetplatforms/luna/luna.target b/releng/org.eclipse.eef.releng/targetplatforms/luna/luna.target
index eedb6ff1d..291c42909 100644
--- a/releng/org.eclipse.eef.releng/targetplatforms/luna/luna.target
+++ b/releng/org.eclipse.eef.releng/targetplatforms/luna/luna.target
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Eclipse Luna" sequenceNumber="1461317699">
+<target name="Eclipse Luna" sequenceNumber="1462529333">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.acceleo.query.source.feature.group" version="0.0.0"/>
<unit id="org.antlr.runtime" version="4.3.0.v201502022030"/>
<repository id="Acceleo-Nightly" location="http://download.eclipse.org/acceleo/updates/nightly/latest"/>
</location>
@@ -20,6 +21,10 @@
<repository id="Eclipse-Luna" location="http://download.eclipse.org/releases/luna"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
+ <repository id="Eclipse-Shared-License" location="http://download.eclipse.org/cbi/updates/license"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.sirius.incubation.interpreter.feature.group" version="0.0.0"/>
<repository id="Sirius-Incubation" location="http://download.eclipse.org/sirius/updates/nightly/latest/mars/incubation"/>
</location>
diff --git a/releng/org.eclipse.eef.releng/targetplatforms/luna/luna.tpd b/releng/org.eclipse.eef.releng/targetplatforms/luna/luna.tpd
index c466bb010..829bcdedd 100644
--- a/releng/org.eclipse.eef.releng/targetplatforms/luna/luna.tpd
+++ b/releng/org.eclipse.eef.releng/targetplatforms/luna/luna.tpd
@@ -15,22 +15,10 @@ location Eclipse-Luna "http://download.eclipse.org/releases/luna" {
org.eclipse.emf.transaction.feature.group lazy
}
-/*location Sirius-Core "http://download.eclipse.org/sirius/updates/nightly/latest/neon" {
- org.eclipse.sirius.doc.feature.feature.group lazy
- org.eclipse.sirius.runtime.acceleo.feature.group lazy
- org.eclipse.sirius.runtime.feature.group lazy
- org.eclipse.sirius.runtime.ide.eef.feature.group lazy
- org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group lazy
- org.eclipse.sirius.runtime.ide.ui.feature.group lazy
- org.eclipse.sirius.runtime.ide.xtext.feature.group lazy
- org.eclipse.sirius.runtime.ocl.feature.group lazy
- org.eclipse.sirius.runtime.aql.feature.group lazy
- org.eclipse.sirius.samples.feature.group lazy
- org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group lazy
- org.eclipse.sirius.specifier.ide.ui.aql.feature.group lazy
- org.eclipse.sirius.specifier.ide.ui.feature.group lazy
- org.eclipse.sirius.tests.support.feature.group lazy
-}*/
+
+location Eclipse-Shared-License "http://download.eclipse.org/cbi/updates/license" {
+ org.eclipse.license.feature.group lazy
+}
location Sirius-Incubation "http://download.eclipse.org/sirius/updates/nightly/latest/mars/incubation" {
org.eclipse.sirius.incubation.interpreter.feature.group lazy
diff --git a/releng/org.eclipse.eef.releng/targetplatforms/neon/neon.target b/releng/org.eclipse.eef.releng/targetplatforms/neon/neon.target
index 56c156348..286acfa7d 100644
--- a/releng/org.eclipse.eef.releng/targetplatforms/neon/neon.target
+++ b/releng/org.eclipse.eef.releng/targetplatforms/neon/neon.target
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Eclipse Neon" sequenceNumber="1461317692">
+<target name="Eclipse Neon" sequenceNumber="1462529321">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.acceleo.query.source.feature.group" version="0.0.0"/>
<unit id="org.antlr.runtime" version="4.3.0.v201502022030"/>
<repository id="Acceleo-Nightly" location="http://download.eclipse.org/acceleo/updates/nightly/latest"/>
</location>
@@ -20,6 +21,10 @@
<repository id="Eclipse-Neon" location="http://download.eclipse.org/releases/neon"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
+ <repository id="Eclipse-Shared-License" location="http://download.eclipse.org/cbi/updates/license"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.sirius.incubation.interpreter.feature.group" version="0.0.0"/>
<repository id="Sirius-Incubation" location="http://download.eclipse.org/sirius/updates/nightly/latest/neon/incubation"/>
</location>
diff --git a/releng/org.eclipse.eef.releng/targetplatforms/neon/neon.tpd b/releng/org.eclipse.eef.releng/targetplatforms/neon/neon.tpd
index b896bf77c..6cd90863a 100644
--- a/releng/org.eclipse.eef.releng/targetplatforms/neon/neon.tpd
+++ b/releng/org.eclipse.eef.releng/targetplatforms/neon/neon.tpd
@@ -15,22 +15,10 @@ location Eclipse-Neon "http://download.eclipse.org/releases/neon" {
org.eclipse.emf.transaction.feature.group lazy
}
-/*location Sirius-Core "http://download.eclipse.org/sirius/updates/nightly/latest/neon" {
- org.eclipse.sirius.doc.feature.feature.group lazy
- org.eclipse.sirius.runtime.acceleo.feature.group lazy
- org.eclipse.sirius.runtime.feature.group lazy
- org.eclipse.sirius.runtime.ide.eef.feature.group lazy
- org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group lazy
- org.eclipse.sirius.runtime.ide.ui.feature.group lazy
- org.eclipse.sirius.runtime.ide.xtext.feature.group lazy
- org.eclipse.sirius.runtime.ocl.feature.group lazy
- org.eclipse.sirius.runtime.aql.feature.group lazy
- org.eclipse.sirius.samples.feature.group lazy
- org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group lazy
- org.eclipse.sirius.specifier.ide.ui.aql.feature.group lazy
- org.eclipse.sirius.specifier.ide.ui.feature.group lazy
- org.eclipse.sirius.tests.support.feature.group lazy
-}*/
+
+location Eclipse-Shared-License "http://download.eclipse.org/cbi/updates/license" {
+ org.eclipse.license.feature.group lazy
+}
location Sirius-Incubation "http://download.eclipse.org/sirius/updates/nightly/latest/neon/incubation" {
org.eclipse.sirius.incubation.interpreter.feature.group lazy

Back to the top