diff options
| author | Jani Laakso <jani.laakso@itmill.com> | 2007-11-30 13:06:00 +0000 |
|---|---|---|
| committer | Jani Laakso <jani.laakso@itmill.com> | 2007-11-30 13:06:00 +0000 |
| commit | 6de20bf2c32dd2635045216c9e4cb408f319e5fa (patch) | |
| tree | b13b03df5f9ab151dae965263d082e2670ec7b2d | |
| parent | c3dd44a9ecdb880b574872573a7144dbc349e988 (diff) | |
| download | vaadin-framework-6de20bf2c32dd2635045216c9e4cb408f319e5fa.tar.gz vaadin-framework-6de20bf2c32dd2635045216c9e4cb408f319e5fa.zip | |
structure changes (index.html now inside WebContent)
svn changeset:3072/svn branch:trunk
| -rw-r--r-- | build/build.xml | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/build/build.xml b/build/build.xml index 109b0cb7f9..e6c1c64b88 100644 --- a/build/build.xml +++ b/build/build.xml @@ -120,7 +120,7 @@ <!-- Output directory --> <property name="output-dir" value="${result-path}/${product-file}-${version}" /> <mkdir dir="${output-dir}" /> - + <!-- Create Output Directory Hierarchy --> <mkdir dir="${output-dir}/WebContent" /> <mkdir dir="${output-dir}/WebContent/lib" /> @@ -516,7 +516,12 @@ </fileset> </copy> - <!-- copy WebContent/index.html and rename it --> + <!-- copy build/package/WebContent/* --> + <copy todir="${output-dir}/WebContent"> + <fileset dir="build/package/WebContent"> + <exclude name="index.html" /> + </fileset> + </copy> <copy todir="${output-dir}/WebContent"> <filterchain> <expandproperties /> @@ -525,13 +530,10 @@ <token key="/version" value="" /> </replacetokens> </filterchain> - <fileset dir="build/package"> - <filename name="webcontent-index.html" /> + <fileset dir="build/package/WebContent"> + <filename name="index.html" /> </fileset> </copy> - <move file="${output-dir}/WebContent/webcontent-index.html" tofile="${output-dir}/WebContent/index.html" /> - <!-- <copy file="build/package/webcontent-index.html" tofile="${output-dir}/WebContent/index.html" /> --> - <copy file="build/package/web.xml" tofile="${output-dir}/WebContent/WEB-INF/web.xml" /> </target> |