summaryrefslogtreecommitdiffstats
path: root/build/build.xml
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2012-07-03 10:36:14 +0300
committerHenri Sara <hesara@vaadin.com>2012-07-03 10:36:14 +0300
commit416bd2036409a525f7507780b7b269da020b027f (patch)
treee08ee0e316d160f91933c863a6fe56873fb22272 /build/build.xml
parent7906b675fe8ece493229a54605d60a70d91737ab (diff)
downloadvaadin-framework-416bd2036409a525f7507780b7b269da020b027f.tar.gz
vaadin-framework-416bd2036409a525f7507780b7b269da020b027f.zip
Update Ivy configuration and build script for integrated GWT.
For ease of development, GWT "trunk" and "tools" are assumed to be checked out in a directory parallel to the project directory. Otherwise, the variable gwt.root can be used to give the location of trunk. Add Ivy dependencies for servlet API and libraries needed to compile tests (Jetty, Apache Commons) - these were previously used from GWT JARs.
Diffstat (limited to 'build/build.xml')
-rw-r--r--build/build.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/build/build.xml b/build/build.xml
index 6b3a046616..85bee09a52 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -35,6 +35,9 @@
<fileset dir="build" includes="lib/**/*.jar" ></fileset>
</path>
+ <!-- Default location for GWT check-out: trunk and tools in a directory next to Vaadin project -->
+ <property name="gwt.root" value="${basedir}/../trunk"/>
+
<property name="gwt.build.dir" value="${gwt.root}/build"/>
<property name="gwt.tools" value="${gwt.root}/../tools"/>
<property name="gwt.tools.lib" value="${gwt.tools}/lib"/>