diff options
| author | Artur Signell <artur@vaadin.com> | 2011-12-08 16:44:12 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2011-12-08 18:00:59 +0200 |
| commit | a044f2fb78e61808c60a8717dea6036e82f6093d (patch) | |
| tree | bc8564e6116f132d71efff0ba59bc63e9414a7b7 /build | |
| parent | 2b824e1ab8932674d9bed130f2744b671cdb6330 (diff) | |
| download | vaadin-framework-a044f2fb78e61808c60a8717dea6036e82f6093d.tar.gz vaadin-framework-a044f2fb78e61808c60a8717dea6036e82f6093d.zip | |
Made test running from Eclipse work with Ivy
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 1 | ||||
| -rw-r--r-- | build/common.xml | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml index c63a46ac51..7c8044c82d 100644 --- a/build/build.xml +++ b/build/build.xml @@ -6,6 +6,7 @@ name="Vaadin" basedir="../" default="package-all"> + <property name="project.root" value=".."/> <!-- Import common targets --> <import file="./common.xml" /> diff --git a/build/common.xml b/build/common.xml index aff5c36cb3..2886a1698f 100644 --- a/build/common.xml +++ b/build/common.xml @@ -32,13 +32,13 @@ <!-- Ivy task definitions --> <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpath="${ivy.jar.file}" /> <!-- Ivy settings --> - <property name="ivy.settings.file" value="build/ivy/ivysettings.xml" /> + <property name="ivy.settings.file" value="${project.root}/build/ivy/ivysettings.xml" /> <ivy:configure/> </target> <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:resolve file="${project.root}/build/ivy/ivy.xml" conf="taskdefs" /> <ivy:cachepath pathid="taskdefs.classpath" conf="taskdefs" /> <taskdef resource="emma_ant.properties" classpathref="taskdefs.classpath" /> |