diff options
Diffstat (limited to 'uitest/build.xml')
| -rw-r--r-- | uitest/build.xml | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/uitest/build.xml b/uitest/build.xml index 99c0302abc..281d3707e9 100644 --- a/uitest/build.xml +++ b/uitest/build.xml @@ -36,7 +36,7 @@ <property name="result.dir" location="result" /> <property name="src" location="${result.dir}/../src" /> <property name="classes" location="${result.dir}/classes" /> - <property name="server.test.sources" location="${result.dir}/../../server/tests/src" /> + <property name="server.test.sources" location="${result.dir}/../../server/src/test/java" /> <mkdir dir="${classes}" /> <!-- TODO: Get rid of this --> @@ -132,7 +132,7 @@ </delete> <war destfile="${result.war}" duplicate="fail" index="true"> - <fileset dir="${common.jarfiles.dir}" /> + <!-- <fileset dir="${common.jarfiles.dir}" /> --> <fileset dir="${result.dir}"> <include name="VAADIN/widgetsets/**/*" /> <include name="VAADIN/themes/tests-valo*/**" /> @@ -222,7 +222,8 @@ <target name="test-tb3" depends="clean-testbench-errors"> <property name="war.file" - location="${vaadin.basedir}/result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" /> + location="${vaadin.basedir}/uitest/result/lib/vaadin-uitest-${vaadin.version}.war" /> + <mkdir dir="${vaadin.basedir}/result" /> <parallel> <daemons> <ant antfile="${uitest.dir}/vaadin-server.xml" @@ -316,7 +317,8 @@ <target name="copy-theme"> <fail unless="theme" message="You must give the theme name to copy n the 'theme' parameter" /> - <property name="theme.source.dir" location="../WebContent/VAADIN/themes" /> + <property name="theme.source.dir" location="../themes/src/main/resources/VAADIN/themes" /> + <property name="webcontent.source.dir" location="../WebContent/VAADIN/themes" /> <copy todir="${theme.result.dir}"> <fileset dir="${theme.source.dir}"> @@ -329,6 +331,19 @@ <exclude name="${theme}/**/*.scss" /> </fileset> </copy> + <copy todir="${theme.result.dir}"> + <fileset dir="${webcontent.source.dir}"> + <include name="${theme}/**/*.scss" /> + </fileset> + <filterset refid="filter-vaadin.version" /> + </copy> + <copy todir="${theme.result.dir}"> + <fileset dir="${webcontent.source.dir}"> + <exclude name="${theme}/**/*.scss" /> + </fileset> + </copy> + + </target> |