diff options
| author | Jani Laakso <jani.laakso@itmill.com> | 2007-04-05 12:43:38 +0000 |
|---|---|---|
| committer | Jani Laakso <jani.laakso@itmill.com> | 2007-04-05 12:43:38 +0000 |
| commit | f87235993e154b776a7b7ca641930d4434208fbc (patch) | |
| tree | a55634fbc52e4b0cf2fe51ee56631d85ac9fd24d /build | |
| parent | 08841bbdc4872931dda6bb11d28816d385fd0f31 (diff) | |
| download | vaadin-framework-f87235993e154b776a7b7ca641930d4434208fbc.tar.gz vaadin-framework-f87235993e154b776a7b7ca641930d4434208fbc.zip | |
Changes regarding new source code generation, new theme and custom layouts files.
svn changeset:1169/svn branch:trunk
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/build/build.xml b/build/build.xml index 9badfb1bb2..5858802cea 100644 --- a/build/build.xml +++ b/build/build.xml @@ -80,10 +80,11 @@ <include name="corporate/**/*" /> <include name="demo/**/*" /> <include name="base/**/*" /> + <include name="example/**/*" /> </fileset> </copy> - <!-- Brakes CSS, do not use + <!-- Brokes CSS, do not use <echo>CSS syntax check and optimizing.</echo> <for param="file"> <path> @@ -151,6 +152,7 @@ </patternset> </fileset> </copy> + <!-- Convert to CRLF's and tabs --> <fixcrlf srcdir="build/result/src" eol="crlf" tablength="4" tab="remove" includes="**/*.java" /> @@ -192,7 +194,7 @@ <target name="demo" depends="libs,compile-java,themes"> <echo>Building demo</echo> <java2html srcdir="build/result/src/${toolkit-package}/demo" destdir="build/result/src/${toolkit-package}/demo" includes="**/*.java" style="eclipse" showLineNumbers="true" showFileName="true" showTableBorder="false" /> - <!-- have to use "temp" dir for some reason here. Overwrite does not work, at least on Linux --> + <!-- have to use "temp" dir for some reason here. Overwrite does not work, at least on Linux Eclipse 3.2.2 --> <copy todir="build/result/srcTemp" overwrite="true"> <filterchain> <expandproperties /> @@ -219,6 +221,15 @@ </patternset> </fileset> </jar> + + <!-- Copy demo directory (Jetty) --> + <copy todir="${output-dir}/demo"> + <fileset dir="build/demo"> + <exclude name="**/.svn" /> + </fileset> + </copy> + + <!-- Create demo WAR --> <war warfile="${output-dir}/demo/${product-file}.war" webxml="WebContent/WEB-INF/web.xml"> <!-- WebContent: htmls, styles, license--> <fileset dir="WebContent"> @@ -240,26 +251,18 @@ </lib> <lib dir="${output-dir}/lib"> <include name="themes/demo/**/*" /> + <include name="themes/example/**/*" /> </lib> - <!-- Calc and HelloWorld source and html source --> + <!-- All demo source and html source --> <fileset dir="build/result"> - <include name="src/${toolkit-package}/demo/Calc.*" /> - <include name="src/${toolkit-package}/demo/HelloWorld.*" /> + <include name="src/${toolkit-package}/demo/**/*" /> </fileset> </war> - <!-- Jetty --> - <copy todir="${output-dir}/demo"> - <fileset dir="build/demo"> - <exclude name="**/.svn" /> - </fileset> - </copy> - <!-- Sources --> <copy todir="${output-dir}/demo/src"> <fileset dir="build/result/src"> - <include name="src/${toolkit-package}/demo/Calc.*" /> - <include name="src/${toolkit-package}/demo/HelloWorld.*" /> + <include name="src/${toolkit-package}/demo/**/*" /> </fileset> </copy> |