try to get "tools only" build working again
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index e3c8e0e..e6513b3 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -190,7 +190,7 @@
<ant>
<property
name="dependencyFileLocation"
- value="helios/dependencies.properties"/>
+ value="juno/dependencies.properties"/>
<property
name="buildType"
diff --git a/releng.wtpbuilder/distribution/wtpbuildTools.build/build.xml b/releng.wtpbuilder/distribution/wtpbuildTools.build/build.xml
index aa2fe8e..28ede42 100644
--- a/releng.wtpbuilder/distribution/wtpbuildTools.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtpbuildTools.build/build.xml
@@ -47,58 +47,26 @@
value="wtp-buildTools"/>
</ant>
- <!-- copy early, if we can ... else site won't be created, if we fail -->
+ <!-- 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"/>
- <antcall target="handleCompilationProblems"/>
+
</target>
- <target
- name="handleCompilationProblems"
- depends="checkIfCompileProblems"
- if="compilation.problem.found">
- <!-- if there is a problem, leave a marker file in download directory, so the webpage can
- describe what happened -->
-
- <echo
- message="Compilation problems were found"
- file="${buildDirectory}/${buildLabel}/compilationProblems.txt"/>
-
- <!-- always force an early copy, before fail, so all results and files get to "downloads" area -->
- <ant antfile="${wtp.builder.home}/scripts/build/copyArtifactsEarly.xml"/>
- <fail
- if="compilation.problem.found"
- message="The remaining build and tests were canceled since compilation problems were found."/>
- </target>
-
- <target name="checkIfCompileProblems">
- <!--
- Not sure how reliable the presence of this 'compilation.problem' file is ...
- I just noticed it in recent PDE builds with compile problems.
- May have to make this "fancier" in future.
- For now, looks only one level down in plugins directory (in build's workdir) for a file with
- the name 'complilation.problem'. We may have a "summary" in xml file format, summarizing logs,
- ... but not sure then created (during site? We'd have to call site first. This way, we'll see if the match :) .
- -->
- <available
- file="compilation.problem"
- type="file"
- property="compilation.problem.found">
- <filepath>
- <dirset dir="${buildDirectory}">
- <include name="plugins/*"/>
- </dirset>
-
- </filepath>
- </available>
- <echo message="compilation.problem path buildDirectory: ${buildDirectory}/plugins/*/"/>
- </target>
<!-- invoking runbuild.xml targetting getBaseBuilder -->
<target
- name="getBaseBuilder">
+ name="getBaseBuilder"
+ if="eclipse.builder.fetch">
<ant
antfile="${wtp.builder.home}/scripts/build/runbuild.xml"