From 40de9d5153dd8dc1f13702e8fc57848f5bc59949 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 3 Jun 2014 14:33:04 +0000
Subject: [PATCH] Set explicit encoding in fixcrlf so that we're not dependent
 on the system default encoding.

The system default encoding is variable, particularly on Windows, and using it for fixcrlf can cause corruption of UTF-8 multi-byte character encodings.
---
 build.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index a9da11c3..d4b272fb 100644
--- a/build.xml
+++ b/build.xml
@@ -428,7 +428,7 @@
         <MDNORM i="${xml.dir}/${md.test.unsigned}"/>
         <MDNORM i="${xml.dir}/${md.export.unsigned}"/>
         <MDNORM i="${xml.dir}/${md.back.unsigned}"/>
-        <fixcrlf file="${xml.dir}/ukfederation-stats.html" eol="lf"/>
+        <fixcrlf file="${xml.dir}/ukfederation-stats.html" eol="lf" encoding="UTF-8"/>
 		
         <echo>Generated UK unsigned metadata.</echo>
 	</target>
@@ -658,7 +658,7 @@
 			</XMLSECTOOL>
 			
 			<!-- Force the output file to use Unix line endings -->
-			<fixcrlf file="${xml.dir}/@{o}" eol="lf"/>
+			<fixcrlf file="${xml.dir}/@{o}" eol="lf" encoding="UTF-8"/>
 
 		</sequential>
 	</macrodef>
@@ -851,7 +851,7 @@
         <delete file="${entities.dir}/imported.xml" quiet="true" verbose="false"/>
 		<CHANNEL.do channel="uk" verb="import.metadata"/>
 		<echo>Imported metadata to ${entities.dir}/imported.xml</echo>
-        <fixcrlf file="${entities.dir}/imported.xml"/>
+        <fixcrlf file="${entities.dir}/imported.xml" encoding="UTF-8"/>
 	</target>
 	
     <!--
@@ -1199,7 +1199,7 @@
 	-->
 	<target name="stats">
 		<CHANNEL.do channel="uk" verb="statistics"/>
-		<fixcrlf file="${xml.dir}/ukfederation-stats.html" eol="lf"/>
+		<fixcrlf file="${xml.dir}/ukfederation-stats.html" eol="lf" encoding="UTF-8"/>
 	</target>
 	
 	<!--