db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1066789 - /db/derby/docs/trunk/build.xml
Date Thu, 03 Feb 2011 11:50:53 GMT
Author: kahatlen
Date: Thu Feb  3 11:50:52 2011
New Revision: 1066789

URL: http://svn.apache.org/viewvc?rev=1066789&view=rev
Log:
DERBY-4999: Docs build fails under C locale

Make sure the build script processes files using UTF-8 encoding when
doing filtering, regardless of the current locale.

Modified:
    db/derby/docs/trunk/build.xml

Modified: db/derby/docs/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/build.xml?rev=1066789&r1=1066788&r2=1066789&view=diff
==============================================================================
--- db/derby/docs/trunk/build.xml (original)
+++ db/derby/docs/trunk/build.xml Thu Feb  3 11:50:52 2011
@@ -125,7 +125,11 @@ limitations under the License.
     <!-- directory name, prepending the Apache License as we go.          -->
     <mkdir dir="${dita.dir}/temp"/>
     <mkdir dir="${basedir}/out/${manual.name}temp"/>
-    <copy todir="${basedir}/out/${manual.name}temp">
+    <!-- DERBY-4999: Must specify encoding when filter-copying files,
+         otherwise files may be garbled if the default encoding isn't
+         the same as the encoding actually used in the file. Assume
+         all files are UTF-8. -->
+    <copy encoding="UTF-8" todir="${basedir}/out/${manual.name}temp">
       <fileset dir="${dita.dir}/resource"
                includes="index.html,*.css"/>
       <filterchain>
@@ -140,7 +144,11 @@ limitations under the License.
       <property name="output.dir" value="${basedir}${file.separator}out${file.separator}${manual.name}temp"/>
       <property name="args.xhtml.toc" value="toc"/>
     </ant>
-    <move todir="${basedir}/out/${manual.name}">
+    <!-- DERBY-4999: Must specify encoding when filter-moving files,
+         otherwise files may be garbled if the default encoding isn't
+         the same as the encoding actually used in the file. Assume
+         all files are UTF-8. -->
+    <move encoding="UTF-8" todir="${basedir}/out/${manual.name}">
       <fileset dir="${basedir}/out/${manual.name}temp">
         <include name="**/*.html"/>
         <exclude name="**/*.gif"/>
@@ -311,7 +319,11 @@ limitations under the License.
 
   <!-- Copy files, replacing ant variables with release-specific constants -->
   <target name="preprocess-copy">
-    <copy todir="${target.dir}">
+    <!-- DERBY-4999: Must specify encoding when filter-copying files,
+         otherwise files may be garbled if the default encoding isn't
+         the same as the encoding actually used in the file. Assume
+         all files are UTF-8. -->
+    <copy encoding="UTF-8" todir="${target.dir}">
       <fileset dir="${source.dir}" includes="${inclusions}"/>
       <filterset>
         <filter token="COPYRIGHT_YEAR" value="${copyright.year}"/>



Mime
View raw message