aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Powell2010-10-15 09:15:57 -0400
committerSteve Powell2010-10-15 09:15:57 -0400
commitf5ce40938b5d4230e888e7db962786f964583cfc (patch)
tree025f500bf99024f3b6b95aac31a3dcc20a8f5e99
parentd5953f85fbfe4b3bf204ea73c5ed9d90c882adec (diff)
downloadorg.eclipse.virgo.virgo-build-f5ce40938b5d4230e888e7db962786f964583cfc.zip
org.eclipse.virgo.virgo-build-f5ce40938b5d4230e888e7db962786f964583cfc.tar.gz
org.eclipse.virgo.virgo-build-f5ce40938b5d4230e888e7db962786f964583cfc.tar.xz
Augment diagnostics target to include environment variables and all Ant properties.1.31
-rw-r--r--common/common.xml17
-rw-r--r--multi-bundle/common.xml23
2 files changed, 39 insertions, 1 deletions
diff --git a/common/common.xml b/common/common.xml
index 100885f..1e50686 100644
--- a/common/common.xml
+++ b/common/common.xml
@@ -138,8 +138,23 @@
<target name="diagnostics" description="diagnostics">
<sequential>
<echo>The diagnostics target was explicitly requested...</echo>
+ <echo>----Ant diagnostics-------------------------------</echo>
<diagnostics/>
- <echo>End of diagnostics requested.</echo>
+ <echo>----Properties--Ant-------------------------------</echo>
+ <echoproperties>
+ <propertyset>
+ <propertyref builtin="all"/>
+ </propertyset>
+ </echoproperties>
+ <echo>----Environment-----------------------------------</echo>
+ <property environment="env"/>
+ <echoproperties>
+ <propertyset>
+ <propertyref prefix="env."/>
+ </propertyset>
+ </echoproperties>
+ <echo>--------------------------------------------------</echo>
+ <fail message="Diagnostics output -- build aborted."/>
</sequential>
</target>
diff --git a/multi-bundle/common.xml b/multi-bundle/common.xml
index 5d829c0..3a9d5d5 100644
--- a/multi-bundle/common.xml
+++ b/multi-bundle/common.xml
@@ -64,6 +64,29 @@ httpclient.proxy-port=${http.proxyPort}
<echo>Property 'http.proxyHost' is set to '${http.proxyHost}' and property 'http.proxyPort' is set to '${http.proxyPort}'.</echo>
</target>
+ <target name="diagnostics" description="diagnostics">
+ <sequential>
+ <echo>The diagnostics target was explicitly requested...</echo>
+ <echo>----Ant diagnostics-------------------------------</echo>
+ <diagnostics/>
+ <echo>----Properties--Ant-------------------------------</echo>
+ <echoproperties>
+ <propertyset>
+ <propertyref builtin="all"/>
+ </propertyset>
+ </echoproperties>
+ <echo>----Environment-----------------------------------</echo>
+ <property environment="env"/>
+ <echoproperties>
+ <propertyset>
+ <propertyref prefix="env."/>
+ </propertyset>
+ </echoproperties>
+ <echo>--------------------------------------------------</echo>
+ <fail message="Diagnostics output -- build aborted."/>
+ </sequential>
+ </target>
+
<!-- Main targets -->
<target name="clean"
description="Removes the target directory.">