From 98ec1415dcfcf5a2d5654998fc2334c943bdb6e6 Mon Sep 17 00:00:00 2001
From: Mikael Vappula <mikael@vaadin.com>
Date: Mon, 5 Dec 2011 12:10:38 +0200
Subject: Prevent multiple ivy:configure calls

Added a controlling property deps.initialized to prevent multiple Ivy
configuration and task definition initialization within same Ant run.
---
 build/common.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'build')

diff --git a/build/common.xml b/build/common.xml
index 69e8065231..aff5c36cb3 100644
--- a/build/common.xml
+++ b/build/common.xml
@@ -13,7 +13,9 @@
     <property name="ivy.jar.file" value="${ivy.jar.dir}/${ivy.jar.name}" />
     
 	<target name="init-deps" description="Configure Ivy dependency management and load common task definitions" 
-		depends="ivy-configure, init-taskdefs" />
+		depends="init-taskdefs" unless="deps.initialized">
+        <property name="deps.initialized" value="1" />
+    </target>
 	
     <target name="check-ivy-installed">
    	    <available property="ivy.installed" file="${ivy.jar.file}"/>
@@ -26,7 +28,7 @@
         <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" dest="${ivy.jar.file}" usetimestamp="true"/>
     </target>
 
-    <target name="ivy-configure" depends="check-ivy-installed" >   	
+    <target name="ivy-configure" depends="check-ivy-installed" unless="deps.initialized">
     	<!-- Ivy task definitions -->
     	<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpath="${ivy.jar.file}" />
     	<!-- Ivy settings -->
@@ -34,7 +36,7 @@
 	    <ivy:configure/>
 	</target>
 	    	
-    <target name="init-taskdefs" depends="ivy-configure" >
+    <target name="init-taskdefs" depends="ivy-configure" unless="deps.initialized">
         <echo>Loading Ant tasks</echo>
         <ivy:resolve file="build/ivy/ivy.xml" conf="taskdefs" />
         <ivy:cachepath pathid="taskdefs.classpath" conf="taskdefs" />
-- 
cgit v1.2.3