diff options
| author | Henri Sara <henri.sara@itmill.com> | 2011-07-13 12:41:14 +0000 |
|---|---|---|
| committer | Henri Sara <henri.sara@itmill.com> | 2011-07-13 12:41:14 +0000 |
| commit | 9ad746a28dd8f4fdff2fb662963059eaaad25b94 (patch) | |
| tree | 3f3436772cd216109899cee2c09956e94c9d112f /build | |
| parent | 9365218297e1fb190347eef95651e92cd5a03fe5 (diff) | |
| download | vaadin-framework-9ad746a28dd8f4fdff2fb662963059eaaad25b94.tar.gz vaadin-framework-9ad746a28dd8f4fdff2fb662963059eaaad25b94.zip | |
#7258 Ant tasks JAR locations in build.xml can be set as properties from outside the build
svn changeset:19730/svn branch:6.6
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml index d6bdfa6dd1..cc85563200 100644 --- a/build/build.xml +++ b/build/build.xml @@ -30,16 +30,20 @@ <target name="package-test" depends="clean-result, nightly-init, package-init, init, build, docs, internal-package-zip, nightly-publish"> </target> + <!-- Locations of Ant task JARs - build properties not yet read at this point --> + <property name="ant.task.jar.antcontrib" value="build/lib/ant-contrib-1.0b3.jar" /> + <property name="ant.task.jar.maven" value="build/lib/maven-ant-tasks-2.0.10.jar" /> + <!-- ant contrib required for flow control (for loop, if, property override) --> <!-- Note that we have to use a namespace to avoid clash when running sub-ant. --> <taskdef uri="antlib:net.sf.antcontrib" resource="net/sf/antcontrib/antlib.xml"> <classpath> - <pathelement location="build/lib/ant-contrib-1.0b3.jar" /> + <pathelement location="${ant.task.jar.antcontrib}" /> </classpath> </taskdef> <!-- ant contrib for Maven integration --> - <path id="maven-ant-tasks.classpath" path="build/lib/maven-ant-tasks-2.0.10.jar" /> + <path id="maven-ant-tasks.classpath" path="${ant.task.jar.maven}" /> <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" /> |