Author: robbie
Date: Sun Dec 9 20:27:57 2012
New Revision: 1419141
URL: http://svn.apache.org/viewvc?rev=1419141&view=rev
Log:
NO-JIRA: only perform the uptodate check on dojo at the precompile point, after
the lib will have been downloaded and put in place by Ivy.
Prevents failure at the management-http module when using a fresh checkout and
running a non-build target (e.g clean) before the first build operation is
performed, as encountered occasionally on CI nodes.
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/build.xml
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/build.xml?rev=1419141&r1=1419140&r2=1419141&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/build.xml Sun Dec 9
20:27:57 2012
@@ -33,11 +33,9 @@
<!-- Flagfile used to determine if uwar needs to be done. ._ is part of
Ant's defaultexcludes so wont appear bundles -->
<property name="dojo.uptodate.flagfile"
value="${module.classes}/resources/dojo/._dojouptodate.timestamp" />
- <uptodate property="unwardojo.done" targetfile="${dojo.uptodate.flagfile}"
srcfile="${project.root}/${dojo}" />
-
<target name="precompile" depends="unwardojo" />
- <target name="unwardojo" unless="unwardojo.done">
+ <target name="unwardojo" depends="check-unwardojo.done"
unless="unwardojo.done">
<unwar src="${project.root}/${dojo}"
dest="${module.classes}/resources/dojo">
<patternset>
<exclude name="META-INF/**" />
@@ -48,5 +46,9 @@
<touch file="${dojo.uptodate.flagfile}" />
</target>
+ <target name="check-unwardojo.done">
+ <uptodate property="unwardojo.done"
targetfile="${dojo.uptodate.flagfile}" srcfile="${project.root}/${dojo}" />
+ </target>
+
<target name="bundle" depends="bundle-tasks" />
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
