diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml index d4694145d2ba65726a00d1565720155d143baea2..2e6176f3ba26ccffd507e6897edf5e95e64a6b40 100644 --- a/releng.control/cc_config.xml +++ b/releng.control/cc_config.xml @@ -70,7 +70,7 @@ buildfile="${env.RELENG_CONTROL}/cc_copyArtifacts.xml" target="copyArtifacts" useQuiet="true" - useLogger="false" > + useLogger="false"> <property name="localArtifactsDirectory" value="${env.PROJECT_ARTIFACTS}/${project.name}" /> @@ -344,13 +344,13 @@ quietperiod="120"> <cvs module="${env.RELENGMAPS}" - reallyquiet="${env.CVS_REALLY_QUIET}" /> + reallyquiet="${env.CVS_REALLY_QUIET}" /> <cvs module="${env.RELENGJSF}" - reallyquiet="${env.CVS_REALLY_QUIET}" /> + reallyquiet="${env.CVS_REALLY_QUIET}" /> <cvs module="${env.RELENGDALI}" - reallyquiet="${env.CVS_REALLY_QUIET}" /> + reallyquiet="${env.CVS_REALLY_QUIET}" /> </modificationset> <schedule interval="${time.oneHour}"> @@ -382,6 +382,9 @@ <property name="build.pack-all-in-one" value="true" /> + <property + name="skipCleanBuild" + value="yes" /> </ant> </schedule> </project> diff --git a/releng.control/cc_project_build.xml b/releng.control/cc_project_build.xml index 671fd9e61d1e0e952b481045e5522041f3574b8e..21ae9129aae6673390b737dd9660ee9a19f0b821 100644 --- a/releng.control/cc_project_build.xml +++ b/releng.control/cc_project_build.xml @@ -3,12 +3,6 @@ default="Build" basedir="."> - <!-- set main builder file name, based on distribution, buildBranch and build type --> - <property - name="builder" - value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG_BUILDER}/build.xml" /> - - <!-- = = = standard properties pattern = = = --> <!-- Note to be cross-platform, "environment variables" are only appropriate for @@ -33,6 +27,11 @@ name="build.clean" value="true" /> + <!-- set main builder file name, based on distribution, buildBranch and build type --> + <property + name="builder" + value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG_BUILDER}/build.xml" /> + <!-- If not set yet, by "caller", then fail fast. Normally this is literally the project name from CruiseControl, but