From: Marko Grönroos <magi@iki.fi>
Date: Thu, 3 Sep 2009 15:12:53 +0000 (+0000)
Subject: Specified input and output character encoding in filtered copy operations on source... 
X-Git-Tag: 6.7.0.beta1~2524
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6321a1a66fd2f890a6d00c4da658177f16b46a4a;p=vaadin-framework.git

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
---

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}" />