diff options
| author | Henri Sara <hesara@vaadin.com> | 2012-06-29 17:09:04 +0300 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2012-06-29 17:09:04 +0300 |
| commit | 62929790fe8ea8f205883582d22eb2f989692a3a (patch) | |
| tree | 98414086bba1bec4d7415ca79264c6b7139780d9 /build | |
| parent | 59f1cea4acbee1350757e6ffe4e5da9b983db9e5 (diff) | |
| download | vaadin-framework-62929790fe8ea8f205883582d22eb2f989692a3a.tar.gz vaadin-framework-62929790fe8ea8f205883582d22eb2f989692a3a.zip | |
Include GWT Elemental library in Vaadin JAR.
Also uses a better build target for CodeServer.
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 10 |
1 files 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 --> |