Skip to content

Commit

Permalink
add required software update sites to our composite site
Browse files Browse the repository at this point in the history
  • Loading branch information
@LorenzoBettini
LorenzoBettini committed Jan 10, 2018
1 parent 6ca2668 commit 7547c49
Show file tree
Hide file tree
Showing 2 changed files with 119 additions and 26 deletions.
71 changes: 59 additions & 12 deletions edelta.parent/edelta.product.repository/pom.xml
View file
Expand Up @@ -149,18 +149,6 @@
<artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<applicationsArgs>
<args>-application</args>
<args>org.eclipse.ant.core.antRunner</args>
<args>-buildfile</args>
<args>${ant-files-path}/packaging-p2composite.ant</args>
<args>p2.composite.add</args>
<args>-Dsite.label="${site.label}"</args>
<args>-Dcomposite.base.dir=${project.build.directory}</args>
<args>-DunqualifiedVersion=${unqualifiedVersion}</args>
<args>-DbuildQualifier=${buildQualifier}</args>
<args>-Dchild.repository.path.prefix="${child.repository.path.prefix}"</args>
</applicationsArgs>
<repositories>
<repository>
<id>mars</id>
Expand Down Expand Up @@ -196,12 +184,71 @@
</dependencies>
</configuration>
<executions>
<!-- First add composite of required software update sites...
(if already present they won't be added again) -->
<execution>
<id>add-xtext-repository</id>
<phase>package</phase>
<goals>
<goal>eclipse-run</goal>
</goals>
<configuration>
<applicationsArgs>
<args>-application</args>
<args>org.eclipse.ant.core.antRunner</args>
<args>-buildfile</args>
<args>${ant-files-path}/packaging-p2composite.ant</args>
<args>p2.composite.add.external</args>
<args>-Dsite.label="${site.label}"</args>
<args>-Dcomposite.base.dir=${project.build.directory}</args>
<args>-DunqualifiedVersion=${unqualifiedVersion}</args>
<args>-DbuildQualifier=${buildQualifier}</args>
<args>-Dchild.repo="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/${xtextVersion}/"</args>
</applicationsArgs>
</configuration>
</execution>
<execution>
<id>add-eclipse-repository</id>
<phase>package</phase>
<goals>
<goal>eclipse-run</goal>
</goals>
<configuration>
<applicationsArgs>
<args>-application</args>
<args>org.eclipse.ant.core.antRunner</args>
<args>-buildfile</args>
<args>${ant-files-path}/packaging-p2composite.ant</args>
<args>p2.composite.add.external</args>
<args>-Dsite.label="${site.label}"</args>
<args>-Dcomposite.base.dir=${project.build.directory}</args>
<args>-DunqualifiedVersion=${unqualifiedVersion}</args>
<args>-DbuildQualifier=${buildQualifier}</args>
<args>-Dchild.repo="http://download.eclipse.org/releases/${eclipseVersion}/"</args>
</applicationsArgs>
</configuration>
</execution>
<!-- ... then add our new child repository -->
<execution>
<id>add-p2-composite-repository</id>
<phase>package</phase>
<goals>
<goal>eclipse-run</goal>
</goals>
<configuration>
<applicationsArgs>
<args>-application</args>
<args>org.eclipse.ant.core.antRunner</args>
<args>-buildfile</args>
<args>${ant-files-path}/packaging-p2composite.ant</args>
<args>p2.composite.add</args>
<args>-Dsite.label="${site.label}"</args>
<args>-Dcomposite.base.dir=${project.build.directory}</args>
<args>-DunqualifiedVersion=${unqualifiedVersion}</args>
<args>-DbuildQualifier=${buildQualifier}</args>
<args>-Dchild.repository.path.prefix="${child.repository.path.prefix}"</args>
</applicationsArgs>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
74 changes: 60 additions & 14 deletions edelta.parent/edelta.repository/pom.xml
View file
Expand Up @@ -84,10 +84,9 @@
<goal>run</goal>
</goals>
</execution>

<execution>
<!-- Deploy p2 repository, p2 composite updated metadata
and zipped p2 repository -->
but no zipped p2 repository -->
<id>deploy-repository</id>
<phase>verify</phase>
<configuration>
Expand All @@ -109,18 +108,6 @@
<artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<applicationsArgs>
<args>-application</args>
<args>org.eclipse.ant.core.antRunner</args>
<args>-buildfile</args>
<args>${ant-files-path}/packaging-p2composite.ant</args>
<args>p2.composite.add</args>
<args>-Dsite.label="${site.label}"</args>
<args>-Dcomposite.base.dir=${project.build.directory}</args>
<args>-DunqualifiedVersion=${unqualifiedVersion}</args>
<args>-DbuildQualifier=${buildQualifier}</args>
<args>-Dchild.repository.path.prefix="${child.repository.path.prefix}"</args>
</applicationsArgs>
<repositories>
<repository>
<id>mars</id>
Expand Down Expand Up @@ -156,12 +143,71 @@
</dependencies>
</configuration>
<executions>
<!-- First add composite of required software update sites...
(if already present they won't be added again) -->
<execution>
<id>add-xtext-repository</id>
<phase>package</phase>
<goals>
<goal>eclipse-run</goal>
</goals>
<configuration>
<applicationsArgs>
<args>-application</args>
<args>org.eclipse.ant.core.antRunner</args>
<args>-buildfile</args>
<args>${ant-files-path}/packaging-p2composite.ant</args>
<args>p2.composite.add.external</args>
<args>-Dsite.label="${site.label}"</args>
<args>-Dcomposite.base.dir=${project.build.directory}</args>
<args>-DunqualifiedVersion=${unqualifiedVersion}</args>
<args>-DbuildQualifier=${buildQualifier}</args>
<args>-Dchild.repo="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/${xtextVersion}/"</args>
</applicationsArgs>
</configuration>
</execution>
<execution>
<id>add-eclipse-repository</id>
<phase>package</phase>
<goals>
<goal>eclipse-run</goal>
</goals>
<configuration>
<applicationsArgs>
<args>-application</args>
<args>org.eclipse.ant.core.antRunner</args>
<args>-buildfile</args>
<args>${ant-files-path}/packaging-p2composite.ant</args>
<args>p2.composite.add.external</args>
<args>-Dsite.label="${site.label}"</args>
<args>-Dcomposite.base.dir=${project.build.directory}</args>
<args>-DunqualifiedVersion=${unqualifiedVersion}</args>
<args>-DbuildQualifier=${buildQualifier}</args>
<args>-Dchild.repo="http://download.eclipse.org/releases/${eclipseVersion}/"</args>
</applicationsArgs>
</configuration>
</execution>
<!-- ... then add our new child repository -->
<execution>
<id>add-p2-composite-repository</id>
<phase>package</phase>
<goals>
<goal>eclipse-run</goal>
</goals>
<configuration>
<applicationsArgs>
<args>-application</args>
<args>org.eclipse.ant.core.antRunner</args>
<args>-buildfile</args>
<args>${ant-files-path}/packaging-p2composite.ant</args>
<args>p2.composite.add</args>
<args>-Dsite.label="${site.label}"</args>
<args>-Dcomposite.base.dir=${project.build.directory}</args>
<args>-DunqualifiedVersion=${unqualifiedVersion}</args>
<args>-DbuildQualifier=${buildQualifier}</args>
<args>-Dchild.repository.path.prefix="${child.repository.path.prefix}"</args>
</applicationsArgs>
</configuration>
</execution>
</executions>
</plugin>
Expand Down

0 comments on commit 7547c49

Please sign in to comment.