Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Grunberg2013-09-11 17:06:19 +0000
committerJeff Johnston2013-09-11 19:33:49 +0000
commit253f995d046cc234521a3e88dba8d4ad836aa5a5 (patch)
tree52c368d2fc76c228fa416735c34d920f62eaae35
parentd584e9e72219b580bf5dd4c1bbe40575d29a56c4 (diff)
downloadorg.eclipse.linuxtools-253f995d046cc234521a3e88dba8d4ad836aa5a5.tar.gz
org.eclipse.linuxtools-253f995d046cc234521a3e88dba8d4ad836aa5a5.tar.xz
org.eclipse.linuxtools-253f995d046cc234521a3e88dba8d4ad836aa5a5.zip
Fix releng build issues.
- Restore saving of latest generated p2 repository to update-nightly. - Re-implement Pack200 using new CBI plugins. - Change target_save/repository to target/repository in ant task. Change-Id: I5c2c74c1329d39f5e13b6991e20c1de235ba4fd4 Reviewed-on: https://git.eclipse.org/r/16341 Reviewed-by: Jeff Johnston <jjohnstn@redhat.com> IP-Clean: Jeff Johnston <jjohnstn@redhat.com> Tested-by: Jeff Johnston <jjohnstn@redhat.com>
-rw-r--r--pom.xml54
-rw-r--r--releng/org.eclipse.linuxtools.releng-site/pom.xml38
2 files changed, 92 insertions, 0 deletions
diff --git a/pom.xml b/pom.xml
index 440ec5ec37..2a8d487750 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,6 +148,29 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <resolver>p2</resolver>
+ <includePackedArtifacts>true</includePackedArtifacts>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200a-plugin</artifactId>
+ <version>${tycho-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>
@@ -161,6 +184,37 @@
</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>
+ <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>verify</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <defaultP2Metadata>false</defaultP2Metadata>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
diff --git a/releng/org.eclipse.linuxtools.releng-site/pom.xml b/releng/org.eclipse.linuxtools.releng-site/pom.xml
index d5ceadcbea..838b341395 100644
--- a/releng/org.eclipse.linuxtools.releng-site/pom.xml
+++ b/releng/org.eclipse.linuxtools.releng-site/pom.xml
@@ -25,6 +25,44 @@
<artifactId>org.eclipse.linuxtools.releng-site</artifactId>
<packaging>eclipse-repository</packaging>
+ <profiles>
+ <profile>
+ <id>build-server</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy</id>
+ <phase>install</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <delete includeemptydirs="false">
+ <fileset
+ dir="/home/data/httpd/download.eclipse.org/linuxtools/updates-nightly-kepler">
+ <include name="**" />
+ </fileset>
+ </delete>
+ <copy includeemptydirs="false"
+ todir="/home/data/httpd/download.eclipse.org/linuxtools/updates-nightly-kepler">
+ <fileset dir="target/repository">
+ <include name="**" />
+ </fileset>
+ </copy>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<plugin>

Back to the top