diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2016-03-28 12:19:15 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2016-03-29 12:21:12 +0300 |
| commit | 1482d63643f3d03a7fa887a5de7cc251b1313a11 (patch) | |
| tree | 2387a03fc3025bdee54fc99ac0c20d31cc959d12 /uitest | |
| parent | 730b552cc13ea596b0fe680ce40c053786c070f7 (diff) | |
| download | vaadin-framework-1482d63643f3d03a7fa887a5de7cc251b1313a11.tar.gz vaadin-framework-1482d63643f3d03a7fa887a5de7cc251b1313a11.zip | |
Build vaadin-themes with maven
Change-Id: Ie40ea2c74358f6bf35a5a36a98561fd53fffe23f
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/build.xml | 16 | ||||
| -rw-r--r-- | uitest/ivy.xml | 2 |
2 files changed, 16 insertions, 2 deletions
diff --git a/uitest/build.xml b/uitest/build.xml index 279c50baf6..84e1e78d1b 100644 --- a/uitest/build.xml +++ b/uitest/build.xml @@ -345,7 +345,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}"> @@ -358,6 +359,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> diff --git a/uitest/ivy.xml b/uitest/ivy.xml index 6ae49b7d94..c41887fa0b 100644 --- a/uitest/ivy.xml +++ b/uitest/ivy.xml @@ -50,7 +50,7 @@ <exclude type="pom" /> </dependency> <dependency org="com.vaadin" name="vaadin-themes" - rev="${vaadin.version}" conf="build->build"> + rev="${vaadin.version}" conf="build->default"> <exclude type="pom" /> </dependency> <dependency org="com.vaadin" name="vaadin-push" rev="${vaadin.version}" |