diff options
author | Joonas Lehtinen <joonas.lehtinen@itmill.com> | 2006-10-20 14:47:51 +0000 |
---|---|---|
committer | Joonas Lehtinen <joonas.lehtinen@itmill.com> | 2006-10-20 14:47:51 +0000 |
commit | 348494717153403ee174bf2c6f5438c0918b350d (patch) | |
tree | f0bc14837299e9f5782e8eb7845426b212888cd9 | |
parent | 3bb35952446a4314087bfac31e9ab0d94b500503 (diff) | |
download | vaadin-framework-348494717153403ee174bf2c6f5438c0918b350d.tar.gz vaadin-framework-348494717153403ee174bf2c6f5438c0918b350d.zip |
svn changeset:85/svn branch:toolkit
-rw-r--r-- | build/build.xml | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/build/build.xml b/build/build.xml index c74202cec1..286571ac87 100644 --- a/build/build.xml +++ b/build/build.xml @@ -45,9 +45,6 @@ </copy> --> - <!-- Convert to CRLF --> - <fixcrlf srcdir="${output-dir}" eol="crlf" tablength="4" tab="remove" includes="*.txt" /> - <!-- Create Output Directory Hierarchy --> <mkdir dir="${output-dir}/doc/manual" /> <mkdir dir="${output-dir}/doc/api" /> @@ -89,13 +86,6 @@ <!-- Create binary JAR --> <jar jarfile="${output-dir}/lib/${lib-bin-jar-name}" compress="true" includes="${toolkit-package}/**" basedir="build/result/classes" excludes="${toolkit-package}/demo/**" /> - <!-- <fileset dir="src"> - <patternset> - <include name="${toolkit-package}/**/*.class" /> - <exclude name="${toolkit-package}/demo/**/*.class" /> - </patternset> - </fileset> - </jar>--> <!-- Create source JAR --> <jar jarfile="${output-dir}/lib/${lib-src-jar-name}" compress="true"> @@ -139,7 +129,7 @@ <copy todir="${output-dir}/demo/src"> <fileset dir="src"> - <include name="${package-file-name}/demo/**/*.java" /> + <include name="${toolkit-package}/demo/**/*.java" /> </fileset> </copy> </target> @@ -151,6 +141,9 @@ <target name="package-docs" depends="init"> <copy todir="${output-dir}"> + <filterchain> + <expandproperties /> + </filterchain> <fileset dir=""> <include name="*.html" /> <include name="*.txt" /> |