simplify build parameters
diff --git a/releng.control/checkout.xml b/releng.control/checkout.xml
index 1cad48a..7728cb4 100644
--- a/releng.control/checkout.xml
+++ b/releng.control/checkout.xml
@@ -25,27 +25,28 @@
<property
name="checkout.wtpbuilder.clean"
value="true" />
+
<property
name="mapVersionTag"
value="HEAD" />
- <property
- name="cvsProtocol"
- value="pserver" />
- <property
- name="cvsUser"
- value="anonymous" />
- <property
- name="cvsServer"
- value="dev.eclipse.org" />
- <property
- name="cvsRoot"
- value="/cvsroot/webtools" />
-
- <!-- end required defaults-if-not-set -->
-
-
-
- <!-- standard computed properties. Should not have to be changed. -->
+ <property
+ name="cvsProtocol"
+ value="${env.WTP_CVS_PROTOCOL}" />
+ <property
+ name="cvsUser"
+ value="${env.WTP_CVS_USER}" />
+ <property
+ name="cvsServer"
+ value="${env.WTP_CVS_SERVER}" />
+ <property
+ name="cvsRoot"
+ value="${env.WTP_CVS_ROOT}" />
+
+ <!-- end required defaults-if-not-set -->
+
+
+
+ <!-- standard computed properties. Should not have to be changed. -->
<property
name="mapCvsRoot"
value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}" />
@@ -143,13 +144,13 @@
package="${env.RELENG}"
dest="${codir}"
tag="R1_5_maintenance" />
- <cvs
- quiet="${env.CVS_QUIET}"
- reallyquiet="${env.CVS_REALLY_QUIET}"
- cvsRoot="${mapCvsRoot}"
- package="${env.RELENGMAPS}"
- dest="${codir}"
- tag="R1_5_maintenance" />
+ <cvs
+ quiet="${env.CVS_QUIET}"
+ reallyquiet="${env.CVS_REALLY_QUIET}"
+ cvsRoot="${mapCvsRoot}"
+ package="${env.RELENGMAPS}"
+ dest="${codir}"
+ tag="R1_5_maintenance" />
</target>
<target name="retest-wtp-R1.5-M">
<antcall target="wtp-R1.5-M" />
@@ -162,13 +163,13 @@
package="${env.RELENG}"
dest="${codir}"
tag="R2_0_maintenance" />
- <cvs
- quiet="${env.CVS_QUIET}"
- reallyquiet="${env.CVS_REALLY_QUIET}"
- cvsRoot="${mapCvsRoot}"
- package="${env.RELENGMAPS}"
- dest="${codir}"
- tag="R2_0_maintenance" />
+ <cvs
+ quiet="${env.CVS_QUIET}"
+ reallyquiet="${env.CVS_REALLY_QUIET}"
+ cvsRoot="${mapCvsRoot}"
+ package="${env.RELENGMAPS}"
+ dest="${codir}"
+ tag="R2_0_maintenance" />
<cvs
quiet="${env.CVS_QUIET}"
reallyquiet="${env.CVS_REALLY_QUIET}"
@@ -192,13 +193,13 @@
package="${env.RELENG}"
dest="${codir}"
tag="R2_0_maintenance" />
- <cvs
- quiet="${env.CVS_QUIET}"
- reallyquiet="${env.CVS_REALLY_QUIET}"
- cvsRoot="${mapCvsRoot}"
- package="${env.RELENGMAPS}"
- dest="${codir}"
- tag="R2_0_maintenance" />
+ <cvs
+ quiet="${env.CVS_QUIET}"
+ reallyquiet="${env.CVS_REALLY_QUIET}"
+ cvsRoot="${mapCvsRoot}"
+ package="${env.RELENGMAPS}"
+ dest="${codir}"
+ tag="R2_0_maintenance" />
<cvs
quiet="${env.CVS_QUIET}"
reallyquiet="${env.CVS_REALLY_QUIET}"
@@ -226,15 +227,15 @@
package="${env.RELENG}"
dest="${codir}"
tag="R1_5_maintenance" />
- <cvs
- quiet="${env.CVS_QUIET}"
- reallyquiet="${env.CVS_REALLY_QUIET}"
- cvsRoot="${mapCvsRoot}"
- package="${env.RELENGMAPS}"
- dest="${codir}"
- tag="R1_5_maintenance" />
+ <cvs
+ quiet="${env.CVS_QUIET}"
+ reallyquiet="${env.CVS_REALLY_QUIET}"
+ cvsRoot="${mapCvsRoot}"
+ package="${env.RELENGMAPS}"
+ dest="${codir}"
+ tag="R1_5_maintenance" />
</target>
-
+
<target name="patches-R1.5-P">
<cvs
quiet="${env.CVS_QUIET}"
@@ -243,13 +244,13 @@
package="${env.RELENG}"
dest="${codir}"
tag="R1_5_5_patches" />
- <cvs
- quiet="${env.CVS_QUIET}"
- reallyquiet="${env.CVS_REALLY_QUIET}"
- cvsRoot="${mapCvsRoot}"
- package="${env.RELENGMAPS}"
- dest="${codir}"
- tag="R1_5_5_patches" />
+ <cvs
+ quiet="${env.CVS_QUIET}"
+ reallyquiet="${env.CVS_REALLY_QUIET}"
+ cvsRoot="${mapCvsRoot}"
+ package="${env.RELENGMAPS}"
+ dest="${codir}"
+ tag="R1_5_5_patches" />
</target>
<target name="wtp-buildTools-R3.0-T">