Skip to content

Commit

Permalink
add p2.mirrorsURL to RAP repository as well
Browse files Browse the repository at this point in the history 
Change-Id: I6e7da27952a259adcb7bae00d0159f1e2b1df167
  • Loading branch information
@LorenzoBettini
LorenzoBettini committed Nov 21, 2016
1 parent 0f3c9b0 commit 0f0f9f9
Showing 1 changed file with 166 additions and 37 deletions.
203 changes: 166 additions & 37 deletions releng/org.eclipse.emf.parsley.rap.repository/pom.xml
View file
Expand Up @@ -13,6 +13,14 @@
<artifactId>org.eclipse.emf.parsley.rap.repository</artifactId>
<packaging>eclipse-repository</packaging>

<properties>
<p2.mirrorsPrefix>/emf-parsley/${parsley.rap.updates.dir}</p2.mirrorsPrefix>
<p2.versionMajorMinor>1.1</p2.versionMajorMinor>
<p2.statsURL>http://download.eclipse.org/stats</p2.statsURL>
<p2.mirrorsURL>http://www.eclipse.org/downloads/download.php?format=xml&amp;file=${p2.mirrorsPrefix}/${p2.versionMajorMinor}/${qualifiedVersion}/</p2.mirrorsURL>
<p2.statsTrackedArtifacts>org.eclipse.emf.parsley.rap.sdk,org.eclipse.emf.parsley.rap.cdo.sdk</p2.statsTrackedArtifacts>
</properties>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -81,49 +89,170 @@
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile ${project.basedir}/../org.eclipse.emf.parsley.parent/ant/packaging-p2composite.ant p2.composite.add -Dsoftware.download.area=${parsley.download.area} -Dupdates.dir=${parsley.rap.updates.dir} -Dsite.label="Emf Parsley Target Components" -Dproject.build.directory=${project.build.directory} -DunqualifiedVersion=${unqualifiedVersion} -DbuildQualifier=${buildQualifier}</appArgLine>
<repositories>
<repository>
<id>mars</id>
<layout>p2</layout>
<url>http://download.eclipse.org/releases/mars</url>
</repository>
</repositories>
<dependencies>
<dependency>
<artifactId>org.eclipse.ant.core</artifactId>
<type>eclipse-plugin</type>
</dependency>
<dependency>
<artifactId>org.apache.ant</artifactId>
<type>eclipse-plugin</type>
</dependency>
<dependency>
<artifactId>org.eclipse.equinox.p2.repository.tools</artifactId>
<type>eclipse-plugin</type>
</dependency>
<dependency>
<artifactId>org.eclipse.equinox.p2.core.feature</artifactId>
<type>eclipse-feature</type>
</dependency>
<dependency>
<artifactId>org.eclipse.equinox.p2.extras.feature</artifactId>
<type>eclipse-feature</type>
</dependency>
<dependency>
<artifactId>org.eclipse.equinox.ds</artifactId>
<type>eclipse-plugin</type>
</dependency>
</dependencies>
</configuration>
<executions>
<execution>
<id>add-p2-composite-repository</id>
<!--
(1)
See <http://wiki.eclipse.org/Equinox/p2/p2.mirrorsURL>.
This will add the mirror and statistics properties to your
artifacts.jar, but NOT to artifacts.xml.xz,
since p2 can only read artifacts.xml.zx but now write into it
(https://bugs.eclipse.org/bugs/show_bug.cgi?id=467779).
artifacts.xml.xz will be handled later (from (2) on). -->
<id>add-repo-properties</id>
<goals>
<goal>eclipse-run</goal>
</goals>
<phase>package</phase>
<configuration>
<applicationsArgs>
<arg>-application</arg>
<arg>org.eclipse.wtp.releng.tools.addRepoProperties</arg>
</applicationsArgs>
<jvmArgs>
<arg>-DartifactRepoDirectory=${project.build.directory}/repository</arg>
<arg>-Dp2MirrorsURL=${p2.mirrorsURL}</arg>
<arg>-Dp2StatsURI=${p2.statsURL}</arg>
<arg>-DstatsTrackedArtifacts=${p2.statsTrackedArtifacts}</arg>
<arg>-DstatsArtifactsSuffix=-${project.version}</arg>
</jvmArgs>
<work>${project.build.directory}/eclipserun-work-first</work>
<dependencies>
<dependency>
<artifactId>org.eclipse.wtp.releng.tools.feature</artifactId>
<type>eclipse-feature</type>
</dependency>
</dependencies>
<repositories>
<repository>
<url>http://download.eclipse.org/webtools/releng/repository</url>
<layout>p2</layout>
</repository>
<repository>
<url>http://download.eclipse.org/releases/neon</url>
<layout>p2</layout>
</repository>
</repositories>
</configuration>
</execution>
<execution>
<id>add-p2-composite-repository</id>
<goals>
<goal>eclipse-run</goal>
</goals>
<!-- this must be executed after package, since during package we also
deal with XZ compressed artifacts -->
<phase>verify</phase>
<configuration>
<applicationsArgs>
<arg>-application</arg>
<arg>org.eclipse.ant.core.antRunner</arg>
<arg>-buildfile</arg>
<arg>${project.basedir}/../org.eclipse.emf.parsley.parent/ant/packaging-p2composite.ant</arg>
<arg>p2.composite.add</arg>
<arg>-Dsoftware.download.area=${parsley.download.area}</arg>
<arg>-Dupdates.dir=${parsley.rap.updates.dir}</arg>
<arg>-Dsite.label="Emf Parsley Target Components"</arg>
<arg>-Dproject.build.directory=${project.build.directory}</arg>
<arg>-DunqualifiedVersion=${unqualifiedVersion}</arg>
<arg>-DbuildQualifier=${buildQualifier}</arg>
</applicationsArgs>
<repositories>
<repository>
<url>http://download.eclipse.org/releases/neon</url>
<layout>p2</layout>
</repository>
</repositories>
<dependencies>
<dependency>
<artifactId>org.eclipse.ant.core</artifactId>
<type>eclipse-plugin</type>
</dependency>
<dependency>
<artifactId>org.apache.ant</artifactId>
<type>eclipse-plugin</type>
</dependency>
<dependency>
<artifactId>org.eclipse.equinox.p2.repository.tools</artifactId>
<type>eclipse-plugin</type>
</dependency>
<dependency>
<artifactId>org.eclipse.equinox.p2.core.feature</artifactId>
<type>eclipse-feature</type>
</dependency>
<dependency>
<artifactId>org.eclipse.equinox.p2.extras.feature</artifactId>
<type>eclipse-feature</type>
</dependency>
<dependency>
<artifactId>org.eclipse.equinox.ds</artifactId>
<type>eclipse-plugin</type>
</dependency>
</dependencies>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<!-- copy the zipped p2 repository into download zips area -->
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven-antrun-plugin.version}</version>
<dependencies>
<!-- Needed for XZ compression -->
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-compress</artifactId>
<version>1.4</version>
</dependency>
</dependencies>
<executions>
<execution>
<!-- (2)
Unpack artifacts.jar (which has already been processed) -->
<id>unjar-artifacts</id>
<phase>package</phase>
<configuration>
<target>
<unzip src="${project.build.directory}/repository/artifacts.jar"
dest="${project.build.directory}/repository/" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<!-- (3)
pack artifacts.xml into artifacts.xml.xz (rewrite) -->
<id>xz-artifacts</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target name="xz-artifacts-xml">
<taskdef resource="org/apache/ant/compress/antlib.xml"
classpathref="maven.plugin.classpath" />
<xz
srcfile="${project.build.directory}/repository/artifacts.xml"
destfile="${project.build.directory}/repository/artifacts.xml.xz" />
</target>
</configuration>
</execution>
<execution>
<!-- (4)
Remove artifacts.xml (we don't need that anymore) -->
<id>remove-artifacts-xml</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<delete file="${project.build.directory}/repository/artifacts.xml"/>
</target>
</configuration>
</execution>
</executions>
</plugin>
Expand Down

0 comments on commit 0f0f9f9

Please sign in to comment.