diff options
| author | Sauli Tähkäpää <sauli@vaadin.com> | 2014-09-16 10:09:23 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-09-19 10:24:11 +0000 |
| commit | 7386144a8ecda24624dd093bb019983ba66db505 (patch) | |
| tree | 24bd8a72e36d9bd0e493499bca7eaba4c86ac559 /themes | |
| parent | de544c1abf3782c116ae89f1357c6bfb21eb5292 (diff) | |
| download | vaadin-framework-7386144a8ecda24624dd093bb019983ba66db505.tar.gz vaadin-framework-7386144a8ecda24624dd093bb019983ba66db505.zip | |
Fix themes build script not to overwrite all theme files on every iteration. (#14575)
Change-Id: I58d19f7f5c9e45068b6cc8a7356e41d5d5bce5b6
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/build.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/themes/build.xml b/themes/build.xml index c36e01cda6..4a95c043fc 100644 --- a/themes/build.xml +++ b/themes/build.xml @@ -56,17 +56,17 @@ <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="../WebContent/VAADIN/themes/${theme}/" /> - <copy todir="${theme.result.dir}"> + <copy todir="${theme.result.dir}/${theme}"> <fileset dir="${theme.source.dir}"> - <include name="${theme}/**/*.scss" /> + <include name="**/*.scss" /> </fileset> <filterset refid="filter-vaadin.version" /> </copy> - <copy todir="${theme.result.dir}"> + <copy todir="${theme.result.dir}/${theme}"> <fileset dir="${theme.source.dir}"> - <exclude name="${theme}/**/*.scss" /> + <exclude name="**/*.scss" /> </fileset> </copy> </target> |