commit 77dde0c4908b323a216c885090155716094d9a9e
author cristcost <cristiano.costantini@gmail.com> Fri Nov 15 09:06:51 2013 +0100
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 12 03:04:05 2013 +0000
tree bf104039529ebcf185a666b372c852ee2c9046a2
parent 87b5a5eca3105d2eabc6971415c4e476265c69e8

Including GWT's rebased dependencies inside gwt-servlet.jar

Changed Ant's build.xml for gwt-servlet.jar so to include a selection of
libraries rebased for specific use in GWT and that may be required
also on server side:
- sourcemaps is used by StackTraceDeobfuscator,
- streamhtmlparser is required for SafeHtml
- guava is needed by both.
- protobuf needed for sourcemaps and devmode.
(see also linked issue).

Bug: issue 8438
Change-Id: I73df9d03368785a3625c3a48ee989dc919738e83

servlet/build.xml

diff --git a/servlet/build.xml b/servlet/build.xml
index 097e883..9c807f5 100644
--- a/servlet/build.xml
+++ b/servlet/build.xml
@@ -23,6 +23,11 @@
   <target name="-servlet" description="Packages this project into a jar">
     <mkdir dir="${gwt.build.lib}" />
     <gwt.jar>
+      <!-- Rebased dependencies go in gwt-servlet too -->
+      <zipfileset src="${gwt.tools.lib}/guava/guava-15.0/guava-15.0-rebased.jar" />
+      <zipfileset src="${gwt.tools.lib}/jscomp/20131014/sourcemap-rebased.jar" />
+      <zipfileset src="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar" />
+      <zipfileset src="${gwt.tools.lib}/protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar" />
       <fileset dir="${gwt.dev.bin}">
         <include name="com/google/gwt/dev/asm/**" />
         <include name="com/google/gwt/dev/util/Name*.class" />
@@ -51,12 +56,8 @@
     <mkdir dir="${gwt.build.lib}" />
     <gwt.jar destfile="${project.lib.deps}">
       <!-- The following two jars satisfy RequestFactory dependencies. -->
-      <zipfileset src="${gwt.tools.lib}/guava/guava-15.0/guava-15.0-rebased.jar" />
       <zipfileset src="${gwt.tools.redist}/json/r2_20080312/json-1.5.jar" />
       <zipfileset src="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar" />
-      <zipfileset src="${gwt.tools.lib}/jscomp/20131014/sourcemap-rebased.jar" />
-      <zipfileset src="${gwt.tools.lib}/protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar" />
-      <zipfileset src="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar" />
     </gwt.jar>
   </target>
 </project>