fix up build paths
diff --git a/releng.control/checkout.xml b/releng.control/checkout.xml
index 081bdf8..a3fd32b 100644
--- a/releng.control/checkout.xml
+++ b/releng.control/checkout.xml
@@ -65,14 +65,14 @@
quiet="${env.CVS_QUIET}"
reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
- package="${env.relengjsf}"
+ package="${env.RELENGJSF}"
dest="${codir}"
tag="HEAD" />
<cvs
quiet="${env.CVS_QUIET}"
reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
- package="${env.relengdali}"
+ package="${env.RELENGDALI}"
dest="${codir}"
tag="HEAD" />
</target>
@@ -85,14 +85,14 @@
quiet="${env.CVS_QUIET}"
reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
- package="${env.relengjsf}"
+ package="${env.RELENGJSF}"
dest="${codir}"
tag="HEAD" />
<cvs
quiet="${env.CVS_QUIET}"
reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
- package="${env.relengdali}"
+ package="${env.RELENGDALI}"
dest="${codir}"
tag="HEAD" />
</target>
@@ -105,14 +105,14 @@
quiet="${env.CVS_QUIET}"
reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
- package="${env.relengjsf}"
+ package="${env.RELENGJSF}"
dest="${codir}"
tag="HEAD" />
<cvs
quiet="${env.CVS_QUIET}"
reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
- package="${env.relengdali}"
+ package="${env.RELENGDALI}"
dest="${codir}"
tag="HEAD" />
</target>
@@ -126,7 +126,7 @@
quiet="${env.CVS_QUIET}"
reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
- package="$${env.releng}"
+ package="${env.RELENG}"
dest="${codir}"
tag="R1_5_maintenance" />
</target>
@@ -138,21 +138,21 @@
quiet="${env.CVS_QUIET}"
reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
- package="$${env.releng}"
+ package="${env.RELENG}"
dest="${codir}"
tag="R2_0_maintenance" />
<cvs
quiet="${env.CVS_QUIET}"
reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
- package="${env.relengdali}"
+ package="${env.RELENGDALI}"
dest="${codir}"
tag="R1_0_maintenance" />
<cvs
quiet="${env.CVS_QUIET}"
reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
- package="${env.relengjsf}"
+ package="${env.RELENGJSF}"
dest="${codir}"
tag="R1_0_maintenance" />
</target>
@@ -161,21 +161,21 @@
quiet="${env.CVS_QUIET}"
reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
- package="$${env.releng}"
+ package="${env.RELENG}"
dest="${codir}"
tag="R2_0_maintenance" />
<cvs
quiet="${env.CVS_QUIET}"
reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
- package="${env.relengdali}"
+ package="${env.RELENGDALI}"
dest="${codir}"
tag="R1_0_maintenance" />
<cvs
quiet="${env.CVS_QUIET}"
reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
- package="${env.relengjsf}"
+ package="${env.RELENGJSF}"
dest="${codir}"
tag="R1_0_maintenance" />
</target>
@@ -188,7 +188,7 @@
quiet="${env.CVS_QUIET}"
reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
- package="$${env.releng}"
+ package="${env.RELENG}"
dest="${codir}"
tag="R1_5_maintenance" />
</target>
@@ -197,7 +197,7 @@
quiet="${env.CVS_QUIET}"
reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
- package="$${env.releng}"
+ package="${env.RELENG}"
dest="${codir}"
tag="R1_5_maintenance_patches" />
</target>
@@ -226,7 +226,7 @@
<!-- This is a special property file, that contains (only) the
value of wtpBuilderVersion. Then, that version of the builder
is fetched to control the rest of the build -->
- <property file="${codir}/$${env.releng}/maps/build.cfg" />
+ <property file="${codir}/${env.RELENG}/maps/build.cfg" />
<delete
dir="${codir}/releng.wtpbuilder"
failonerror="false" />
@@ -236,7 +236,7 @@
quiet="${env.CVS_QUIET}"
reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
- package="${env.relengwtpbuilder}"
+ package="${env.RELENGWTPBUILDER}"
dest="${codir}"
tag="${wtpBuilderVersion}" />
</target>
@@ -257,11 +257,11 @@
name="initBuilders"
depends="check.clean"
if="doClean">
- <echo message="Version tag for $${env.releng}: ${mapVersionTag}" />
+ <echo message="Version tag for ${env.RELENG}: ${mapVersionTag}" />
<cvs
quiet="true"
cvsRoot="${mapCvsRoot}"
- package="$${env.releng}"
+ package="${env.RELENG}"
dest="${codir}"
tag="${mapVersionTag}" />
</target>