From: Jani Laakso <jani.laakso@itmill.com>
Date: Fri, 30 Nov 2007 14:15:04 +0000 (+0000)
Subject: packaging
X-Git-Tag: 6.7.0.beta1~5352
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6807b80b6966627c1cc78dafa8e6fed4af70ff0a;p=vaadin-framework.git

packaging

svn changeset:3082/svn branch:trunk
---

diff --git a/build/build.xml b/build/build.xml
index c41710bd2c..d6bc765f75 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -605,7 +605,7 @@
 	<target name="libs" depends="compile-java, compile-client-side">
 		<echo>Creating libs (server-side)</echo>
 		<!-- Create Toolkit JAR -->
-		<jar jarfile="${output-dir}/lib/${lib-jar-name}" compress="true">
+		<jar jarfile="${output-dir}/WebContent/lib/${lib-jar-name}" compress="true">
 			<fileset dir="${result-path}/classes">
 				<patternset>
 					<exclude name="${toolkit-package}/demo/**" />
@@ -645,14 +645,15 @@
 			</fileset>
 		</copy>
 
+		<!-- TODO remove WebContent/lib? -->
 		<echo>Adding (duplicating) Toolkit JAR to WebContent/WEB-INF/lib</echo>
 		<copy todir="${output-dir}/WebContent/WEB-INF/lib">
-			<fileset dir="${output-dir}/lib">
+			<fileset dir="${output-dir}/WebContent/lib">
 				<include name="${lib-jar-name}" />
 			</fileset>
 		</copy>
 
-		<echo>Adding (duplicating) source for demo</echo>
+		<echo>Adding source for demo</echo>
 		<copy todir="${output-dir}/WebContent/WEB-INF/src">
 			<fileset dir="${result-path}/src">
 				<include name="${toolkit-package}/demo/**/*" />
diff --git a/build/package/mac-VolumeIcon.icns b/build/package/mac-VolumeIcon.icns
index db60371265..a11c092378 100644
Binary files a/build/package/mac-VolumeIcon.icns and b/build/package/mac-VolumeIcon.icns differ
diff --git a/build/package/toolkit5-512.png b/build/package/toolkit5-512.png
new file mode 100644
index 0000000000..565d9942e5
Binary files /dev/null and b/build/package/toolkit5-512.png differ