diff options
| author | Leif Åstrand <leif@vaadin.com> | 2014-01-16 07:03:16 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-01-16 07:32:07 +0000 |
| commit | dd0479cdefa52091a33ff63f45fc32ae76c4b4f8 (patch) | |
| tree | c341f505d616ed68695027d0ee192c6390ac969e /build | |
| parent | 4d2f1477ab105476d79ad8a99397b1c3c55d14b1 (diff) | |
| download | vaadin-framework-dd0479cdefa52091a33ff63f45fc32ae76c4b4f8.tar.gz vaadin-framework-dd0479cdefa52091a33ff63f45fc32ae76c4b4f8.zip | |
Revert "Theme Parser is deleted, build procedure now generates it (#13161)."
Causes a multitude of compile errors on the build server.
This reverts commit d2874fde4b8c6afa24f0f6535e0d6fcabc489f51.
Change-Id: I49787b347944b614b9e98778b3219b7045cf2bfe
Diffstat (limited to 'build')
| -rwxr-xr-x | build/ide.xml | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/build/ide.xml b/build/ide.xml index 51a9d82272..22e6818bea 100755 --- a/build/ide.xml +++ b/build/ide.xml @@ -36,6 +36,7 @@ <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" /> @@ -67,14 +68,9 @@ </antcall> </target> - <target name="compile-theme" depends="generate-theme-compiler"> - <path id="theme.classpath"> - <path refid="classpath"/> - <path refid="theme-compiler.deps" /> - </path> - + <target name="compile-theme"> <java classname="com.vaadin.buildhelpers.CompileTheme" failonerror="yes" fork="yes"> - <classpath refid="theme.classpath" /> + <classpath refid="classpath" /> <jvmarg value="-Djava.awt.headless=true" /> <arg value="--theme" /> <arg value="${theme}" /> @@ -146,7 +142,4 @@ </fileset> </copy> </target> - <target name="generate-theme-compiler"> - <ant antfile="${basedir}/theme-compiler/build.xml" target="parser" dir="${basedir}/theme-compiler" /> - </target> </project> |