From: Jani Laakso <jani.laakso@itmill.com>
Date: Mon, 26 Nov 2007 14:43:38 +0000 (+0000)
Subject: demo.testbench should not anymore be included within JAR.
X-Git-Tag: 6.7.0.beta1~5443
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=23188325d5cffbba466e3b4c79fb814cc453852a;p=vaadin-framework.git

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 1f44f97414..b21e79e27e 100644
--- 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 -->