From 31cdd85bfef354bd3da5d58be732dc3d1e477c05 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Sat, 4 Oct 2008 21:52:32 +0000
Subject: [PATCH] 247565 [releng] Dali needs build/packaging for 2.1 release
---
.../distribution/dali.tests/build.xml | 10 +++++
.../dali.tests/extradependencies.xml | 45 +++++++++++++++++++
.../dali.tests/testdependency.xml | 6 +--
3 files changed, 56 insertions(+), 5 deletions(-)
create mode 100644 releng.wtpbuilder/distribution/dali.tests/extradependencies.xml
diff --git a/releng.wtpbuilder/distribution/dali.tests/build.xml b/releng.wtpbuilder/distribution/dali.tests/build.xml
index f558364dc..f9ff3840c 100644
--- a/releng.wtpbuilder/distribution/dali.tests/build.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/build.xml
@@ -83,6 +83,16 @@
name="base.install.dir"
value="${testRoot}" />
</ant>
+ <ant
+ antfile="${test.component.dir}/extradependencies.xml"
+ target="get">
+ <property
+ name="dependency.properties"
+ value="${buildDirectory}/maps/${env.RELENGDALI}/maps/dali.dependencies.properties" />
+ <property
+ name="base.install.dir"
+ value="${testRoot}" />
+ </ant>
<antcall
target="unzipTests" />
<antcall
diff --git a/releng.wtpbuilder/distribution/dali.tests/extradependencies.xml b/releng.wtpbuilder/distribution/dali.tests/extradependencies.xml
new file mode 100644
index 000000000..1c8431f5d
--- /dev/null
+++ b/releng.wtpbuilder/distribution/dali.tests/extradependencies.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!-- ======================================================================
+ Properties that must be passed to this script:
+ base.install.dir
+ dependencyTargets
+ local.cache.dir
+ dependency.properties
+
+ ====================================================================== -->
+<project
+ name="test"
+ default="get">
+
+ <target name="get">
+
+ <antcall target="getAndInstall">
+ <param
+ name="groupId"
+ value="jst" />
+ </antcall>
+
+ </target>
+
+ <target name="getAndInstall">
+
+ <ant
+ antfile="${dependencyTargets}"
+ target="checkDependency">
+ <property
+ name="groupId"
+ value="${groupId}" />
+ </ant>
+ <ant
+ antfile="${dependencyTargets}"
+ target="installDependency">
+ <property
+ name="groupId"
+ value="${groupId}" />
+ <property
+ name="install.destination"
+ value="${base.install.dir}" />
+ </ant>
+ </target>
+
+</project>
diff --git a/releng.wtpbuilder/distribution/dali.tests/testdependency.xml b/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
index 36f563bb4..43fff324d 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
@@ -51,11 +51,7 @@
name="groupId"
value="eclipseTestFramework" />
</antcall>
- <antcall target="getAndInstallDropins">
- <param
- name="groupId"
- value="wtp" />
- </antcall>
+
<antcall
target="getAndInstallBase">
<param
--
GitLab