diff options
| author | Robert Gemmell <robbie@apache.org> | 2012-12-09 20:27:57 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2012-12-09 20:27:57 +0000 |
| commit | da1401760881f0a9b3c5de2f8ad83d76333cc607 (patch) | |
| tree | a52214a54ba3694b2b6b1e77c93ef7800ae845da /qpid/java | |
| parent | 4bfea76b97639a5ee4be2b6c113f7adecbeac04b (diff) | |
| download | qpid-python-da1401760881f0a9b3c5de2f8ad83d76333cc607.tar.gz | |
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@1419141 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/broker-plugins/management-http/build.xml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/qpid/java/broker-plugins/management-http/build.xml b/qpid/java/broker-plugins/management-http/build.xml index 734d762f17..abf35d9c88 100644 --- a/qpid/java/broker-plugins/management-http/build.xml +++ b/qpid/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> |