Merging releases/1.6@4385:4459 into trunk.
svn merge --accept=postpone -r4385:4459 https://google-web-toolkit.googlecode.com/svn/releases/1.6 .
I had to manually merge the following things:
- Consistent line endings for ProxyCreator; 1.6@4388
- PermutationWorkerFactory actually fails compiles on error; 1.6@4405
- CompilingClassLoader CompilationUnit-based JSNI injection (for Emma); 1.6@4446
- Pruner sort & format; 1.6@4458
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@4488 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/samples/build.xml b/samples/build.xml
index 81d72a3..3d44771 100644
--- a/samples/build.xml
+++ b/samples/build.xml
@@ -51,9 +51,7 @@
</antcall>
</gwt.timer>
<length property="gwt.sample.length">
- <fileset dir="${gwt.build.out}/samples">
- <include name="**/www/com*/**"/>
- </fileset>
+ <fileset dir="${gwt.build.out}/samples" includes="*/war/*/*.cache.html,*/war/*/*.cache.js"/>
</length>
<echo message="compiled size of all samples is ${gwt.sample.length} bytes."/>
</target>
