diff options
author | Jani Laakso <jani.laakso@itmill.com> | 2007-11-30 14:01:51 +0000 |
---|---|---|
committer | Jani Laakso <jani.laakso@itmill.com> | 2007-11-30 14:01:51 +0000 |
commit | 1c0e1e5b85b93386cad1a9034f09b5b8ecdc44f4 (patch) | |
tree | 5b91411900080aa747878950e82397af498dd524 /build | |
parent | 54741a4df37c1245f7cdabe398e0e7fa59c985d8 (diff) | |
download | vaadin-framework-1c0e1e5b85b93386cad1a9034f09b5b8ecdc44f4.tar.gz vaadin-framework-1c0e1e5b85b93386cad1a9034f09b5b8ecdc44f4.zip |
leopard fix
svn changeset:3079/svn branch:trunk
Diffstat (limited to 'build')
-rw-r--r-- | build/build.xml | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/build/build.xml b/build/build.xml index e6c1c64b88..82ab988638 100644 --- a/build/build.xml +++ b/build/build.xml @@ -206,7 +206,7 @@ <antcall target="create-mac-diskimage" inheritAll="true" inheritRefs="true" /> </target> - <target name="internal-package-mac-leopard"> + <target name="internal-package-mac_leopard"> <var name="package-platform" value="mac" /> <echo>Creating package for ${package-platform}_leopard platform.</echo> <var name="eclipse-launch-vmargs" value="-Xms256M -Xmx512M" /> @@ -374,6 +374,7 @@ <then> <copy todir="${output-dir}"> <fileset dir="build/package"> + <include name="Start IT Mill Toolkit.app" /> <include name="start-demo.sh" /> <include name="start-demo.txt" /> <include name=".VolumeIcon.icns" /> @@ -394,12 +395,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <target name="root"> - <copy todir="${output-dir}/license"> + <copy todir="${output-dir}/WebContent/license"> <fileset dir="license"> <filename name="*.pdf" /> </fileset> </copy> - <copy todir="${output-dir}"> + <copy todir="${output-dir}/WebContent"> <filterchain> <expandproperties /> <replacetokens begintoken="<" endtoken=">"> @@ -411,7 +412,7 @@ <filename name="release-notes.html" /> </fileset> </copy> - <copy todir="${output-dir}"> + <copy todir="${output-dir}/WebContent"> <filterchain> <expandproperties /> <replacetokens begintoken="<" endtoken=">"> @@ -431,12 +432,12 @@ </copy> <!-- copy 3rd part libraries used by demo --> - <copy todir="${output-dir}/lib/demo"> + <copy todir="${output-dir}/WebContent/lib/demo"> <fileset dir="lib"> <include name="reservr/**/*" /> </fileset> </copy> - <copy todir="${output-dir}/lib"> + <copy todir="${output-dir}/WebContent/lib"> <fileset dir="lib"> <include name="jetty/**/*" /> </fileset> @@ -660,13 +661,15 @@ </fileset> </copy> + <!-- <echo>Adding javadocs</echo> <copy todir="${output-dir}/WebContent/doc"> <fileset dir="${output-dir}/doc"> <include name="api/**/*" /> </fileset> </copy> - + --> + <echo>Building WAR</echo> <war warfile="${output-dir}/lib/${product-file}.war" webxml="build/package/web.xml"> <fileset dir="${output-dir}/WebContent"> |