diff options
| author | Mikael Vappula <mikael@vaadin.com> | 2011-12-05 12:10:38 +0200 |
|---|---|---|
| committer | Mikael Vappula <mikael@vaadin.com> | 2011-12-05 12:10:38 +0200 |
| commit | 98ec1415dcfcf5a2d5654998fc2334c943bdb6e6 (patch) | |
| tree | c83ce76f477102864211bd150b2b0fd08a768d05 /build/common.xml | |
| parent | c1ac1f6b1f0675dece725c5b9d04a8823335cb09 (diff) | |
| download | vaadin-framework-98ec1415dcfcf5a2d5654998fc2334c943bdb6e6.tar.gz vaadin-framework-98ec1415dcfcf5a2d5654998fc2334c943bdb6e6.zip | |
Prevent multiple ivy:configure calls
Added a controlling property deps.initialized to prevent multiple Ivy
configuration and task definition initialization within same Ant run.
Diffstat (limited to 'build/common.xml')
| -rw-r--r-- | build/common.xml | 8 |
1 files changed, 5 insertions, 3 deletions
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" /> |