demo.testbench should not anymore be included within JAR.

svn changeset:2976/svn branch:trunk

diff --git a/build/build.xml b/build/build.xml
index 1f44f97414614aac2f4bd1d9bf968ac162845ecb..b21e79e27e53e40ca9e997087d8d22cf3bf13e4c 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -61,7 +61,7 @@
                </exec>
                <exec executable="ln" failonerror="false">
                        <arg line="-s" />
-                       <arg line="${basedir}/build/gwt/gwt" />
+                       <arg line="${basedir}/build/gwt/${package-platform}" />
                        <arg line="${output-dir}/gwt" />
                </exec>
        </target>
@@ -481,7 +481,6 @@
                                <exclude name="WEB-INF/web.xml" />
                                <exclude name="ITMILL/widgetsets/**" />
                                <exclude name="WEB-INF/lib/commons-fileupload-custom.jar" />
-                               <!-- TODO check that tests* are not added -->
                                <exclude name="ITMILL/themes/test*/**" />
                                <exclude name="WEB-INF/classes/**" />
                        </fileset>
@@ -562,8 +561,8 @@
                <jar jarfile="${output-dir}/lib/${lib-jar-name}" compress="true">
                        <fileset dir="${result-path}/classes">
                                <patternset>
-                                       <exclude name="${toolkit-package}/demo/**" />
-                                       <exclude name="${toolkit-package}/launcher/**" />
+                                       <exclude name="${toolkit-package}/demo/**/*" />
+                                       <exclude name="${toolkit-package}/launcher/**/*" />
                                </patternset>
                        </fileset>
                        <!-- fileupload, see build/external/fileupload/build.xml -->