summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authordenisanisimov <denis@vaadin.com>2014-01-13 09:44:52 +0200
committerVaadin Code Review <review@vaadin.com>2014-01-15 08:37:14 +0000
commitd2874fde4b8c6afa24f0f6535e0d6fcabc489f51 (patch)
tree46a090fb3334bca03386ded011a54950b6f20973 /build
parent034197d5a98cbf59153c824ed6f93d495c523854 (diff)
downloadvaadin-framework-d2874fde4b8c6afa24f0f6535e0d6fcabc489f51.tar.gz
vaadin-framework-d2874fde4b8c6afa24f0f6535e0d6fcabc489f51.zip
Theme Parser is deleted, build procedure now generates it (#13161).
Change-Id: I6e0f797b9eadf9fe796750e2764faf4434494e29
Diffstat (limited to 'build')
-rwxr-xr-xbuild/ide.xml13
1 files changed, 10 insertions, 3 deletions
diff --git a/build/ide.xml b/build/ide.xml
index 22e6818bea..51a9d82272 100755
--- a/build/ide.xml
+++ b/build/ide.xml
@@ -36,7 +36,6 @@
<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" />
@@ -68,9 +67,14 @@
</antcall>
</target>
- <target name="compile-theme">
+ <target name="compile-theme" depends="generate-theme-compiler">
+ <path id="theme.classpath">
+ <path refid="classpath"/>
+ <path refid="theme-compiler.deps" />
+ </path>
+
<java classname="com.vaadin.buildhelpers.CompileTheme" failonerror="yes" fork="yes">
- <classpath refid="classpath" />
+ <classpath refid="theme.classpath" />
<jvmarg value="-Djava.awt.headless=true" />
<arg value="--theme" />
<arg value="${theme}" />
@@ -142,4 +146,7 @@
</fileset>
</copy>
</target>
+ <target name="generate-theme-compiler">
+ <ant antfile="${basedir}/theme-compiler/build.xml" target="parser" dir="${basedir}/theme-compiler" />
+ </target>
</project>