Skip to content
This repository has been archived by the owner. It is now read-only.

Commit

Permalink
Set explicit encoding in fixcrlf so that we're not dependent on the s…
Browse files Browse the repository at this point in the history
…ystem 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.
  • Loading branch information
iay committed Jun 3, 2014
1 parent dee0b84 commit 40de9d5
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>

<!--
Expand Down Expand Up @@ -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>

<!--
Expand Down

0 comments on commit 40de9d5

Please sign in to comment.