diff options
| -rw-r--r-- | gwt-files.xml | 7 | ||||
| -rw-r--r-- | theme-compiler/build.xml | 8 | ||||
| -rw-r--r-- | theme-compiler/ivy.xml | 7 |
3 files changed, 18 insertions, 4 deletions
diff --git a/gwt-files.xml b/gwt-files.xml index 89549f0553..3ca6349dc9 100644 --- a/gwt-files.xml +++ b/gwt-files.xml @@ -80,6 +80,13 @@ </fileset> </union> + <union id="theme-compiler.gwt.includes"> + <!-- This is only temporary. Flute must be packaged separately as it is not in Maven and this version is also modified by the GWT team --> + <fileset dir="${gwt.user.jar.files}"> + <include name="org/w3c/flute/**" /> + </fileset> + </union> + <union id="client.gwt.includes"> <fileset dir="${gwt.user.jar.files}"> <exclude name="META-INF/**" /> 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" /> |