Change-Id: Ie80f2bad49f38a2391a8a560825aceb19f82de0atags/7.1.5
@@ -32,7 +32,7 @@ | |||
<target name="init-taskdefs" depends="ivy-configure" unless="deps.initialized"> | |||
<echo>Loading Ant tasks</echo> | |||
<ivy:resolve file="${project.root}/build/ivy/ivy.xml" conf="taskdefs" /> | |||
<ivy:resolve log="download-only" file="${project.root}/build/ivy/ivy.xml" conf="taskdefs" /> | |||
<ivy:cachepath pathid="taskdefs.classpath" conf="taskdefs" /> | |||
<taskdef resource="emma_ant.properties" classpathref="taskdefs.classpath" /> | |||
@@ -13,17 +13,17 @@ | |||
<property name="work.dir" location="work" /> | |||
<echo>Using gwt files from ${gwt.user.classes} and ${gwt.dev.classes}</echo> | |||
<ivy:resolve file="client-compiler/ivy.xml" conf="ide" /> | |||
<ivy:resolve log="download-only" file="client-compiler/ivy.xml" conf="ide" /> | |||
<ivy:cachepath pathid="client-compiler.deps" conf="ide" /> | |||
<ivy:resolve file="server/ivy.xml" conf="ide" /> | |||
<ivy:resolve log="download-only" file="server/ivy.xml" conf="ide" /> | |||
<ivy:cachepath pathid="server.deps" conf="ide" /> | |||
<ivy:resolve file="client/ivy.xml" conf="ide" /> | |||
<ivy:resolve log="download-only" file="client/ivy.xml" conf="ide" /> | |||
<ivy:cachepath pathid="client.deps" conf="ide" /> | |||
<ivy:resolve file="shared/ivy.xml" conf="ide" /> | |||
<ivy:resolve log="download-only" file="shared/ivy.xml" conf="ide" /> | |||
<ivy:cachepath pathid="shared.deps" conf="ide" /> | |||
<ivy:resolve file="uitest/ivy.xml" conf="ide" /> | |||
<ivy:resolve log="download-only" file="uitest/ivy.xml" conf="ide" /> | |||
<ivy:cachepath pathid="uitest.deps" conf="ide" /> | |||
<ivy:resolve file="theme-compiler/ivy.xml" conf="ide" /> | |||
<ivy:resolve log="download-only" file="theme-compiler/ivy.xml" conf="ide" /> | |||
<ivy:cachepath pathid="theme-compiler.deps" conf="ide" /> | |||
<path id="classpath"> | |||
@@ -104,7 +104,7 @@ | |||
<echo>Compiling ${module} to ${module.output.dir} with parameters -logLevel TRACE -style ${style} -localWorkers ${localWorkers} -strict ${extraParams}</echo> | |||
<!--<ivy:resolve inline="true" organisation="javax.validation" module="validation-api" | |||
<!--<ivy:resolve log="download-only" inline="true" organisation="javax.validation" module="validation-api" | |||
revision="1.0.0.GA"/> --> | |||
<!-- compile the module --> |
@@ -40,7 +40,7 @@ | |||
<target name="compile-module-cache"> | |||
<fail unless="module" message="You must give the module to compile in the 'module' parameter" /> | |||
<ivy:resolve resolveid="common" conf="compile-module" /> | |||
<ivy:resolve log="download-only" resolveid="common" conf="compile-module" /> | |||
<ivy:cachepath pathid="classpath.compile.widgetset" conf="compile-module" /> | |||
<echo>Creating gwtar files for ${module} in ${gwtar.dir}</echo> | |||
@@ -63,7 +63,7 @@ | |||
<property name="localWorkers" value="2" /> | |||
<property name="extraParams" value="" /> | |||
<ivy:resolve resolveid="common" conf="compile-module" /> | |||
<ivy:resolve log="download-only" resolveid="common" conf="compile-module" /> | |||
<ivy:cachepath pathid="classpath.compile.widgetset" conf="compile-module" /> | |||
<mkdir dir="${module.output.dir}" /> |
@@ -14,7 +14,7 @@ | |||
<ivy:settings file="${vaadin.basedir}/ivysettings.xml" /> | |||
<ivy:settings file="${vaadin.basedir}/ivysettings.xml" id="ivysettings" /> | |||
<ivy:resolve file="${vaadin.basedir}/ivy-taskdefs.xml" conf="taskdefs" log="quiet" /> | |||
<ivy:resolve log="download-only" file="${vaadin.basedir}/ivy-taskdefs.xml" conf="taskdefs" /> | |||
<ivy:cachepath pathid="taskdefs.classpath" conf="taskdefs" /> | |||
<taskdef uri="antlib:net.sf.antcontrib" resource="net/sf/antcontrib/antlib.xml" classpathref="taskdefs.classpath" /> | |||
<!-- ant contrib for Maven integration --> | |||
@@ -354,12 +354,12 @@ | |||
<target name="dependencies" description="Resolves dependencies needed by this module"> | |||
<property name='conf' value="build, build-provided" /> | |||
<ivy:resolve resolveid="common" conf="${conf}" /> | |||
<ivy:resolve log="download-only" resolveid="common" conf="${conf}" /> | |||
<ivy:cachepath pathid="classpath.compile.dependencies" conf="${conf}" /> | |||
</target> | |||
<target name="dependencies.test" description="Resolves dependencies needed by test"> | |||
<ivy:resolve resolveid="common" conf="test" /> | |||
<ivy:resolve log="download-only" resolveid="common" conf="test" /> | |||
<ivy:cachepath pathid="classpath.test.dependencies" conf="test" /> | |||
</target> | |||
@@ -372,7 +372,7 @@ | |||
<fail unless="result.dir" message="No result.dir parameter given" /> | |||
<property name="conf" value="*(public)" /> | |||
<ivy:resolve conf="${conf}" /> | |||
<ivy:resolve log="download-only" conf="${conf}" /> | |||
<ivy:publish settingsref="ivysettings" conf="${conf}" resolver="build-temp" overwrite="true" forcedeliver="true"> | |||
<!-- <artifacts pattern="${result.dir}/[artifact]-[revision].[ext]" | |||
/> --> | |||
@@ -384,7 +384,7 @@ | |||
<target name="publish.to.local.maven"> | |||
<property name="conf" value="*(public)" /> | |||
<ivy:resolve conf="${conf}" /> | |||
<ivy:resolve log="download-only" conf="${conf}" /> | |||
<ivy:publish conf="${conf}" resolver="local-maven" overwrite="true"> | |||
</ivy:publish> | |||
</target> |
@@ -41,7 +41,7 @@ | |||
<target name="publish.module.to.download.site"> | |||
<fail unless="module" message="No module to publish defined" /> | |||
<ivy:resolve file="${module}/ivy.xml" /> | |||
<ivy:resolve log="download-only" file="${module}/ivy.xml" /> | |||
<ivy:publish publishivy="false" settingsref="publish.settings" conf="*(public)" resolver="sftp-publish"> | |||
<artifacts pattern="${ivy.settings.dir}/result/artifacts/[revision]/[module]/[artifact]-[revision](-[classifier]).[ext]" /> | |||
</ivy:publish> | |||
@@ -52,7 +52,7 @@ | |||
<property file="${gpg.passphrase.file}" /> | |||
<!-- Ivy should be able to handle this but this does not work at | |||
the moment <ivy:resolve file="${module}/ivy.xml" /> <ivy:publish pubrevision="7.0-SNAPSHOT" | |||
the moment <ivy:resolve log="download-only" file="${module}/ivy.xml" /> <ivy:publish pubrevision="7.0-SNAPSHOT" | |||
publishivy="false" settingsref="publish.settings" conf="*(public)" resolver="sonatype"> | |||
<artifacts pattern="${ivy.settings.dir}/result/artifacts/${vaadin.version}/[module]/[artifact]-${vaadin.version}(-[classifier]).[ext]" | |||
/> </ivy:publish> --> |
@@ -22,7 +22,7 @@ | |||
</union> | |||
<target name="compile-themes"> | |||
<ivy:resolve resolveid="common" conf="build" /> | |||
<ivy:resolve log="download-only" resolveid="common" conf="build" /> | |||
<ivy:cachepath pathid="classpath.compile.theme" conf="build" /> | |||
<antcall target="compile-theme"> | |||
@@ -69,7 +69,7 @@ | |||
<target name="compile-theme" depends="copy-theme"> | |||
<fail unless="theme" message="You must give the theme name to compile in the 'theme' parameter" /> | |||
<ivy:resolve resolveid="common" conf="compile-theme" /> | |||
<ivy:resolve log="download-only" resolveid="common" conf="compile-theme" /> | |||
<ivy:cachepath pathid="classpath.compile.theme" conf="compile-theme" /> | |||
<ivy:cachepath pathid="classpath.runtime.theme" conf="build" /> | |||
@@ -19,7 +19,7 @@ | |||
<!-- This is copied from common.xml to be able to add server.test.source | |||
to the source path --> | |||
<ivy:resolve resolveid="common" conf="build, build-provided" /> | |||
<ivy:resolve log="download-only" resolveid="common" conf="build, build-provided" /> | |||
<ivy:cachepath pathid="classpath.compile.dependencies" conf="build, build-provided" /> | |||
</target> | |||
@@ -97,7 +97,7 @@ | |||
<property name="deps.dir" location="${result.dir}/deps" /> | |||
<property name="src" location="${result.dir}/../src" /> | |||
<ivy:resolve resolveid="common" conf="build" /> | |||
<ivy:resolve log="download-only" resolveid="common" conf="build" /> | |||
<ivy:cachepath pathid="classpath.runtime.dependencies" conf="build" /> | |||
<delete dir="${deps.dir}" /> |
@@ -6,7 +6,7 @@ | |||
<target name="deploy-and-start"> | |||
<fail unless="war.file" message="No war file given in 'war.file'" /> | |||
<ivy:resolve file="${dir}/ivy.xml" /> | |||
<ivy:resolve log="download-only" file="${dir}/ivy.xml" /> | |||
<ivy:cachepath pathid="classpath.jetty" conf="jetty-run" /> | |||
<java classname="org.mortbay.jetty.runner.Runner" fork="yes" output="${vaadin.basedir}/result/jetty.java.out" resultproperty="resultCode"> | |||
<arg value="--port" /> |