From b2747d05ccf269d5dc3b41bbbc4ee72320576f76 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Tue, 31 Mar 2009 16:38:11 +0000
Subject: [PATCH] adjust for xsl graduating
---
releng.control/cc_config.xml | 2 +-
releng.control/commonComputedVariables.shsource | 1 -
releng.wtpbuilder/components/xsl/customTargets.xml | 2 +-
releng.wtpbuilder/components/xsl_sdk/customTargets.xml | 2 +-
.../components/xsl_tests/customTargets.xml | 2 +-
releng.wtpbuilder/scripts/build/maptasks.xml | 10 ----------
6 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index a66237d69..6f2164d66 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -196,7 +196,7 @@
<modificationset
quietperiod="120">
<cvs
- module="${env.RELENGINCUBATORXSL}"
+ module="${env.RELENGSOURCEEDITING}"
reallyquiet="${env.CVS_QUIET}" />
</modificationset>
<schedule
diff --git a/releng.control/commonComputedVariables.shsource b/releng.control/commonComputedVariables.shsource
index 921308fe9..4da5fb093 100644
--- a/releng.control/commonComputedVariables.shsource
+++ b/releng.control/commonComputedVariables.shsource
@@ -44,7 +44,6 @@ export RELENG_BUILDER=webtools.releng/releng.wtpbuilder
export RELENG=webtools.maps/releng
export RELENGJSF=webtools.maps/releng.jsf
export RELENGDALI=webtools.maps/releng.dali
-export RELENGINCUBATORXSL=webtools.maps/releng.incubator.xsl
export RELENGINCUBATORVEX=webtools.maps/releng.incubator.vex
export RELENGCOMMON=webtools.maps/releng.common
export RELENGEJBTOOLS=webtools.maps/releng.ejbtools
diff --git a/releng.wtpbuilder/components/xsl/customTargets.xml b/releng.wtpbuilder/components/xsl/customTargets.xml
index 9078b0f1b..6a8730ac3 100644
--- a/releng.wtpbuilder/components/xsl/customTargets.xml
+++ b/releng.wtpbuilder/components/xsl/customTargets.xml
@@ -133,7 +133,7 @@
target="maputil">
<property
name="mapcomponent"
- value="${env.RELENGINCUBATORXSL}"/>
+ value="${env.RELENGSOURCEEDITING}"/>
<property
name="mapTag"
value="${mapVersionTag}"/>
diff --git a/releng.wtpbuilder/components/xsl_sdk/customTargets.xml b/releng.wtpbuilder/components/xsl_sdk/customTargets.xml
index cf29fe3e4..540017f9e 100644
--- a/releng.wtpbuilder/components/xsl_sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/xsl_sdk/customTargets.xml
@@ -132,7 +132,7 @@
target="maputil">
<property
name="mapcomponent"
- value="${env.RELENGINCUBATORXSL}"/>
+ value="${env.RELENGSOURCEEDITING}"/>
<property
name="mapTag"
value="${mapVersionTag}"/>
diff --git a/releng.wtpbuilder/components/xsl_tests/customTargets.xml b/releng.wtpbuilder/components/xsl_tests/customTargets.xml
index cf99d598f..3ea1ab28e 100644
--- a/releng.wtpbuilder/components/xsl_tests/customTargets.xml
+++ b/releng.wtpbuilder/components/xsl_tests/customTargets.xml
@@ -134,7 +134,7 @@
target="maputil">
<property
name="mapcomponent"
- value="${env.RELENGINCUBATORXSL}"/>
+ value="${env.RELENGSOURCEEDITING}"/>
<property
name="mapTag"
value="${mapVersionTag}"/>
diff --git a/releng.wtpbuilder/scripts/build/maptasks.xml b/releng.wtpbuilder/scripts/build/maptasks.xml
index 4d12c14a1..de4b9135c 100644
--- a/releng.wtpbuilder/scripts/build/maptasks.xml
+++ b/releng.wtpbuilder/scripts/build/maptasks.xml
@@ -138,16 +138,6 @@
name="mapTag"
value="${mapVersionTag}"/>
</ant>
- <ant
- antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
- target="maputil">
- <property
- name="mapcomponent"
- value="${env.RELENGINCUBATORXSL}"/>
- <property
- name="mapTag"
- value="${mapVersionTag}"/>
- </ant>
<ant
antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
target="maputil">
--
GitLab