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 /build/ide.xml | |
| 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 'build/ide.xml')
| -rwxr-xr-x | build/ide.xml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/build/ide.xml b/build/ide.xml index 22e6818bea..678fc49d5b 100755 --- a/build/ide.xml +++ b/build/ide.xml @@ -23,8 +23,8 @@ <ivy:cachepath pathid="shared.deps" conf="ide" /> <ivy:resolve log="download-only" file="uitest/ivy.xml" conf="ide" /> <ivy:cachepath pathid="uitest.deps" conf="ide" /> - <ivy:resolve log="download-only" file="theme-compiler/ivy.xml" conf="ide" /> - <ivy:cachepath pathid="theme-compiler.deps" conf="ide" /> + <ivy:resolve log="download-only" file="buildhelpers/ivy.xml" /> + <ivy:cachepath pathid="buildhelpers.deps" /> <path id="classpath"> <path location="bin" /> @@ -36,12 +36,11 @@ <path location="${gwt.dev.super.src}" /> <path location="${gwt.dev.src}" /> <path refid="client-compiler.deps" /> - <path refid="theme-compiler.deps" /> <path refid="server.deps" /> <path refid="shared.deps" /> <path refid="uitest.deps" /> <path refid="client.deps" /> - <path location="theme-compiler/src" /> + <path refid="buildhelpers.deps" /> <path location="server/src" /> <path location="shared/src" /> <path location="uitest/src" /> @@ -76,6 +75,8 @@ <arg value="${theme}" /> <arg value="--theme-folder" /> <arg value="WebContent/VAADIN/themes" /> + <arg value="--version" /> + <arg value="${vaadin.version}" /> </java> </target> |