]> source.dussan.org Git - vaadin-framework.git/commitdiff
Removed duplicate target dependency
authorMikael Vappula <mikael@vaadin.com>
Fri, 25 Nov 2011 14:55:54 +0000 (16:55 +0200)
committerMikael Vappula <mikael@vaadin.com>
Fri, 25 Nov 2011 14:55:54 +0000 (16:55 +0200)
build/build.xml

index 886c395071b02e5032a0a045805100a86421e641..69ac1ea3db2890e7f9eaf9a5a096f45903be68d9 100644 (file)
@@ -7,7 +7,7 @@
          basedir="../" default="package-all">
 
     <!--Call one of package-* targets unless you understand what you are doing. -->
-    <target name="package-all" depends="clean-all, init, build, javadoc, internal-package-war, internal-package-liferay, differences, internal-package-liferay" description="Build public packages.">
+    <target name="package-all" depends="clean-all, init, build, javadoc, internal-package-war, internal-package-liferay, differences" description="Build public packages.">
     </target>
 
     <target name="package-jar" depends="clean-result, init, vaadin.jar" description="Create vaadin-x.y.z.jar file.">
@@ -35,7 +35,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="ivy.resolved">
         <!-- Ivy task definitions -->
        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpath="${ivy.jar.file}" />
            <!--  Ivy module descriptors -->