Revision: 8172
Author: jasonpar...@google.com
Date: Mon May 17 14:09:33 2010
Log: Produces the gwt-bikeshed.jar from the dist target. In GPE, the GWT
container needs to contain gwt-bikeshed.jar now because we need to
precisely set the ordering such that bikeshed appears above user.
Previously, we relied on Maven container supplying the bikeshed, but
the issue of out-of-order bikeshed and user JARs came up (GWT container
must appear above Maven container, meaning the bikeshed always appeared
later than user.)
Review at http://gwt-code-reviews.appspot.com/541801
Review by: amitman...@google.com
http://code.google.com/p/google-web-toolkit/source/detail?r=8172
Modified:
/branches/2.1/build.xml
/branches/2.1/distro-source/build.xml
=======================================
--- /branches/2.1/build.xml Fri Apr 2 15:29:40 2010
+++ /branches/2.1/build.xml Mon May 17 14:09:33 2010
@@ -113,6 +113,10 @@
<call-subproject subproject="tools" subtarget="build"/>
<call-subproject subproject="jni" subtarget="build"/>
<call-subproject subproject="samples" subtarget="build"/>
+
+ <!-- TODO: GWT 2.1.0 M1 SDK requires gwt-bikeshed.jar to be included.
This
+ can be removed once bikeshed is merged into other JARs. -->
+ <call-subproject subproject="bikeshed" subtarget="build" />
</target>
<target name="checkstyle" description="[action] Does static analysis of
GWT source">
=======================================
--- /branches/2.1/distro-source/build.xml Fri Oct 30 12:00:05 2009
+++ /branches/2.1/distro-source/build.xml Mon May 17 14:09:33 2010
@@ -25,6 +25,7 @@
<zipfileset file="${gwt.build.lib}/gwt-benchmark-viewer.war"
prefix="${project.distname}" />
<zipfileset file="${gwt.build.lib}/gwt-soyc-vis.jar"
prefix="${project.distname}" />
<zipfileset file="${gwt.build.lib}/gwt-api-checker.jar"
prefix="${project.distname}" />
+ <zipfileset file="${gwt.build.lib}/gwt-bikeshed.jar"
prefix="${project.distname}" />
<!-- jni libs-->
<zipfileset dir="${gwt.build.jni}/windows"
prefix="${project.distname}" />
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
