[165059] Update Dali distribution test script
diff --git a/releng.wtpbuilder/components/dali/customTargets.xml b/releng.wtpbuilder/components/dali/customTargets.xml
index c882128..882d001 100644
--- a/releng.wtpbuilder/components/dali/customTargets.xml
+++ b/releng.wtpbuilder/components/dali/customTargets.xml
@@ -87,18 +87,22 @@
<property
name="mapVersionTag"
value="HEAD" />
- <property
- name="cvsPackage"
- value="releng.dali" />
- <echo message="${mapCvsRoot} ${mapVersionTag} " />
- <echo message="cvsPackage = ${cvsPackage} " />
+
+ <!-- get releng/maps -->
+ <antcall target="checkOutMaps">
+ <param
+ name="cvsPackage"
+ value="releng" />
+ </antcall>
- <cvs
- cvsRoot="${mapCvsRoot}"
- package="${cvsPackage}"
- dest="${buildDirectory}/maps"
- tag="${mapVersionTag}" />
- <!--tag the map files project-->
+ <!-- get releng.dali/maps -->
+ <antcall target="checkOutMaps">
+ <param
+ name="cvsPackage"
+ value="releng.dali" />
+ </antcall>
+
+ <!-- tag the map files project -->
<antcall target="tagMapFiles">
<param
name="mapCvsRoot"
@@ -106,6 +110,23 @@
</antcall>
</target>
+ <!-- ===================================================================== -->
+ <!-- Check out the cvsPackage -->
+ <!-- ===================================================================== -->
+ <target name="checkOutMaps">
+ <echo message="${mapCvsRoot} ${mapVersionTag} " />
+ <echo message="cvsPackage = ${cvsPackage} " />
+ <cvs
+ cvsRoot="${mapCvsRoot}"
+ package="${cvsPackage}"
+ dest="${buildDirectory}/maps"
+ tag="${mapVersionTag}" />
+
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Tag Map Files mapCvsRoot -->
+ <!-- ===================================================================== -->
<target
name="tagMapFiles"
if="tagMaps">
@@ -130,20 +151,32 @@
<echo message="ant.file: ${ant.file}" />
<echo message="component.dir: ${component.dir}" />
-<!-- need to make cumlative between releng and releng.dali -->
+ <property
+ name="dependencies.combined"
+ value="dependencies.combined.properties" />
+
+ <!-- Combine releng and releng.dali -->
+ <delete file="${buildDirectory}/maps/releng.dali/maps/${dependencies.combined}" failonerror="false" />
+ <concat destfile="${buildDirectory}/maps/releng.dali/maps/${dependencies.combined}">
+ <fileset dir="${buildDirectory}/maps">
+ <include name="releng/maps/dependencies.properties"/>
+ <include name="releng.dali/maps/dependencies.properties"/>
+ </fileset>
+ </concat>
+
<ant
antfile="${component.dir}/dependency.xml"
target="get">
<property
name="dependency.properties"
- value="${buildDirectory}/maps/releng/maps/dependencies.properties" />
+ value="${buildDirectory}/maps/releng.dali/maps/${dependencies.combined}" />
<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 f0aab2a..a58256c 100644
--- a/releng.wtpbuilder/components/dali/dependency.xml
+++ b/releng.wtpbuilder/components/dali/dependency.xml
@@ -37,16 +37,12 @@
name="groupId"
value="eclipse" />
</antcall>
- <!-- need to make this conditional?
- <antcall target="getAndInstall">
- <param
- name="groupId"
- value="wtp" />
- </antcall>
- -->
+
+ <antcall target="getAndInstallWTP" />
+
</target>
- <target name="getAndInstall">
+ <target name="getAndInstall" unless="skipGetAndInstall">
<ant
antfile="${dependencyTargets}"
target="checkDependency">
@@ -65,6 +61,29 @@
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" />
+ </antcall>
+
+ </target>
+
</project>