summaryrefslogtreecommitdiffstats
path: root/uitest/build.xml
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2016-03-28 12:19:15 +0300
committerTeemu Suo-Anttila <teemusa@vaadin.com>2016-03-29 12:21:12 +0300
commit1482d63643f3d03a7fa887a5de7cc251b1313a11 (patch)
tree2387a03fc3025bdee54fc99ac0c20d31cc959d12 /uitest/build.xml
parent730b552cc13ea596b0fe680ce40c053786c070f7 (diff)
downloadvaadin-framework-1482d63643f3d03a7fa887a5de7cc251b1313a11.tar.gz
vaadin-framework-1482d63643f3d03a7fa887a5de7cc251b1313a11.zip
Build vaadin-themes with maven
Change-Id: Ie40ea2c74358f6bf35a5a36a98561fd53fffe23f
Diffstat (limited to 'uitest/build.xml')
-rw-r--r--uitest/build.xml16
1 files changed, 15 insertions, 1 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>