From 65de9bd057327267b97119db9f3202fb0cdf7cdc Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Tue, 14 Sep 2010 06:21:21 +0000
Subject: [PATCH] install test framework for compile (not just unzip).
---
.../components/dali-sdk/dependency.xml | 7 +--
.../components/dali.tests/dependency.xml | 48 +++++++++++++++++--
.../components/jst-sdk/dependency.xml | 9 ++++
.../components/jst.tests/dependency.xml | 32 ++++++++++++-
.../components/wst-sdk/dependency.xml | 9 ----
.../components/wst.tests/dependency.xml | 33 ++++++++-----
.../scripts/dependency/template.xml | 9 +++-
7 files changed, 115 insertions(+), 32 deletions(-)
diff --git a/releng.wtpbuilder/components/dali-sdk/dependency.xml b/releng.wtpbuilder/components/dali-sdk/dependency.xml
index f77ba060a..2900e3424 100644
--- a/releng.wtpbuilder/components/dali-sdk/dependency.xml
+++ b/releng.wtpbuilder/components/dali-sdk/dependency.xml
@@ -79,12 +79,7 @@
name="groupId"
value="eclipseTestFramework"/>
</antcall>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="dita"/>
- </antcall>
+
</target>
<target
name="getAndInstall"
diff --git a/releng.wtpbuilder/components/dali.tests/dependency.xml b/releng.wtpbuilder/components/dali.tests/dependency.xml
index a6b4bf9d5..096a8ba0d 100644
--- a/releng.wtpbuilder/components/dali.tests/dependency.xml
+++ b/releng.wtpbuilder/components/dali.tests/dependency.xml
@@ -20,7 +20,29 @@
-->
<property
file="${dependency.properties}"/>
-
+ <mkdir
+ dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="orbitthirdpartymap"/>
+ <param
+ name="base.install.dir"
+ value="${buildDirectory}/maps/${env.RELENG}/maps/"/>
+ </antcall>
+ <property
+ name="pde.builder.path"
+ value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
+ <echo
+ level="debug"
+ message="pde.builder.path: ${pde.builder.path}"/>
+ <echo
+ level="debug"
+ message="eclipse.builder.version: ${eclipse.builder.version}"/>
+ <echo
+ level="debug"
+ message="eclipse.builder: ${eclipse.builder}"/>
<antcall
target="getAndInstall">
<param
@@ -52,7 +74,7 @@
value="eclipse"/>
</antcall>
<antcall
- target="getAndInstall">
+ target="getAndInstallRepo">
<param
name="groupId"
value="eclipseTestFramework"/>
@@ -85,5 +107,25 @@
</ant>
</target>
-
+ <target
+ name="getAndInstallRepo"
+ if="${groupId}.url">
+ <ant
+ antfile="${dependencyTargets}"
+ target="checkDependency">
+ <property
+ name="groupId"
+ value="${groupId}"/>
+ </ant>
+ <ant
+ antfile="${dependencyTargets}"
+ target="installRepo">
+ <property
+ name="groupId"
+ value="${groupId}"/>
+ <property
+ name="install.destination"
+ value="${base.install.dir}"/>
+ </ant>
+ </target>
</project>
diff --git a/releng.wtpbuilder/components/jst-sdk/dependency.xml b/releng.wtpbuilder/components/jst-sdk/dependency.xml
index 3ade6d2dd..661098a06 100644
--- a/releng.wtpbuilder/components/jst-sdk/dependency.xml
+++ b/releng.wtpbuilder/components/jst-sdk/dependency.xml
@@ -39,6 +39,15 @@
<echo
level="debug"
message="eclipse.builder: ${eclipse.builder}"/>
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="orbitthirdpartymap"/>
+ <param
+ name="base.install.dir"
+ value="${buildDirectory}/maps/${env.RELENG}/maps/"/>
+ </antcall>
<antcall
target="getAndInstall">
<param
diff --git a/releng.wtpbuilder/components/jst.tests/dependency.xml b/releng.wtpbuilder/components/jst.tests/dependency.xml
index f7f54349b..655542001 100644
--- a/releng.wtpbuilder/components/jst.tests/dependency.xml
+++ b/releng.wtpbuilder/components/jst.tests/dependency.xml
@@ -18,6 +18,15 @@
file="${dependency.properties}"/>
<mkdir
dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
+ <antcall
+ target="getAndInstall">
+ <param
+ name="groupId"
+ value="orbitthirdpartymap"/>
+ <param
+ name="base.install.dir"
+ value="${buildDirectory}/maps/${env.RELENG}/maps/"/>
+ </antcall>
<property
name="pde.builder.path"
value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
@@ -70,7 +79,7 @@
value="eclipse"/>
</antcall>
<antcall
- target="getAndInstall">
+ target="getAndInstallRepo">
<param
name="groupId"
value="eclipseTestFramework"/>
@@ -97,4 +106,25 @@
value="${base.install.dir}"/>
</ant>
</target>
+ <target
+ name="getAndInstallRepo"
+ if="${groupId}.url">
+ <ant
+ antfile="${dependencyTargets}"
+ target="checkDependency">
+ <property
+ name="groupId"
+ value="${groupId}"/>
+ </ant>
+ <ant
+ antfile="${dependencyTargets}"
+ target="installRepo">
+ <property
+ name="groupId"
+ value="${groupId}"/>
+ <property
+ name="install.destination"
+ value="${base.install.dir}"/>
+ </ant>
+ </target>
</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wst-sdk/dependency.xml b/releng.wtpbuilder/components/wst-sdk/dependency.xml
index bbc055edf..91a662261 100644
--- a/releng.wtpbuilder/components/wst-sdk/dependency.xml
+++ b/releng.wtpbuilder/components/wst-sdk/dependency.xml
@@ -18,15 +18,6 @@
file="${dependency.properties}"/>
<mkdir
dir="${buildDirectory}/maps/${env.RELENG}/maps"/>
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="orbitthirdpartymap"/>
- <param
- name="base.install.dir"
- value="${buildDirectory}/maps/${env.RELENG}/maps/"/>
- </antcall>
<property
name="pde.builder.path"
value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
diff --git a/releng.wtpbuilder/components/wst.tests/dependency.xml b/releng.wtpbuilder/components/wst.tests/dependency.xml
index 6749c90d9..4a4fea603 100644
--- a/releng.wtpbuilder/components/wst.tests/dependency.xml
+++ b/releng.wtpbuilder/components/wst.tests/dependency.xml
@@ -30,16 +30,6 @@
<echo
level="debug"
message="eclipse.builder: ${eclipse.builder}"/>
-
- <antcall
- target="getAndInstall">
- <param
- name="groupId"
- value="orbitthirdpartymap"/>
- <param
- name="base.install.dir"
- value="${buildDirectory}/maps/${env.RELENG}/maps/"/>
- </antcall>
<antcall
target="getAndInstall">
<param
@@ -65,7 +55,7 @@
value="eclipse"/>
</antcall>
<antcall
- target="getAndInstall">
+ target="getAndInstallRepo">
<param
name="groupId"
value="eclipseTestFramework"/>
@@ -92,4 +82,25 @@
value="${base.install.dir}"/>
</ant>
</target>
+ <target
+ name="getAndInstallRepo"
+ if="${groupId}.url">
+ <ant
+ antfile="${dependencyTargets}"
+ target="checkDependency">
+ <property
+ name="groupId"
+ value="${groupId}"/>
+ </ant>
+ <ant
+ antfile="${dependencyTargets}"
+ target="installRepo">
+ <property
+ name="groupId"
+ value="${groupId}"/>
+ <property
+ name="install.destination"
+ value="${base.install.dir}"/>
+ </ant>
+ </target>
</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/scripts/dependency/template.xml b/releng.wtpbuilder/scripts/dependency/template.xml
index 79df12dea..9d87c2a26 100644
--- a/releng.wtpbuilder/scripts/dependency/template.xml
+++ b/releng.wtpbuilder/scripts/dependency/template.xml
@@ -228,6 +228,7 @@
<!--
We first unzip the repo, then use p2 directory app to install into the eclispe
location.
+ TODO: could we just make p2runnable in "transformed" repository? for build case.
-->
<!--
We use the exec method for unzip, so we won't fail if a
@@ -243,8 +244,11 @@
message="tobeinstalledrepo: ${tobeinstalledrepo}"/>
<echo
message="tobeInstalledfeaturegroups: ${dependency.tobeinstalledfeaturegroups}"/>
+ <delete failonerror="false">
+ <dirset dir="${tobeinstalledrepo}" />
+ </delete>
<mkdir
- dir="${local.cache.dir}/repos/${groupId}"/>
+ dir="${tobeinstalledrepo}"/>
<exec
dir="."
executable="unzip">
@@ -264,7 +268,8 @@
resultProperty="p2DirectorInstallResult"
failonerror="true"
jar="${eclipse.launcher}"
- jvm="${env.JAVA_6_HOME}/bin/java">
+ jvm="${env.JAVA_6_HOME}/bin/java"
+ dir="install.destination">
<jvmarg
value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
--
GitLab