Fix themes build script not to overwrite all theme files on every iteration. (#14575)

Change-Id: I58d19f7f5c9e45068b6cc8a7356e41d5d5bce5b6

diff --git a/themes/build.xml b/themes/build.xml
index c36e01cda61a20666a9540adbcaf1d78cf91df06..4a95c043fc88d87c4e2bf35a3ffd7085301a73f6 100644 (file)
--- 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>