diff options
| author | Henri Sara <hesara@vaadin.com> | 2012-06-21 17:08:12 +0300 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2012-06-21 17:08:12 +0300 |
| commit | d94638a2e747c67556c0e08d975e963bcb19e019 (patch) | |
| tree | ac5831abe8f6741219990ce47676ac5b99b192f1 /build/build.xml | |
| parent | b526fe5313b829758f536a6621c6d4036461b7d1 (diff) | |
| download | vaadin-framework-d94638a2e747c67556c0e08d975e963bcb19e019.tar.gz vaadin-framework-d94638a2e747c67556c0e08d975e963bcb19e019.zip | |
Include JSON library in JAR, required by SuperDevMode.
Diffstat (limited to 'build/build.xml')
| -rw-r--r-- | build/build.xml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build/build.xml b/build/build.xml index 8a670db893..1bed1807a1 100644 --- a/build/build.xml +++ b/build/build.xml @@ -36,7 +36,8 @@ </path> <property name="gwt.build.dir" value="${gwt.root}/build"/> - <property name="gwt.tools.lib" value="${gwt.root}/../tools/lib"/> + <property name="gwt.tools" value="${gwt.root}/../tools"/> + <property name="gwt.tools.lib" value="${gwt.tools}/lib"/> <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"/> @@ -787,6 +788,9 @@ <!-- GWT SuperDevMode --> <zipfileset src="${gwt.codeserver.jar}" /> + + <!-- JSON library, required when precompiled JSON.gwtar is not included --> + <zipfileset src="${gwt.tools}/redist/json/r2_20080312/json-1.5.jar" /> <!-- jarjar rules: rebase packages from gwt-dev.jar but not those from gwt-user --> |