simplify build parameters
diff --git a/releng.control/cc.sh b/releng.control/cc.sh
index 4df1ac3..f678a13 100644
--- a/releng.control/cc.sh
+++ b/releng.control/cc.sh
@@ -17,8 +17,6 @@
rm -fr ./workspace
-export CCDIR=${BUILD_HOME}/apps/${CC_DIR_NAME}
-
CCNAME="Webtools"
# We want to execute CC itself in Java 5
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">
diff --git a/releng.control/commonComputedVariables.shsource b/releng.control/commonComputedVariables.shsource
index ea7e906..551ea5c 100644
--- a/releng.control/commonComputedVariables.shsource
+++ b/releng.control/commonComputedVariables.shsource
@@ -6,27 +6,21 @@
########################################################
-export PROJECT_HOME=`dirname "$0"`
-
-export ANT_HOME=${BUILD_HOME}/apps/${ANT_DIR}
-
-export JAVA_4_HOME=${BUILD_HOME}/apps/${JAVA_4_DIR}
-export JAVA_5_HOME=${BUILD_HOME}/apps/${JAVA_5_DIR}
+export PROJECT_HOME=${BUILD_HOME}/releng.control
export PATH=${PATH}:${HOME}/bin:${ANT_HOME}/bin:${JAVA_HOME}/bin
# project name is resolved dynamically, as CC runs
export LOG_DIR=${BUILD_HOME}/logs
-# need for some PPC or Linux issues?
+# need for some PPC or Linux issues
export JAVA_HIGH_ZIPFDS=500
-# Spec java 1.4 as default vm to use
+# Spec java 1.4 as default vm to use if
+# not otherwise specified.
+# TODO: do we still need this?
export JAVA_HOME=${JAVA_4_HOME}
-export CVS_RSH=ssh
-
-
# Set this to the relative path for the
# directory that keeps the downloaded drivers
# and pre-reqs
diff --git a/releng.control/commonVariations.shsource b/releng.control/commonVariations.shsource
index 4aa70a4..75b7ee5 100644
--- a/releng.control/commonVariations.shsource
+++ b/releng.control/commonVariations.shsource
@@ -17,10 +17,12 @@
echo "remember to check X virtual frame buffer is running for headless JUnit testing";
ps -ef | grep Xvfb
-export JAVA_4_DIR="IBMJava2-ppc-142"
-export JAVA_5_DIR="ibm-java2-ppc-50"
-export ANT_DIR="apache-ant-1.7.0"
-export CC_DIR_NAME="cruisecontrol-bin-2.7.1"
+# these should be full, abosolute path to the respective home directories
+# on this particular build machine
+export ANT_HOME=/shared/webtools/apps/apache-ant-1.7.0
+export JAVA_4_HOME=/shared/webtools/apps/IBMJava2-ppc-142
+export JAVA_5_HOME=/shared/webtools/apps/ibm-java2-ppc-50
+export CC_DIR=/shared/webtools/apps/cruisecontrol-bin-2.7.1
export BASEOS=linux
export BASEWS=gtk
@@ -29,6 +31,7 @@
# no local build properties, for production builds
# for local builds, this should be set to a real directory,
# so meaningful properties can be set for that local machine.
+# See the 'localBuildExample' directory for a starting example
export LOCAL_BUILD_PROPERTIES_DIR=
export BUILD_BUILDMASTER_EMAIL=wtpBuild@eclipse.org
@@ -40,11 +43,6 @@
# notifying users about those builds on your local machine
export SKIPUSERS=false
-# normally, cvs logging output can be "really quiet", but if problems, then it can be turned back on
-# to get more potentially diagnostic information
-export CVS_QUIET=false
-export CVS_REALLY_QUIET=false
-
# controls quietness of logging to console
# false means more output to console, true uses ant's logger
export USE_LOGGER=false
@@ -58,3 +56,27 @@
export USE_DEBUG=false
export USE_LOCAL_MAPS=false
+
+# normally, cvs logging output can be "really quiet", but if problems, then it can be turned back on
+# to get more potentially diagnostic information
+# TODO: if both of these are 'true' and error is generated by cvs ...
+# saying you can't set both to true.
+# we could put in some logic to prevent that, someday.
+export CVS_QUIET=false
+export CVS_REALLY_QUIET=false
+# these cvs values need to have write access if
+# build.trial is false, as on production machine.
+# This is the ID used to both read, and
+# to tag releng map files.
+#
+# Note:
+# 'ext' protocol typically requires
+# environment variable CVS_RSH to be set to ssh
+# So, we just always do it. Can't imagine it'd hurt
+# if protocol was pserver, but could be removed in that
+# case, if desired.
+export CVS_RSH=ssh
+export WTP_CVS_PROTOCOL=ext
+export WTP_CVS_USER=david_williams
+export WTP_CVS_SERVER=dev.eclipse.org
+export WTP_CVS_ROOT=/cvsroot/webtools
diff --git a/releng.control/localBuildExample/checkout.properties b/releng.control/localBuildExample/checkout.properties
index 759b529..ff21d58 100644
--- a/releng.control/localBuildExample/checkout.properties
+++ b/releng.control/localBuildExample/checkout.properties
@@ -11,11 +11,4 @@
#checkout.wtpbuilder.clean=true
-# these cvs values need to be "real" if
-# build.trial is false. This is the ID used
-# to tag releng map files per build.
-#cvsUser=david_williams
-# 'ext' protocol typically requires
-# environment variable CVS_RSH to be set to ssh
-# that is, CVS_RSH=ssh
-#cvsProtocol=ext
+
diff --git a/releng.control/somePathDirectory/commonVariations.shsource b/releng.control/somePathDirectory/commonVariations.shsource
index bedc812..f9c5309 100644
--- a/releng.control/somePathDirectory/commonVariations.shsource
+++ b/releng.control/somePathDirectory/commonVariations.shsource
@@ -20,13 +20,6 @@
echo "remember to check X virtual frame buffer is running for headless JUnit testing";
ps -ef | grep Xvfb
-# these are the required pre-req software needed, that is, directory names,
-# installed under the apps directroy, that is ${BUILD_HOME}/apps
-export JAVA_4_DIR="j2sdk1.4.2_15"
-export JAVA_5_DIR="jdk1.5.0_09"
-export ANT_DIR="apache-ant-1.7.0"
-export CC_DIR_NAME="cruisecontrol-bin-2.7.1-RC3"
-
export BASEOS=linux
export BASEWS=gtk
export BASEARCH=x86
diff --git a/releng.wtpbuilder/build.properties b/releng.wtpbuilder/build.properties
index 4c71f72..ed2ac22 100644
--- a/releng.wtpbuilder/build.properties
+++ b/releng.wtpbuilder/build.properties
@@ -90,14 +90,6 @@
# It must be relative to the buildHome
build.local.repository=downloads
-# This is the CVS Repository
-# that is used during the build process
-#
-cvsRoot=/cvsroot/webtools
-cvsServer=dev.eclipse.org
-cvsProtocol=ext
-cvsUser=david_williams
-
# Asks the compiler for verbose output. This should be set to true in order for *.bin.log files to be generated when
# using the JDT Compiler Adapter to compile.
javacVerbose=true
diff --git a/releng.wtpbuilder/components/dali-sdk/customTargets.xml b/releng.wtpbuilder/components/dali-sdk/customTargets.xml
index 4545aa8..a78d60a 100644
--- a/releng.wtpbuilder/components/dali-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/dali-sdk/customTargets.xml
@@ -5,6 +5,19 @@
<property environment="env" />
+ <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}" />
+
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
<!-- Add on <ant> task for each top level element being built. -->
diff --git a/releng.wtpbuilder/components/dali.tests/customTargets.xml b/releng.wtpbuilder/components/dali.tests/customTargets.xml
index 5baab6f..8e293d2 100644
--- a/releng.wtpbuilder/components/dali.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/dali.tests/customTargets.xml
@@ -5,6 +5,19 @@
<property environment="env" />
+ <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}" />
+
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
<!-- Add on <ant> task for each top level element being built. -->
diff --git a/releng.wtpbuilder/components/dali/customTargets.xml b/releng.wtpbuilder/components/dali/customTargets.xml
index 9a8ffad..d8689b7 100644
--- a/releng.wtpbuilder/components/dali/customTargets.xml
+++ b/releng.wtpbuilder/components/dali/customTargets.xml
@@ -5,6 +5,19 @@
<property environment="env" />
+ <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}" />
+
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
<!-- Add on <ant> task for each top level element being built. -->
diff --git a/releng.wtpbuilder/components/jst-sdk/customTargets.xml b/releng.wtpbuilder/components/jst-sdk/customTargets.xml
index e987071..0cd21c7 100644
--- a/releng.wtpbuilder/components/jst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/jst-sdk/customTargets.xml
@@ -5,6 +5,19 @@
<property environment="env" />
+ <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}" />
+
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
<!-- Add on <ant> task for each top level element being built. -->
diff --git a/releng.wtpbuilder/components/jst.tests/customTargets.xml b/releng.wtpbuilder/components/jst.tests/customTargets.xml
index 55aa719..dfa699e 100644
--- a/releng.wtpbuilder/components/jst.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/jst.tests/customTargets.xml
@@ -5,6 +5,19 @@
<property environment="env" />
+ <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}" />
+
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
<!-- Add on <ant> task for each top level element being built. -->
diff --git a/releng.wtpbuilder/components/jst/customTargets.xml b/releng.wtpbuilder/components/jst/customTargets.xml
index 0b193c4..21a7ced 100644
--- a/releng.wtpbuilder/components/jst/customTargets.xml
+++ b/releng.wtpbuilder/components/jst/customTargets.xml
@@ -5,6 +5,19 @@
<property environment="env" />
+ <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}" />
+
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
<!-- Add on <ant> task for each top level element being built. -->
diff --git a/releng.wtpbuilder/components/wst-sdk/customTargets.xml b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
index 3b6d4a9..d4e4a2f 100644
--- a/releng.wtpbuilder/components/wst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
@@ -5,6 +5,19 @@
<property environment="env" />
+ <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}" />
+
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
<!-- Add on <ant> task for each top level element being built. -->
diff --git a/releng.wtpbuilder/components/wst.tests/customTargets.xml b/releng.wtpbuilder/components/wst.tests/customTargets.xml
index da44a67..195618b 100644
--- a/releng.wtpbuilder/components/wst.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/wst.tests/customTargets.xml
@@ -5,6 +5,19 @@
<property environment="env" />
+ <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}" />
+
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
<!-- Add on <ant> task for each top level element being built. -->
diff --git a/releng.wtpbuilder/components/wst/customTargets.xml b/releng.wtpbuilder/components/wst/customTargets.xml
index ec03ede..b3e535e 100644
--- a/releng.wtpbuilder/components/wst/customTargets.xml
+++ b/releng.wtpbuilder/components/wst/customTargets.xml
@@ -5,6 +5,19 @@
<property environment="env" />
+ <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}" />
+
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
<!-- Add on <ant> task for each top level element being built. -->
diff --git a/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml b/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml
index 0cca809..1d58404 100644
--- a/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml
+++ b/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml
@@ -5,6 +5,19 @@
<property environment="env" />
+ <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}" />
+
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
<!-- Add on <ant> task for each top level element being built. -->
diff --git a/releng.wtpbuilder/components/wtp-patches-tests/customTargets.xml b/releng.wtpbuilder/components/wtp-patches-tests/customTargets.xml
index 803c139..0f5a710 100644
--- a/releng.wtpbuilder/components/wtp-patches-tests/customTargets.xml
+++ b/releng.wtpbuilder/components/wtp-patches-tests/customTargets.xml
@@ -10,6 +10,20 @@
<property environment="env" />
+ <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}" />
+
+
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
<!-- Add on <ant> task for each top level element being built. -->
diff --git a/releng.wtpbuilder/components/wtp-patches/customTargets.xml b/releng.wtpbuilder/components/wtp-patches/customTargets.xml
index 35bf808..b4aab9f 100644
--- a/releng.wtpbuilder/components/wtp-patches/customTargets.xml
+++ b/releng.wtpbuilder/components/wtp-patches/customTargets.xml
@@ -9,6 +9,19 @@
<property environment="env" />
+ <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}" />
+
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
<!-- Add on <ant> task for each top level element being built. -->
diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml
index c27aa7f..eeb28a3 100644
--- a/releng.wtpbuilder/scripts/build/runbuild.xml
+++ b/releng.wtpbuilder/scripts/build/runbuild.xml
@@ -123,12 +123,6 @@
name="buildBranch"
value="${buildBranch}" />
<property
- name="cvsUser"
- value="${cvsUser}" />
- <property
- name="cvsProtocol"
- value="${cvsProtocol}" />
- <property
name="dependencyTargets"
value="${wtp.builder.home}/scripts/dependency/build.xml" />
<property
@@ -355,8 +349,6 @@
<jvmarg
value="-Dreleng.dali-mapVersionTag=${releng.dali-mapVersionTag}" />
<jvmarg value="-DlogExtension=${logExtension}" />
- <jvmarg value="-DcvsUser=${cvsUser}" />
- <jvmarg value="-DcvsProtocol=${cvsProtocol}" />
<jvmarg value="-Dwtp.builder.home=${wtp.builder.home}" />
<jvmarg value="-Dbuild.distribution=${build.distribution}" />
<jvmarg value="-Dcomponent=${component}" />
@@ -392,8 +384,6 @@
value="-Dreleng-jsf-mapVersionTag=${releng-jsf-mapVersionTag}" />
<jvmarg
value="-Dreleng.dali-mapVersionTag=${releng.dali-mapVersionTag}" />
- <jvmarg value="-DcvsUser=${cvsUser}" />
- <jvmarg value="-DcvsProtocol=${cvsProtocol}" />
<jvmarg value="-DlogExtension=${logExtension}" />
<jvmarg value="-Dwtp.builder.home=${wtp.builder.home}" />
<jvmarg value="-Dbuild.distribution=${build.distribution}" />