summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSauli Tähkäpää <sauli@vaadin.com>2014-09-16 10:09:23 +0300
committerSauli Tähkäpää <sauli@vaadin.com>2014-09-16 10:09:23 +0300
commit3a4e1bb067931f454fa5bb2c1fbddea0402ad97f (patch)
tree225ac21e5042067b6b02b24d750bb8aca52579c4
parent22f09cfeafcae80a8660ac2dcbb3918597321187 (diff)
downloadvaadin-framework-3a4e1bb067931f454fa5bb2c1fbddea0402ad97f.tar.gz
vaadin-framework-3a4e1bb067931f454fa5bb2c1fbddea0402ad97f.zip
Fix themes build script not to overwrite all theme files on every iteration. (#14575)
Change-Id: I58d19f7f5c9e45068b6cc8a7356e41d5d5bce5b6
-rw-r--r--themes/build.xml10
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>