summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnthony Dahanne2011-10-05 15:19:41 (EDT)
committerPascal Rapicault2011-11-21 23:24:40 (EST)
commitb8665f25c667146a6d1011d86cd23402a1f665e0 (patch)
tree6137cc2df99f120d2267a18a50ee124bb3b1adcb
parent71ea2a1c53d8758b5be8fe3e58f0bda552f0b292 (diff)
downloadrt.equinox.p2-b8665f25c667146a6d1011d86cd23402a1f665e0.zip
rt.equinox.p2-b8665f25c667146a6d1011d86cd23402a1f665e0.tar.gz
rt.equinox.p2-b8665f25c667146a6d1011d86cd23402a1f665e0.tar.bz2
added an ant script, launched via maven (using maven ant runner in bundles/org.eclipse.equinox.p2.tests/pom.xml)that downloads eclipse platform 3.7 in its tar.gz format by default, override with -Dplatform.archive.name=eclipse-indigo-platform.zip when building on windows
Signed-off-by: Pascal Rapicault <pascal@sonatype.com>
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/download.eclipse.platform.for.p2.migration.tests.xml43
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/pom.xml30
-rw-r--r--org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml2
3 files changed, 73 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/download.eclipse.platform.for.p2.migration.tests.xml b/bundles/org.eclipse.equinox.p2.tests/download.eclipse.platform.for.p2.migration.tests.xml
new file mode 100644
index 0000000..99dbc49
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/download.eclipse.platform.for.p2.migration.tests.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<project name="download.eclipse.platform.for.p2.migration.tests" default="download.eclipse.platform" basedir=".">
+
+ <condition property="isWindows">
+ <os family="windows" />
+ </condition>
+
+ <!--condition property="isLinux">
+ <os family="unix" />
+ </condition>
+
+ <condition property="isMac">
+ <os family="mac" />
+ </condition-->
+
+ <target name="check-eclipse-platform-windows">
+ <available file="eclipse-indigo-platform.zip" property="eclipse.platform.windows.present" />
+ </target>
+
+ <target name="check-eclipse-platform-unix">
+ <available file="eclipse-indigo-platform.tar.gz" property="eclipse.platform.unix.present" />
+ </target>
+
+ <!-- download eclipse platform 3.7 unless it already exists-->
+ <target name="download.eclipse.platform.windows" depends="check-eclipse-platform-windows" unless="eclipse.platform.windows.present">
+ <antcall target="download.for.windows" />
+ </target>
+
+ <!-- download eclipse platform 3.7 unless it already exists-->
+ <target name="download.eclipse.platform.unix" depends="check-eclipse-platform-unix" unless="eclipse.platform.unix.present">
+ <antcall target="download.for.unix" />
+ </target>
+
+ <target name="download.eclipse.platform" depends="download.eclipse.platform.windows,download.eclipse.platform.unix">
+ </target>
+
+ <target name="download.for.unix" unless="isWindows">
+ <get src="http://mirror.csclub.uwaterloo.ca/eclipse/eclipse/downloads/drops/R-3.7.1-201109091335/eclipse-platform-3.7.1-linux-gtk.tar.gz" dest="eclipse-indigo-platform.tar.gz" />
+ </target>
+ <target name="download.for.windows" if="isWindows">
+ <get src="http://mirror.csclub.uwaterloo.ca/eclipse/eclipse/downloads/drops/R-3.7.1-201109091335/eclipse-platform-3.7.1-win32.zip" dest="eclipse-indigo-platform.zip" />
+ </target>
+</project>
diff --git a/bundles/org.eclipse.equinox.p2.tests/pom.xml b/bundles/org.eclipse.equinox.p2.tests/pom.xml
index 73b19b1..a4bba0e 100644
--- a/bundles/org.eclipse.equinox.p2.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests/pom.xml
@@ -15,9 +15,37 @@
<artifactId>org.eclipse.equinox.p2.tests</artifactId>
<version>1.4.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
+
+ <properties>
+ <platform.archive.name>eclipse-indigo-platform.tar.gz</platform.archive.name>
+ </properties>
<build>
<plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <phase>compile</phase>
+ <configuration>
+ <target>
+ <ant antfile="${basedir}/download.eclipse.platform.for.p2.migration.tests.xml">
+ <target name="download.eclipse.platform"/>
+ </ant>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
@@ -25,7 +53,7 @@
<configuration>
<testSuite>org.eclipse.equinox.p2.tests</testSuite>
<testClass>org.eclipse.equinox.p2.tests.AutomatedTests</testClass>
- <argLine>-Xmx512m -Dorg.eclipse.equinox.p2.reconciler.tests.platform.archive=/home/anthony/Téléchargements/eclipse-SDK-3.7-linux-gtk-x86_64.tar.gz -Dorg.eclipse.equinox.p2.reconciler.tests.35.platform.archive=/home/anthony/Téléchargements/eclipse-SDK-3.7-linux-gtk-x86_64.tar.gz -Dorg.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive=/home/anthony/Téléchargements/eclipse-SDK-3.7-linux-gtk-x86_64.tar.gz -Dorg.eclipse.equinox.p2.repository</argLine>
+ <argLine>-Xmx512m -Dorg.eclipse.equinox.p2.reconciler.tests.platform.archive=${platform.archive.name} -Dorg.eclipse.equinox.p2.reconciler.tests.35.platform.archive=${platform.archive.name} -Dorg.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive=${platform.archive.name} -Dorg.eclipse.equinox.p2.repository</argLine>
<appArgLine>-consoleLog</appArgLine>
<bundleStartLevel>
<bundle>
diff --git a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml
index 215d231..738f56f 100644
--- a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml
+++ b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-aggregator/pom.xml
@@ -46,7 +46,7 @@
<module>../../bundles/org.eclipse.equinox.p2.repository</module>
<module>../../bundles/org.eclipse.equinox.p2.repository.tools</module>
<module>../../bundles/org.eclipse.equinox.p2.sar</module>
-<!-- <module>../../bundles/org.eclipse.equinox.p2.tests</module> -->
+ <module>../../bundles/org.eclipse.equinox.p2.tests</module>
<!-- <module>../../bundles/org.eclipse.equinox.p2.tests.discovery</module>-->
<!-- <module>../../bundles/org.eclipse.equinox.p2.tests.ui</module>-->
<!-- <module>../../bundles/org.eclipse.equinox.p2.tests.verifier</module> -->