quiet down CVS ouput
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index 9b43eca..55a926e 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -49,7 +49,10 @@
<log
dir="${logDir}"
encoding="ISO-8859-1">
- <delete every="10" unit="DAY" ignoreSuffix="true" />
+ <delete
+ every="10"
+ unit="DAY"
+ ignoreSuffix="true" />
</log>
<listeners>
<currentbuildstatuslistener />
@@ -119,7 +122,8 @@
<modificationset quietperiod="120">
<cvs
tag="R1_5_maintenance"
- module="releng" />
+ module="releng"
+ reallyQuiet="${env.CVS_REALLY_QUIET}" />
</modificationset>
<schedule interval="${time.oneHour}">
@@ -200,13 +204,16 @@
<modificationset quietperiod="120">
<cvs
tag="R2_0_maintenance"
- module="releng" />
+ module="releng"
+ reallyQuiet="${env.CVS_REALLY_QUIET}" />
<cvs
tag="R1_0_maintenance"
- module="releng.dali" />
+ module="releng.dali"
+ reallyQuiet="${env.CVS_REALLY_QUIET}" />
<cvs
tag="R1_0_maintenance"
- module="releng-jsf" />
+ module="releng-jsf"
+ reallyQuiet="${env.CVS_REALLY_QUIET}" />
</modificationset>
<schedule interval="${time.oneHour}">
@@ -293,9 +300,15 @@
<project name="wtp-R3.0-I">
<modificationset quietperiod="120">
- <cvs module="releng" />
- <cvs module="releng-jsf" />
- <cvs module="releng.dali" />
+ <cvs
+ module="releng"
+ reallyQuiet="${env.CVS_REALLY_QUIET}" />
+ <cvs
+ module="releng-jsf"
+ reallyQuiet="${env.CVS_REALLY_QUIET}" />
+ <cvs
+ module="releng.dali"
+ reallyQuiet="${env.CVS_REALLY_QUIET}" />
</modificationset>
<schedule interval="${time.oneHour}">
@@ -457,9 +470,15 @@
<!-- change 'forceOnly' to false when in milestone phase -->
<modificationset quietperiod="120">
- <cvs module="releng" />
- <cvs module="releng-jsf" />
- <cvs module="releng.dali" />
+ <cvs
+ module="releng"
+ reallyQuiet="${env.CVS_REALLY_QUIET}" />
+ <cvs
+ module="releng-jsf"
+ reallyQuiet="${env.CVS_REALLY_QUIET}" />
+ <cvs
+ module="releng.dali"
+ reallyQuiet="${env.CVS_REALLY_QUIET}" />
</modificationset>
<schedule interval="${time.oneHour}">
@@ -553,9 +572,15 @@
<!-- change forceOnly to false when in release phase -->
<modificationset quietperiod="120">
- <cvs module="releng" />
- <cvs module="releng-jsf" />
- <cvs module="releng.dali" />
+ <cvs
+ module="releng"
+ reallyQuiet="${env.CVS_REALLY_QUIET}" />
+ <cvs
+ module="releng-jsf"
+ reallyQuiet="${env.CVS_REALLY_QUIET}" />
+ <cvs
+ module="releng.dali"
+ reallyQuiet="${env.CVS_REALLY_QUIET}" />
</modificationset>
<schedule interval="${time.oneHour}">
@@ -641,7 +666,9 @@
</schedule>
</project>
- <project name="wtp-buildTools-R3.0-T" forceOnly="true">
+ <project
+ name="wtp-buildTools-R3.0-T"
+ forceOnly="true">
<schedule interval="${time.VeryVeryLongTime}">
<ant
antscript="${env.BUILD_HOME}/releng.control/ant.sh"
diff --git a/releng.control/checkout.xml b/releng.control/checkout.xml
index 12e5370..e86e6a1 100644
--- a/releng.control/checkout.xml
+++ b/releng.control/checkout.xml
@@ -10,7 +10,7 @@
the environment variables on your operating system are not, e.g. it will
be ${env.Path} not ${env.PATH} on Windows -->
<property environment="env" />
-
+
<!--
Let users override standard properties, if desired.
If directory, file, or some properties do not exist,
@@ -54,26 +54,23 @@
<target name="wtp-R3.0-N">
- <!--
- do not need, since we do nightly builds "on demand" only
- <cvs quiet="true" cvsRoot="${mapCvsRoot}" package="${wst}" dest="${codir}" />
- <cvs quiet="true" cvsRoot="${mapCvsRoot}" package="${jst}" dest="${codir}" />
- -->
-
</target>
+
<target name="retest-wtp-R3.0-N">
<antcall target="wtp-R3.0-N" />
</target>
<target name="wtp-R3.0-S">
<cvs
- quiet="true"
+ quiet="${env.CVS_QUIET}"
+ reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
package="releng-jsf"
dest="${codir}"
tag="HEAD" />
<cvs
- quiet="true"
+ quiet="${env.CVS_QUIET}"
+ reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
package="releng.dali"
dest="${codir}"
@@ -85,13 +82,15 @@
<target name="wtp-R3.0-I">
<cvs
- quiet="true"
+ quiet="${env.CVS_QUIET}"
+ reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
package="releng-jsf"
dest="${codir}"
tag="HEAD" />
<cvs
- quiet="true"
+ quiet="${env.CVS_QUIET}"
+ reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
package="releng.dali"
dest="${codir}"
@@ -103,13 +102,15 @@
<target name="wtp-R3.0-R">
<cvs
- quiet="true"
+ quiet="${env.CVS_QUIET}"
+ reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
package="releng-jsf"
dest="${codir}"
tag="HEAD" />
<cvs
- quiet="true"
+ quiet="${env.CVS_QUIET}"
+ reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
package="releng.dali"
dest="${codir}"
@@ -122,7 +123,8 @@
<target name="wtp-R1.5-M">
<cvs
- quiet="true"
+ quiet="${env.CVS_QUIET}"
+ reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
package="${releng}"
dest="${codir}"
@@ -133,19 +135,22 @@
</target>
<target name="wtp-R2.0-M">
<cvs
- quiet="true"
+ quiet="${env.CVS_QUIET}"
+ reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
package="${releng}"
dest="${codir}"
tag="R2_0_maintenance" />
<cvs
- quiet="true"
+ quiet="${env.CVS_QUIET}"
+ reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
package="releng.dali"
dest="${codir}"
tag="R1_0_maintenance" />
<cvs
- quiet="true"
+ quiet="${env.CVS_QUIET}"
+ reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
package="releng-jsf"
dest="${codir}"
@@ -158,7 +163,8 @@
<target name="jem-R1.5-M">
<cvs
- quiet="true"
+ quiet="${env.CVS_QUIET}"
+ reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
package="${releng}"
dest="${codir}"
@@ -166,7 +172,8 @@
</target>
<target name="patches-R1.5-P">
<cvs
- quiet="true"
+ quiet="${env.CVS_QUIET}"
+ reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
package="${releng}"
dest="${codir}"
@@ -175,7 +182,8 @@
<target name="wtp-buildTools-R3.0-T">
<cvs
- quiet="true"
+ quiet="${env.CVS_QUIET}"
+ reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
package="releng"
dest="${codir}"
@@ -203,7 +211,8 @@
<echo
message="Version tag for ${releng.wtpbuilder} is: ${wtpBuilderVersion}" />
<cvs
- quiet="true"
+ quiet="${env.CVS_QUIET}"
+ reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
package="${releng.wtpbuilder}"
dest="${codir}"
diff --git a/releng.control/commonVariations.shsource b/releng.control/commonVariations.shsource
index 3825fa5..5496fb9 100644
--- a/releng.control/commonVariations.shsource
+++ b/releng.control/commonVariations.shsource
@@ -35,4 +35,9 @@
# for builds on local machines, SKIPUSERS should be 'true' to avoid
# notifying users about those builds on your local machine
-export SKIPUSERS=false
\ No newline at end of file
+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=true
+export CVS_REALLY_QUIET=true
diff --git a/releng.control/somePathDirectory/commonVariations.shsource b/releng.control/somePathDirectory/commonVariations.shsource
index 4974286..0db7d18 100644
--- a/releng.control/somePathDirectory/commonVariations.shsource
+++ b/releng.control/somePathDirectory/commonVariations.shsource
@@ -38,4 +38,9 @@
# for builds on local machines, SKIPUSERS should be 'true' to avoid
# notifying users about those builds on your local machine
-export SKIPUSERS=true
\ No newline at end of file
+export SKIPUSERS=true
+
+# normally, cvs logging output can be "real quiet", but if problems, then it can be turned back on
+# to get more potentially diagnostic information
+export CVS_QUIET=true
+export CVS_REALLY_QUIET=true
diff --git a/releng.control/whatisfixed.xml b/releng.control/whatisfixed.xml
index 002a1db..c518a7e 100644
--- a/releng.control/whatisfixed.xml
+++ b/releng.control/whatisfixed.xml
@@ -1,76 +1,113 @@
-<project name="whatisfixed" default="whatisfixed" basedir=".">
+<project
+ name="whatisfixed"
+ default="whatisfixed"
+ basedir=".">
<!-- = = = standard properties pattern = = = -->
<!--
- Note to be cross-platform, "environment variables" are only appropriate for
+ Note to be cross-platform, "environment variables" are only appropriate for
some variables, e.g. ones we set, since properties are case sensitive, even if
the environment variables on your operating system are not, e.g. it will
be ${env.Path} not ${env.PATH} on Windows -->
<property environment="env" />
-
+
<!--
- Let users override standard properties, if desired.
- If directory, file, or some properties do not exist,
- then standard properties will be used.
- -->
- <property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+ Let users override standard properties, if desired.
+ If directory, file, or some properties do not exist,
+ then standard properties will be used.
+ -->
+ <property
+ file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
<!-- load standard properties for production environment -->
- <property file="${env.STANDARD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+ <property
+ file="${env.STANDARD_PROPERTIES_DIR}/${ant.project.name}.properties" />
<!-- = = = end standard properties pattern = = = -->
- <target name="whatisfixed" depends="clean">
+ <target
+ name="whatisfixed"
+ depends="clean">
- <mkdir dir="${whatisfixed.workdir}" />
- <antcall target="releng" />
+ <mkdir dir="${whatisfixed.workdir}" />
+ <antcall target="releng" />
- <!-- create what-is-fixed summary files -->
- <ant antfile="${wtpBuilder}">
- <property name="wtp.builder.home" value="${whatisfixed.workdir}/releng.wtpbuilder" />
- <property name="buildBranch" value="${buildBranch}" />
- <property name="wtpbuilder.whatisfixed.properties.file" value="${basedir}/whatisfixed.properties" />
- </ant>
+ <!-- create what-is-fixed summary files -->
+ <ant antfile="${wtpBuilder}">
+ <property
+ name="wtp.builder.home"
+ value="${whatisfixed.workdir}/releng.wtpbuilder" />
+ <property
+ name="buildBranch"
+ value="${buildBranch}" />
+ <property
+ name="wtpbuilder.whatisfixed.properties.file"
+ value="${basedir}/whatisfixed.properties" />
+ </ant>
- <antcall target="sync" />
+ <antcall target="sync" />
- </target>
+ </target>
- <target name="releng">
+ <target name="releng">
- <available file="${whatisfixed.workdir}/releng/maps/dependencies.properties" property="map.exists" />
- <available file="${whatisfixed.workdir}/releng.wtpbuilder/scripts/dependency/build.xml" property="releng.exists" />
- <antcall target="checkout-maps" />
- <antcall target="getwtpbuilder" />
- </target>
+ <available
+ file="${whatisfixed.workdir}/releng/maps/dependencies.properties"
+ property="map.exists" />
+ <available
+ file="${whatisfixed.workdir}/releng.wtpbuilder/scripts/dependency/build.xml"
+ property="releng.exists" />
+ <antcall target="checkout-maps" />
+ <antcall target="getwtpbuilder" />
+ </target>
- <target name="checkout-maps" unless="map.exists">
- <cvs quiet="true" cvsRoot="${mapCvsRoot}" package="releng/maps/build.cfg" dest="${whatisfixed.workdir}" tag="${wtp.cvsTag}" />
- </target>
+ <target
+ name="checkout-maps"
+ unless="map.exists">
+ <cvs
+ quiet="${env.CVS_QUIET}"
+ reallyquiet="${env.CVS_REALLY_QUIET}"
+ cvsRoot="${mapCvsRoot}"
+ package="releng/maps/build.cfg"
+ dest="${whatisfixed.workdir}"
+ tag="${wtp.cvsTag}" />
+ </target>
- <target name="getwtpbuilder" unless="releng.exists">
- <property file="${whatisfixed.workdir}/releng/maps/build.cfg" />
- <delete dir="${whatisfixed.workdir}/releng.wtpbuilder" failonerror="false" />
- <echo message="Version tag for releng.wtpbuilder is: ${wtpBuilderVersion}" />
- <cvs quiet="true" cvsRoot="${mapCvsRoot}" package="releng.wtpbuilder" dest="${whatisfixed.workdir}" tag="${wtpBuilderVersion}" />
- </target>
+ <target
+ name="getwtpbuilder"
+ unless="releng.exists">
+ <property file="${whatisfixed.workdir}/releng/maps/build.cfg" />
+ <delete
+ dir="${whatisfixed.workdir}/releng.wtpbuilder"
+ failonerror="false" />
+ <echo
+ message="Version tag for releng.wtpbuilder is: ${wtpBuilderVersion}" />
+ <cvs
+ quiet="${env.CVS_QUIET}"
+ reallyquiet="${env.CVS_REALLY_QUIET}"
+ cvsRoot="${mapCvsRoot}"
+ package="releng.wtpbuilder"
+ dest="${whatisfixed.workdir}"
+ tag="${wtpBuilderVersion}" />
+ </target>
- <target name="clean" >
- <delete dir="${whatisfixed.workdir}" />
- </target>
+ <target name="clean">
+ <delete dir="${whatisfixed.workdir}" />
+ </target>
- <target name="sync" >
+ <target name="sync">
- <echo message="RSYNC to: ${uploadRemoteDirectory}" />
+ <echo message="RSYNC to: ${uploadRemoteDirectory}" />
- <exec executable="rsync">
- <arg line="-e ssh -Cavz ${whatisfixed.dir} ${uploadUser}@${uploadServer}:${uploadRemoteDirectory}" />
- </exec>
- </target>
-
+ <exec executable="rsync">
+ <arg
+ line="-e ssh -Cavz ${whatisfixed.dir} ${uploadUser}@${uploadServer}:${uploadRemoteDirectory}" />
+ </exec>
+ </target>
+
</project>