1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39
|
Description: Set the source encoding to fix the build failure with recent JDKs
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
@@ -59,7 +59,7 @@
<!-- ========== Compile Targets ========================================= -->
<target name="compile" depends="init" description="Compile shareable components">
<mkdir dir="${build.home}/classes"/>
- <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" target="${compile.target}" source="${compile.source}" excludes="${compile.excludes}" optimize="${compile.optimize}">
+ <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" target="${compile.target}" source="${compile.source}" excludes="${compile.excludes}" optimize="${compile.optimize}" encoding="ISO-8859-1">
<classpath refid="compile.classpath"/>
</javac>
<copy todir="${build.home}/classes" filtering="on">
@@ -73,6 +73,7 @@
<mkdir dir="${build.home}/tests"/>
<javac srcdir="${test.home}" destdir="${build.home}/tests"
target="1.5" source="1.5"
+ encoding="ISO-8859-1"
includes="org/apache/commons/lang/enums/EnumUtilsLang76Test.java">
<classpath refid="test.classpath"/>
</javac>
@@ -80,7 +81,7 @@
<target name="compile.tests" depends="compile,test.compile.jdk15" description="Compile unit test cases">
<mkdir dir="${build.home}/tests"/>
- <javac srcdir="${test.home}" destdir="${build.home}/tests" debug="${compile.debug}" deprecation="off" target="${compile.target}" source="${compile.source}" optimize="${compile.optimize}">
+ <javac srcdir="${test.home}" destdir="${build.home}/tests" debug="${compile.debug}" deprecation="off" target="${compile.target}" source="${compile.source}" optimize="${compile.optimize}" encoding="ISO-8859-1">
<exclude name="org/apache/commons/lang/enums/EnumUtilsLang76Test.java" if="jdk.1.5.present"/>
<classpath refid="test.classpath"/>
</javac>
@@ -149,6 +150,7 @@
bottom="Copyright &copy; 2001-${current.year} - Apache Software Foundation"
use="true"
link="${jdk.javadoc}"
+ encoding="ISO-8859-1"
source="${compile.source}">
<classpath refid="compile.classpath"/>
</javadoc>
|