packaging

svn changeset:3082/svn branch:trunk

diff --git a/build/build.xml b/build/build.xml
index c41710bd2c21aa502435a3498914f6b277ac755f..d6bc765f75003f48ee01555a6e795fa2ad32e1dc 100644 (file)
--- 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 db60371265ee9b23e36f5ca23fdec193ba2c1b55..a11c092378ff3c18b06a010983c98a544a3fc54a 100644 (file)
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 (file)
index 0000000..565d994
Binary files /dev/null and b/build/package/toolkit5-512.png differ