From 3a17a846bd835556f7ace57f187d9727fc484be2 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 14 Sep 2012 14:51:09 +0300
Subject: Include flute files also in theme-compiler (in addition to client)
 for now (#9609)

---
 theme-compiler/build.xml | 8 ++++++--
 theme-compiler/ivy.xml   | 7 +++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'theme-compiler')

diff --git a/theme-compiler/build.xml b/theme-compiler/build.xml
index 300f2718aa..33612bef1b 100644
--- a/theme-compiler/build.xml
+++ b/theme-compiler/build.xml
@@ -6,18 +6,22 @@
 	</description>
 	<include file="../common.xml" as="common" />
 	<include file="../build.xml" as="vaadin" />
+	<include file="../gwt-files.xml" as="gwtfiles" />
 
 	<!-- global properties -->
 	<property name="module.name" value="vaadin-theme-compiler" />
 	<property name="result.dir" value="result" />
-	<path id="classpath.compile.custom" />
+	<path id="classpath.compile.custom">
+		<!-- This is only temporary until there is a packaged modified flute jar -->
+		<pathelement path="${gwt.user.jar.files}" />
+	</path>
 	<path id="classpath.tests.custom" />
 
 	<!--<property name="classes.exclude" value="com/vaadin/buildhelpers/**" />-->
 
 	<target name="jar">
 		<antcall target="common.jar">
-			<reference torefid="extra.jar.includes" refid="empty.reference" />
+			<reference torefid="extra.jar.includes" refid="theme-compiler.gwt.includes" />
 		</antcall>
 	</target>
 	<target name="publish-local" depends="jar">
diff --git a/theme-compiler/ivy.xml b/theme-compiler/ivy.xml
index d3c12e2a63..76061a9f2b 100644
--- a/theme-compiler/ivy.xml
+++ b/theme-compiler/ivy.xml
@@ -30,13 +30,16 @@
             rev="2.1.1" conf="build,ide,tests->default" />
         <dependency org="org.w3c.css" name="sac" rev="1.3"
             conf="build,ide,tests->default" />
-        <dependency org="milyn" name="flute" rev="1.3"
-            conf="build,ide,tests->default" />
         <dependency org="net.sourceforge.cssparser" name="cssparser"
             rev="0.9.5" conf="build,ide,tests->default" />
         <dependency org="commons-cli" name="commons-cli" rev="1.2"
             conf="build,ide,tests->default" />
 
+        <!-- FIXME: This should use a repackaged version of flute with included 
+            GWT modifications. Only here to make IDE compilation work atm -->
+        <dependency org="milyn" name="flute" rev="1.3"
+            conf="ide->default" />
+
         <!-- Provided build libs -->
         <dependency org="javax.servlet" name="servlet-api"
             rev="2.4" conf="build-provided->default" />
-- 
cgit v1.2.3