Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorMarkus Knauer2012-11-06 11:14:52 -0500
committerMarkus Knauer2012-11-06 11:14:52 -0500
commitb0b1cdaba8238f8992d9557b236cce46388db6f7 (patch)
treefa71f2e81b9ea7871c0bf9e3ca6343de1058fbcf /releng
parent277a5a5103e0679d24c37b57da0679e22eb03674 (diff)
downloadorg.eclipse.rap-b0b1cdaba8238f8992d9557b236cce46388db6f7.tar.gz
org.eclipse.rap-b0b1cdaba8238f8992d9557b236cce46388db6f7.tar.xz
org.eclipse.rap-b0b1cdaba8238f8992d9557b236cce46388db6f7.zip
Extend Tycho build and re-add local eclipse.org signing capabilities.
- Change signing to new CBI-based signing per bundle. - Add Eclipse source reference header generation.
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.rap.releng/pom.xml108
-rwxr-xr-xreleng/org.eclipse.rap.releng/scripts/runtime-build.sh6
2 files changed, 102 insertions, 12 deletions
diff --git a/releng/org.eclipse.rap.releng/pom.xml b/releng/org.eclipse.rap.releng/pom.xml
index 894403ed65..3933c3f8b2 100644
--- a/releng/org.eclipse.rap.releng/pom.xml
+++ b/releng/org.eclipse.rap.releng/pom.xml
@@ -24,12 +24,13 @@
<properties>
<tycho-version>0.16.0</tycho-version>
<tycho-extras-version>${tycho-version}</tycho-extras-version>
- <signing-plugin-version>1.0.5</signing-plugin-version>
+ <signing-plugin-version>1.0.1</signing-plugin-version>
<surefire-version>2.9</surefire-version>
<junit-version>3.8.2</junit-version>
<mockito-version>1.8.4</mockito-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<baseline-repository>http://download.eclipse.org/rt/rap/nightly/runtime/</baseline-repository>
+ <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/rap/org.eclipse.rap.git</tycho.scmUrl>
</properties>
<prerequisites>
@@ -117,6 +118,11 @@
<artifactId>tycho-buildtimestamp-jgit</artifactId>
<version>${tycho-extras-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-sourceref-jgit</artifactId>
+ <version>${tycho-extras-version}</version>
+ </dependency>
</dependencies>
<configuration>
<timestampProvider>jgit</timestampProvider>
@@ -124,6 +130,9 @@
pom.xml
</jgit.ignore>
<format>yyyyMMdd-HHmm</format>
+ <sourceReferences>
+ <generate>true</generate>
+ </sourceReferences>
</configuration>
</plugin>
@@ -155,15 +164,6 @@
</plugin>
<plugin>
- <groupId>org.eclipse.dash.maven</groupId>
- <artifactId>eclipse-signing-maven-plugin</artifactId>
- <version>${signing-plugin-version}</version>
- <configuration>
- <signerInputDirectory>/home/data/httpd/download-staging.priv/rt/rap</signerInputDirectory>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire-version}</version>
@@ -188,6 +188,94 @@
</plugins>
</build>
+ <profiles>
+
+ <profile>
+ <id>eclipse-sign</id>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>m2e-cbi</id>
+ <url>http://download.eclipse.org/technology/m2e/maven/</url>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <includePackedArtifacts>true</includePackedArtifacts>
+ </configuration>
+ </plugin>
+
+ <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>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-jarsigner-plugin</artifactId>
+ <version>${signing-plugin-version}</version>
+ <executions>
+ <execution>
+ <id>sign</id>
+ <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>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <executions>
+ <execution>
+ <id>p2-metadata</id>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <defaultP2Metadata>false</defaultP2Metadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
diff --git a/releng/org.eclipse.rap.releng/scripts/runtime-build.sh b/releng/org.eclipse.rap.releng/scripts/runtime-build.sh
index d32cf8da1a..204723b8ce 100755
--- a/releng/org.eclipse.rap.releng/scripts/runtime-build.sh
+++ b/releng/org.eclipse.rap.releng/scripts/runtime-build.sh
@@ -9,8 +9,10 @@ SCRIPTS_DIR=$(dirname $(readlink -nm $0))
if [ "${BUILD_TYPE:0:1}" == "S" ]; then
sign=true
+ SIGNPROFILE="-Peclipse-sign"
else
sign=false
+ SIGNPROFILE=""
fi
######################################################################
@@ -23,8 +25,8 @@ rm -rf "$WORKSPACE"/runtimeRepo "$WORKSPACE"/*.zip
# Build RAP Runtime
cd "$WORKSPACE/org.eclipse.rap/releng/org.eclipse.rap.releng"
-echo "Running maven on $PWD, sign=$sign"
-$MVN -e clean package -Dsign=$sign
+echo "Running maven on $PWD, $SIGNPROFILE"
+$MVN -e clean package $SIGNPROFILE
exitcode=$?
if [ "$exitcode" != "0" ]; then
echo "Maven exited with error code " + $exitcode

Back to the top