try to get "capabilities build" working again
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index e6513b3..ae5cd1a 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -262,7 +262,7 @@
<ant>
<property
name="dependencyFileLocation"
- value="helios/dependencies.properties"/>
+ value="juno/dependencies.properties"/>
<property
name="buildType"
diff --git a/releng.wtpbuilder/distribution/wtpcap.build/build.xml b/releng.wtpbuilder/distribution/wtpcap.build/build.xml
index e6024f8..2cbc3a2 100644
--- a/releng.wtpbuilder/distribution/wtpcap.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtpcap.build/build.xml
@@ -1,8 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
<project
default="build"
basedir=".">
<fail unless="wtp.builder.home"/>
<property file="${wtp.builder.home}/build.properties"/>
+
+ <property environment="env"/>
+
+ <!-- required to get proper value of doCreateFprojZips -->
+ <property
+ name="keyCfgFile"
+ value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
+ <echo
+ level="info"
+ message="keyCfgFile: ${keyCfgFile}"/>
+ <property file="${keyCfgFile}"/>
+
+ <echo message="transformedRepoLocation: ${transformedRepoLocation}"/>
+ <mkdir dir="${transformedRepoLocation}"/>
+
+
+ <!-- main -->
<target
name="build"
depends="getBaseBuilder">
@@ -10,16 +28,14 @@
<property
name="buildTargets"
value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
- <!--
- for this distribution, dependencies come from project's
- releng map project
- -->
+
+ <ant antfile="${wtp.builder.home}/scripts/build/label.xml"/>
+
<property
name="dependency.properties"
value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
- <!-- calling label.xml to createg label.properties file -->
- <ant antfile="${wtp.builder.home}/scripts/build/label.xml"/>
+
<echo
level="debug"
message="invoking buildTargets: ${buildTargets} to build for each component"/>
@@ -39,12 +55,23 @@
value="wtpcap_tests"/>
</ant>
- <!-- package -->
- <antcall target="package"/>
+ <!-- we fail for compilation problems only at end, so everything gets a chance to try
+ and compile -->
+ <ant antfile="${wtp.builder.home}/scripts/build/checkForCompilationProblems.xml"/>
+
+ <!--
+ copy early, before tests, packaging, etc., both for early look, and
+ to make sure we don't lose what we have, if there is a subsequent build failure.
+ -->
+ <ant antfile="${wtp.builder.home}/scripts/build/copyArtifactsEarly.xml"/>
+
+
</target>
<!-- invoking runbuild.xml targetting getBaseBuilder -->
- <target name="getBaseBuilder">
+ <target
+ name="getBaseBuilder"
+ if="eclipse.builder.fetch">
<ant
antfile="${wtp.builder.home}/scripts/build/runbuild.xml"