[176754] Patch for Dali with renamed packages
diff --git a/releng.wtpbuilder/components/dali.tests/customTargets.xml b/releng.wtpbuilder/components/dali.tests/customTargets.xml
index 2a5ec38..ff65381 100644
--- a/releng.wtpbuilder/components/dali.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/dali.tests/customTargets.xml
@@ -193,7 +193,7 @@
value="feature" />
<property
name="id"
- value="org.eclipse.jst.jpa.feature" />
+ value="org.eclipse.jpa.feature" />
</ant>
</target>
@@ -259,7 +259,7 @@
unless="dontRunTests">
<property
name="eclipseAutomatedTestHome"
- value="${buildDirectory}/plugins/org.eclipse.jst.jpa.utility.tests" />
+ value="${buildDirectory}/plugins/org.eclipse.jpa.utility.tests" />
<echo message="Setting up tests in ${eclipseAutomatedTestHome}" />
diff --git a/releng.wtpbuilder/components/dali/customTargets.xml b/releng.wtpbuilder/components/dali/customTargets.xml
index 97a5545..686ab8d 100644
--- a/releng.wtpbuilder/components/dali/customTargets.xml
+++ b/releng.wtpbuilder/components/dali/customTargets.xml
@@ -154,19 +154,54 @@
property="component.dir" />
<echo message="ant.file: ${ant.file}" />
<echo message="component.dir: ${component.dir}" />
-
+
+ <condition property="daliLocalBuild" value="true">
+ <equals arg1="${build.distribution}" arg2="dali" casesensitive="false" trim="true" />
+ </condition>
+
+ <!-- Get the dependencies -->
+ <antcall target="getDependencies" />
+
+ <!-- Get Dali dependencies -->
+ <antcall target="getDaliLocalDependencies" />
+
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Get the dependencies based on releng maps -->
+ <!-- ===================================================================== -->
+ <target name="getDependencies">
+
<ant
antfile="${component.dir}/dependency.xml"
target="get">
<property
name="dependency.properties"
- value="${buildDirectory}/maps/releng/maps/dependencies.properties" />
+ value="${buildDirectory}/maps/releng/maps/dependencies.properties" />
<property
name="base.install.dir"
value="${buildRoot}" />
</ant>
-
- </target>
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Get Dali dependencies based on releng.dali maps -->
+ <!-- ===================================================================== -->
+ <target name="getDaliLocalDependencies"
+ if="daliLocalBuild">
+
+ <ant
+ antfile="${component.dir}/localDependency.xml"
+ target="get">
+ <property
+ name="dependency.properties"
+ value="${buildDirectory}/maps/releng.dali/maps/dependencies.properties" />
+ <property
+ name="base.install.dir"
+ value="${buildRoot}" />
+ </ant>
+
+ </target>
<!-- ===================================================================== -->
<!-- Steps to do before fetching the build elements -->
diff --git a/releng.wtpbuilder/components/dali/dependency.xml b/releng.wtpbuilder/components/dali/dependency.xml
index 4d41327..1877176 100644
--- a/releng.wtpbuilder/components/dali/dependency.xml
+++ b/releng.wtpbuilder/components/dali/dependency.xml
@@ -7,84 +7,44 @@
dependency.properties
====================================================================== -->
-<project
- name="test"
- default="get">
+<project name="test" default="get">
<target name="get">
<antcall target="getAndInstall">
<param name="groupId" value="orbitthirdparty" />
</antcall>
+
<antcall target="getAndInstall">
- <param
- name="groupId"
- value="emf" />
+ <param name="groupId" value="emf" />
</antcall>
+
<antcall target="getAndInstall">
- <param
- name="groupId"
- value="gef" />
+ <param name="groupId" value="gef" />
</antcall>
<antcall target="getAndInstall">
- <param
- name="groupId"
- value="dtp" />
+ <param name="groupId" value="dtp" />
</antcall>
- <antcall target="getAndInstall">
- <param
- name="groupId"
- value="eclipse" />
- </antcall>
-
- <!-- see https://bugs.eclipse.org/bugs/show_bug.cgi?id=175772
- <antcall target="getAndInstallWTP" />
- -->
-
- </target>
-
- <target name="getAndInstall" unless="skipGetAndInstall">
- <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>
-
- <target name="getAndInstallWTP">
- <mkdir dir="${baseLocation}/plugins/_temp_"/>
- <copy todir="${baseLocation}/plugins/_temp_">
- <fileset dir="${baseLocation}/plugins">
- <include name="org.eclipse.wst.xml.core*.jar"/>
- </fileset>
- <mapper type="merge" to="org.eclipse.wst.xml.core"/>
- </copy>
-
- <available property="skipGetAndInstall"
- value="true"
- file="${baseLocation}/plugins/_temp_/org.eclipse.wst.xml.core"
- type="file" />
- <delete dir="${baseLocation}/plugins/_temp_" failonerror="false" />
<antcall target="getAndInstall">
- <param
- name="groupId"
- value="wtp" />
+ <param name="groupId" value="eclipse" />
</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/components/dali/localDependency.xml b/releng.wtpbuilder/components/dali/localDependency.xml
new file mode 100644
index 0000000..92931c2
--- /dev/null
+++ b/releng.wtpbuilder/components/dali/localDependency.xml
@@ -0,0 +1,33 @@
+<?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="wtp" />
+ </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/testScripts/test.properties b/releng.wtpbuilder/distribution/dali.tests/testScripts/test.properties
index f3b7824..c0aa26e 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testScripts/test.properties
+++ b/releng.wtpbuilder/distribution/dali.tests/testScripts/test.properties
@@ -1,3 +1,3 @@
-org.eclipse.jst.jpa.utility.tests=org.eclipse.jst.jpa.utility.tests_1.0.0
-org.eclipse.jst.jpa.core.tests=org.eclipse.jst.jpa.core.tests_1.0.0
+org.eclipse.jpa.utility.tests=org.eclipse.jpa.utility.tests_1.0.0
+org.eclipse.jpa.core.tests=org.eclipse.jpa.core.tests_1.0.0
diff --git a/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
index 3065268..1273128 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
@@ -76,17 +76,17 @@
</target>
- <target name="dali-utility-tests" description="Runs the org.eclipse.jst.jpa.utility.tests test.xml">
+ <target name="dali-utility-tests" description="Runs the org.eclipse.jpa.utility.tests test.xml">
<antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jst.jpa.utility.tests}" />
- <param name="report" value="org.eclipse.jst.jpa.utility.tests" />
+ <param name="testPlugin" value="${org.eclipse.jpa.utility.tests}" />
+ <param name="report" value="org.eclipse.jpa.utility.tests" />
</antcall>
</target>
- <target name="dali-core-tests" description="Runs the org.eclipse.jst.jpa.core.tests test.xml">
+ <target name="dali-core-tests" description="Runs the org.eclipse.jpa.core.tests test.xml">
<antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jst.jpa.core.tests}" />
- <param name="report" value="org.eclipse.jst.jpa.core.tests" />
+ <param name="testPlugin" value="${org.eclipse.jpa.core.tests}" />
+ <param name="report" value="org.eclipse.jpa.core.tests" />
</antcall>
</target>
@@ -96,7 +96,7 @@
<echo message="Starting dali-utility-tests"/>
<antcall target="dali-utility-tests" />
-
+
<echo message="Starting dali-core-tests"/>
<antcall target="dali-core-tests" />
diff --git a/releng.wtpbuilder/distribution/dali.tests/testdependency.xml b/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
index b0b9e7e..afee59e 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
@@ -5,7 +5,8 @@
dependencyTargets
local.cache.dir
dependency.properties
-
+
+ This file should not be used by the main WTP build
====================================================================== -->
<project name="test" default="get">
@@ -23,11 +24,11 @@
<antcall target="getAndInstall">
<param name="groupId" value="dtp" />
</antcall>
- <!--
+ <!-- This file should not be used by the main WTP build -->
<antcall target="getAndInstall">
<param name="groupId" value="wtp" />
</antcall>
- -->
+
<antcall target="getAndInstall">
<param name="groupId" value="eclipse" />
</antcall>