diff options
| author | Artur Signell <artur@vaadin.com> | 2013-06-06 23:48:25 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-06-07 06:34:23 +0000 |
| commit | bca14c0d095f63275cdbe46aca946673465c56d6 (patch) | |
| tree | b180c39230d71afae5ea2852f845e1cac2ddf76b /themes/build.xml | |
| parent | 1b0a214100e6270abea8b9f415a0873de88aab95 (diff) | |
| download | vaadin-framework-bca14c0d095f63275cdbe46aca946673465c56d6.tar.gz vaadin-framework-bca14c0d095f63275cdbe46aca946673465c56d6.zip | |
Correctly report theme version in the debug window (#11442)
* Adds a special v-vaadin-version selector for detecting the theme version
* The version in the base theme is replaced during build (for releases) and by the current version also when compiling in the IDE
Change-Id: Id6b94ab2edead61602fed021b7152f6e46be809f
Diffstat (limited to 'themes/build.xml')
| -rw-r--r-- | themes/build.xml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/themes/build.xml b/themes/build.xml index 5bca50e5f5..89c78b11b9 100644 --- a/themes/build.xml +++ b/themes/build.xml @@ -58,7 +58,13 @@ <copy todir="${theme.result.dir}"> <fileset dir="${theme.source.dir}"> - <include name="${theme}/**" /> + <include name="${theme}/**/*.scss" /> + </fileset> + <filterset refid="filter-vaadin.version"/> + </copy> + <copy todir="${theme.result.dir}"> + <fileset dir="${theme.source.dir}"> + <exclude name="${theme}/**/*.scss" /> </fileset> </copy> </target> @@ -84,8 +90,6 @@ <arg value="${theme}" /> <arg value="--theme-folder" /> <arg value="${theme.result.dir}" /> - <arg value="--theme-version" /> - <arg value="${vaadin.version}" /> <jvmarg value="-Xss8M" /> <jvmarg value="-XX:MaxPermSize=256M" /> <jvmarg value="-Djava.awt.headless=true" /> |