From e88abb970f5a647e99230a5f0b97cc15d5e9f036 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Sun, 9 Dec 2012 20:27:57 +0000
Subject: 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.


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1419141 13f79535-47bb-0310-9956-ffa450edef68
---
 java/broker-plugins/management-http/build.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'java')

diff --git a/java/broker-plugins/management-http/build.xml b/java/broker-plugins/management-http/build.xml
index 734d762f17..abf35d9c88 100644
--- a/java/broker-plugins/management-http/build.xml
+++ b/java/broker-plugins/management-http/build.xml
@@ -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>
-- 
cgit v1.2.1