diff options
| author | Jani Laakso <jani.laakso@itmill.com> | 2007-11-30 14:15:04 +0000 |
|---|---|---|
| committer | Jani Laakso <jani.laakso@itmill.com> | 2007-11-30 14:15:04 +0000 |
| commit | 6807b80b6966627c1cc78dafa8e6fed4af70ff0a (patch) | |
| tree | 4f2b4401a028ef0b72eb848b2614c6f7692ca21a | |
| parent | d9457a3158b3349930b09385d4296dbab1fd4903 (diff) | |
| download | vaadin-framework-6807b80b6966627c1cc78dafa8e6fed4af70ff0a.tar.gz vaadin-framework-6807b80b6966627c1cc78dafa8e6fed4af70ff0a.zip | |
packaging
svn changeset:3082/svn branch:trunk
| -rw-r--r-- | build/build.xml | 7 | ||||
| -rw-r--r-- | build/package/mac-VolumeIcon.icns | bin | 40826 -> 183344 bytes | |||
| -rw-r--r-- | build/package/toolkit5-512.png | bin | 0 -> 37390 bytes |
3 files changed, 4 insertions, 3 deletions
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 Binary files differindex db60371265..a11c092378 100644 --- a/build/package/mac-VolumeIcon.icns +++ b/build/package/mac-VolumeIcon.icns diff --git a/build/package/toolkit5-512.png b/build/package/toolkit5-512.png Binary files differnew file mode 100644 index 0000000000..565d9942e5 --- /dev/null +++ b/build/package/toolkit5-512.png |
