From: Joonas Lehtinen <joonas.lehtinen@itmill.com>
Date: Fri, 29 Dec 2006 18:05:52 +0000 (+0000)
Subject: Now build script supports new theme structure
X-Git-Tag: 6.7.0.beta1~6800
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7b7d3870a5e186d7a029ede345e264d1ee2580fd;p=vaadin-framework.git

Now build script supports new theme structure

svn changeset:196/svn branch:toolkit
---

diff --git a/build/VERSION b/build/VERSION
index ae8a97aa80..9b1083372a 100644
--- a/build/VERSION
+++ b/build/VERSION
@@ -1 +1 @@
-version=4.0.0-alpha-20061228-1
+version=4.0.0-alpha-20061229-1
diff --git a/build/build.xml b/build/build.xml
index b8e683a8ac..00252e0dd0 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -45,19 +45,12 @@
 	<target name="themes" depends="copy-themes-to-lib, theme-jar" />
 
 	<target name="copy-themes-to-lib" depends="init">
-		<copy todir="${output-dir}/lib/web-themes">
+		<copy todir="${output-dir}/lib/themes">
 			<fileset dir="WebContent/WEB-INF/lib/themes">
 				<exclude name="**/.svn" />
-			</fileset>
-		</copy>
-		<copy todir="${output-dir}/lib/ajax-themes">
-			<fileset dir="WebContent">
-				<exclude name="**/.svn" />
-				<include name="themes/**" />
-			</fileset>
-			<fileset dir="WebContent">
-				<exclude name="**/.svn" />
-				<include name="client/**" />
+				<include name="corporate/**/*" />
+				<include name="demo/**/*" />
+				<include name="base/**/*" />
 			</fileset>
 		</copy>
 	</target>
@@ -67,7 +60,6 @@
 			<fileset dir="WebContent/WEB-INF/lib/themes">
 				<patternset>
 					<exclude name="**/.svn" />
-					<include name="default/**/*" />
 					<include name="corporate/**/*" />
 					<include name="base/**/*" />
 				</patternset>