From 62929790fe8ea8f205883582d22eb2f989692a3a Mon Sep 17 00:00:00 2001
From: Henri Sara <hesara@vaadin.com>
Date: Fri, 29 Jun 2012 17:09:04 +0300
Subject: [PATCH] Include GWT Elemental library in Vaadin JAR.

Also uses a better build target for CodeServer.
---
 build/build.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 800de09db2..6b3a046616 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -42,6 +42,7 @@
     	<property name="gwt.user.jar" value="${gwt.build.dir}/lib/gwt-user.jar"/>
     	<property name="gwt.dev.jar" value="${gwt.build.dir}/lib/gwt-dev.jar"/>
     	<property name="gwt.codeserver.jar" value="${gwt.build.dir}/lib/gwt-codeserver.jar"/>
+    	<property name="gwt.elemental.jar" value="${gwt.build.dir}/lib/gwt-elemental.jar"/>
 
     	<property name="gwt.user.dir" value="${gwt.root}/user"/>
     	<property name="gwt.user.bin" value="${gwt.build.dir}/out/user/bin"/>
@@ -667,8 +668,10 @@
         <ant antfile="${gwt.root}/build.xml" target="dev" dir="${gwt.root}" inheritall="false" inheritrefs="false">
             <property name="gwt.root" value="${gwt.root}"/>
         </ant>
-    	<!-- TODO unnecessary with latest trunk? -->
-        <ant antfile="${gwt.root}/dev/codeserver/build.xml" target="build" dir="${gwt.root}/dev/codeserver" inheritall="false" inheritrefs="false">
+        <ant antfile="${gwt.root}/build.xml" target="codeserver" dir="${gwt.root}" inheritall="false" inheritrefs="false">
+            <property name="gwt.root" value="${gwt.root}"/>
+        </ant>
+        <ant antfile="${gwt.root}/build.xml" target="elemental" dir="${gwt.root}" inheritall="false" inheritrefs="false">
             <property name="gwt.root" value="${gwt.root}"/>
         </ant>
     </target>
@@ -787,6 +790,9 @@
         	<!-- GWT SuperDevMode -->
             <zipfileset src="${gwt.codeserver.jar}" />
         	
+        	<!-- GWT Elemental -->
+            <zipfileset src="${gwt.elemental.jar}" />
+        	
         	<!-- jarjar rules: rebase packages from gwt-dev.jar but not those from gwt-user -->
         	
         	<!-- Don't rebase these -->
-- 
2.39.5