diff options
| -rw-r--r-- | build/build.xml | 1 | ||||
| -rw-r--r-- | build/common.xml | 4 | ||||
| -rw-r--r-- | tests/test.xml | 1 |
3 files changed, 4 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" /> diff --git a/tests/test.xml b/tests/test.xml index 6b5e27bebf..e67f5794b3 100644 --- a/tests/test.xml +++ b/tests/test.xml @@ -3,6 +3,7 @@ xmlns:ivy="antlib:org.apache.ivy.ant" name="Run Vaadin Testbench Tests" basedir="." default="run-and-clean-up"> + <property name="project.root" value=".."/> <!-- Import common targets --> <import file="../build/common.xml" /> |