From 3a4e1bb067931f454fa5bb2c1fbddea0402ad97f Mon Sep 17 00:00:00 2001
From: Sauli Tähkäpää <sauli@vaadin.com>
Date: Tue, 16 Sep 2014 10:09:23 +0300
Subject: Fix themes build script not to overwrite all theme files on every
 iteration. (#14575)

Change-Id: I58d19f7f5c9e45068b6cc8a7356e41d5d5bce5b6
---
 themes/build.xml | 10 +++++-----
 1 file 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>
-- 
cgit v1.2.3