diff options
| author | Jonatan Kronqvist <jonatan@vaadin.com> | 2014-03-28 12:55:33 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-03-31 13:37:27 +0000 |
| commit | 353a1a1c3073975ddc6d0f25d8d2b21b9df94343 (patch) | |
| tree | 73c62e2c993c3c035fe2ba242c5f9583ebe2f54d /themes | |
| parent | 74bfd5e20759f0c26b40b41754129cbd71e0eff3 (diff) | |
| download | vaadin-framework-353a1a1c3073975ddc6d0f25d8d2b21b9df94343.tar.gz vaadin-framework-353a1a1c3073975ddc6d0f25d8d2b21b9df94343.zip | |
Remove theme-compiler and replace with external vaadin-sass-compiler
* Moves CompileTheme from the theme-compiler to buildhelpers
* Refactors CompileTheme to get the Vaadin version on the command line
instead of using the Version class found in vaadin-shared
* Refactors build scripts to pass the version number on the command line
when running CompileTheme
* Removes the theme-compiler module/project/whatchamacallit
* Replaces the theme-compiler dependency with vaadin-sass-compiler 0.9.0
from maven
Change-Id: I4f98d15b60e18a826bf264eb55d12b3e736e8e54
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/build.xml | 2 | ||||
| -rw-r--r-- | themes/ivy.xml | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/themes/build.xml b/themes/build.xml index 93959e054f..efbaaaa18f 100644 --- a/themes/build.xml +++ b/themes/build.xml @@ -82,6 +82,8 @@ <arg value="${theme}" /> <arg value="--theme-folder" /> <arg value="${theme.result.dir}" /> + <arg value="--version" /> + <arg value="${vaadin.version}" /> <jvmarg value="-Xss8M" /> <jvmarg value="-XX:MaxPermSize=256M" /> <jvmarg value="-Djava.awt.headless=true" /> diff --git a/themes/ivy.xml b/themes/ivy.xml index beb1b16a00..f4cc507041 100644 --- a/themes/ivy.xml +++ b/themes/ivy.xml @@ -19,8 +19,13 @@ <artifact type="pom" ext="pom" /> </publications> <dependencies> - <dependency org="com.vaadin" name="vaadin-theme-compiler" - rev="${vaadin.version}" conf="compile-theme->build" /> + <dependency org="com.vaadin" name="vaadin-sass-compiler" + rev="${vaadin.sass.version}" conf="compile-theme->default" /> + + <dependency org="com.vaadin" name="vaadin-buildhelpers" + rev="${vaadin.version}" conf="compile-theme->build"> + <exclude type="pom" conf="test" /> + </dependency> </dependencies> </ivy-module> |