aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorMarko Grönroos <magi@iki.fi>2009-09-03 15:12:53 +0000
committerMarko Grönroos <magi@iki.fi>2009-09-03 15:12:53 +0000
commit6321a1a66fd2f890a6d00c4da658177f16b46a4a (patch)
tree8a25bd48404ae6c823fbeac31df8fcdb4fc80b14 /build
parente37a2939222bfdf2af4a5be4efe4f277d9585e5e (diff)
downloadvaadin-framework-6321a1a66fd2f890a6d00c4da658177f16b46a4a.tar.gz
vaadin-framework-6321a1a66fd2f890a6d00c4da658177f16b46a4a.zip
Specified input and output character encoding in filtered copy operations on source and HTML files. Should fix #3260. Hope that there aren't other cases in other kinds of files.
svn changeset:8659/svn branch:6.1
Diffstat (limited to 'build')
-rw-r--r--build/build.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml
index 6759566ae3..a6da55edf7 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -453,7 +453,7 @@
<include name="COPYING" />
</fileset>
</copy>
- <copy todir="${output-dir}/WebContent">
+ <copy todir="${output-dir}/WebContent" encoding="UTF-8" outputencoding="UTF-8">
<filterchain>
<expandproperties />
<replacetokens begintoken="@" endtoken="@">
@@ -619,7 +619,7 @@
<mkdir dir="${result-path}/src" />
<echo>Copying src directory and processing copied files.</echo>
<echo>Replacing &lt;version&gt; tag with build version for java/html/css/xml files.</echo>
- <copy todir="${result-path}/src">
+ <copy todir="${result-path}/src" encoding="UTF-8" outputencoding="UTF-8">
<filterset>
<filter token="ITMillApache2LicenseForJavaFiles" value="${ITMillApache2LicenseForJavaFiles}" />
<filter token="VERSION" value="${version}" />