From 506c822ff8f91a6861d08e40f4496b8477cce482 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Fri, 13 May 2011 05:32:40 +0000
Subject: [PATCH] prep for WTP 3.2.4 patch builds
---
.../patches32x.package/createFinalRepo.xml | 10 +++++++++-
.../distribution/patches32x.package/createmainzips.xml | 2 ++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/releng.wtpbuilder/distribution/patches32x.package/createFinalRepo.xml b/releng.wtpbuilder/distribution/patches32x.package/createFinalRepo.xml
index 0984dc88d..54ad88b85 100644
--- a/releng.wtpbuilder/distribution/patches32x.package/createFinalRepo.xml
+++ b/releng.wtpbuilder/distribution/patches32x.package/createFinalRepo.xml
@@ -75,8 +75,11 @@
<target
name="build"
+ depends="doMirror">
+
+ <!--
depends="doMirror,doMirrorTests">
-
+ -->
<!-- add the new build to the composite -->
<!--
TODO: after promotion, do we need to delete repo's as directories removed? Or just do occasional cleanup,
@@ -285,6 +288,11 @@
comparator="org.eclipse.equinox.p2.repository.tools.jar.comparator"
comparatorLog="${buildDirectory}/${buildLabel}/comparator-unittest.log">
<repository location="file:/${baseComparatorRepoDir}"/>
+ <!-- Note: comparator has fixed this issues in 3.7 stream, but
+ since we use this same code in maintenance stream, with 3.6 based builder,
+ then we need to leave these excluded in place (or, make them stream sensitive,
+ which doesn't seem worth it
+ -->
<exclude>
<artifact id="org.eclipse.jpt.eclipselink.ui"/>
<artifact id="org.eclipse.jpt.ui"/>
diff --git a/releng.wtpbuilder/distribution/patches32x.package/createmainzips.xml b/releng.wtpbuilder/distribution/patches32x.package/createmainzips.xml
index 2562d685c..0cf2f5594 100644
--- a/releng.wtpbuilder/distribution/patches32x.package/createmainzips.xml
+++ b/releng.wtpbuilder/distribution/patches32x.package/createmainzips.xml
@@ -113,11 +113,13 @@
value="${build.distribution}-sdk-${buildLabel}.zip"/>
</antcall>
-->
+<!--
<antcall target="createTestZip">
<param
name="newarchiveName"
value="${build.distribution}-tests-${buildLabel}.zip"/>
</antcall>
+ -->
</target>
<!--
Note: this was done as an import, since eventually there may be more than one ... differ by streams? There may be
--
GitLab