Reviewers: amitmanjhi,
Description:
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 by: amitman...@google.com
Please review this at http://gwt-code-reviews.appspot.com/541801/show
Affected files:
M /build.xml
M /distro-source/build.xml
Index: /build.xml
===================================================================
--- /build.xml (revision 8109)
+++ /build.xml (working copy)
@@ -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">
Index: /distro-source/build.xml
===================================================================
--- /distro-source/build.xml (revision 8109)
+++ /distro-source/build.xml (working copy)
@@ -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
