Build: Add encoding to all javac targets

This commit is contained in:
zzz
2019-12-19 11:19:52 +00:00
parent 74020ae5a3
commit b2aa649c2a
22 changed files with 50 additions and 0 deletions

View File

@ -41,6 +41,7 @@
<target name="compile" depends="init, depend, warUpToDate">
<javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
srcdir="${src}" destdir="${build}">
<compilerarg line="${javac.compilerargs}" />
<classpath>

View File

@ -28,6 +28,7 @@
<target name="compile" depends="init">
<javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
srcdir="${src}" destdir="${build}">
<compilerarg line="${javac.compilerargs}" />
<classpath>
@ -52,6 +53,7 @@
</exec>
<javac source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
srcdir="${build}/messages-src" destdir="${build}">
<compilerarg line="${javac.compilerargs}" />
</javac>

View File

@ -59,6 +59,7 @@
srcdir="./java"
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
destdir="./build/obj"
classpath="${cp}">
<compilerarg line="${javac.compilerargs}" />
@ -77,6 +78,7 @@
srcdir="./java"
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
destdir="./build/obj"
classpath="${cpSocket}">
<compilerarg line="${javac.compilerargs}" />

View File

@ -42,6 +42,7 @@
srcdir="./src"
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
destdir="./build/obj"
encoding="UTF-8"
includeAntRuntime="false" >
<compilerarg line="${javac.compilerargs}" />
<classpath>
@ -164,6 +165,7 @@
</exec>
<javac source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
srcdir="build/messages-src" destdir="build/obj">
<compilerarg line="${javac.compilerargs}" />
</javac>

View File

@ -42,6 +42,7 @@
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
destdir="./build/obj"
includeAntRuntime="false"
encoding="UTF-8"
classpath="../../../core/java/build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../ministreaming/java/build/mstreaming.jar" >
<compilerarg line="${javac.compilerargs}" />
</javac>
@ -57,6 +58,7 @@
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
destdir="./build/obj"
includeAntRuntime="false"
encoding="UTF-8"
classpath="../../../core/java/build/i2p.jar:build/i2ptunnel.jar:../../jetty/jettylib/jetty-i2p.jar:../../jetty/jettylib/jetty-util.jar:../../jetty/jettylib/jetty-xml.jar" >
<compilerarg line="${javac.compilerargs}" />
</javac>
@ -166,6 +168,7 @@
</exec>
<javac source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
srcdir="build/messages-src" destdir="../jsp/WEB-INF/classes">
<compilerarg line="${javac.compilerargs}" />
</javac>
@ -210,6 +213,7 @@
</exec>
<javac source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
srcdir="build/messages-proxy-src" destdir="build/obj">
<compilerarg line="${javac.compilerargs}" />
</javac>
@ -347,6 +351,7 @@
</java>
<javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
destdir="../jsp/WEB-INF/classes/" srcdir="../jsp/WEB-INF/classes" includes="**/*.java">
<compilerarg line="${javac.compilerargs}" />
<classpath>
@ -411,6 +416,7 @@
<!-- We need the ant runtime, as it includes junit -->
<javac srcdir="./src:./test/junit" debug="true" source="${javac.version}" target="${javac.version}"
includeAntRuntime="true"
encoding="UTF-8"
deprecation="on" destdir="./build/obj" >
<compilerarg line="${javac.compilerargs}" />
<classpath>

View File

@ -25,6 +25,7 @@
<mkdir dir="./build/obj" />
<javac srcdir="./core/src/main/java" debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
destdir="./build/obj" >
<compilerarg line="${javac.compilerargs}" />
</javac>
@ -37,6 +38,7 @@
srcdir="./test/junit"
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
destdir="./buildTest/obj"
classpath="./build/identicon.jar" >
<compilerarg line="${javac.compilerargs}" />

View File

@ -36,6 +36,7 @@
<mkdir dir="./build/WEB-INF/classes" />
<javac srcdir="./webapp/src/main/java" debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
classpathref="cp"
destdir="./build/WEB-INF/classes" >
<compilerarg line="${javac.compilerargs}" />

View File

@ -25,11 +25,13 @@
<mkdir dir="./build/obj" />
<javac srcdir="./core/src/main/java" debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
destdir="./build/obj" >
<compilerarg line="${javac.compilerargs7}" />
</javac>
<javac srcdir="./javase/src/main/java" debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
destdir="./build/obj" classpath="./build/obj" >
<compilerarg line="${javac.compilerargs7}" />
</javac>
@ -42,6 +44,7 @@
srcdir="./test/junit"
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
destdir="./buildTest/obj"
classpath="./build/zxing.jar" >
<compilerarg line="${javac.compilerargs7}" />

View File

@ -387,6 +387,7 @@
srcdir="./java/src"
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
destdir="./build/obj"
encoding="UTF-8"
includeAntRuntime="false" >
<classpath>
<pathelement location="../../core/java/build/i2p.jar" />
@ -470,6 +471,7 @@
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
destdir="./build/objPatches"
includeAntRuntime="false"
encoding="UTF-8"
classpath="" >
<compilerarg line="${javac.compilerargs}" />
</javac>

View File

@ -35,6 +35,7 @@
target="${javac.version}"
destdir="./build/obj"
includeAntRuntime="false"
encoding="UTF-8"
includes="**/*.java" >
<compilerarg line="${javac.compilerargs}" />
<classpath>

View File

@ -36,6 +36,7 @@
<!-- half of this is deprecated classes so turn deprecation off -->
<javac srcdir="./src" debug="true" deprecation="off" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
destdir="./build/obj" classpath="../../../core/java/build/i2p.jar" >
<compilerarg line="${javac.compilerargs}" />
</javac>
@ -48,6 +49,7 @@
srcdir="./demo"
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
destdir="./buildDemo/obj"
classpath="../../../core/java/build/i2p.jar:./build/mstreaming.jar" >
<compilerarg line="${javac.compilerargs}" />
@ -122,6 +124,7 @@
</exec>
<javac source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
srcdir="build/messages-src" destdir="build/obj">
<compilerarg line="${javac.compilerargs}" />
</javac>
@ -214,6 +217,7 @@
srcdir="./test/junit"
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
destdir="./build/obj" >
<classpath>
<pathelement path="${javac.classpath}" />

View File

@ -58,6 +58,7 @@
srcdir="./src"
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
destdir="./build/obj">
<compilerarg line="${javac.compilerargs}" />
<classpath>
@ -95,6 +96,7 @@
includes="net/i2p/router/news/*.java"
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
destdir="./build/obj">
<compilerarg line="${javac.compilerargs}" />
<classpath>
@ -177,6 +179,7 @@
</exec>
<javac source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
srcdir="build/messages-src" destdir="build/obj">
<compilerarg line="${javac.compilerargs}" />
</javac>
@ -234,6 +237,7 @@
</exec>
<javac source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
srcdir="build/messages-news-src" destdir="build/obj">
<compilerarg line="${javac.compilerargs}" />
</javac>
@ -253,6 +257,7 @@
</exec>
<javac source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
srcdir="build/messages-countries-src" destdir="build/obj">
<compilerarg line="${javac.compilerargs}" />
</javac>

View File

@ -35,6 +35,7 @@
srcdir="./src"
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
destdir="./build/obj"
classpath="../../../core/java/build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../ministreaming/java/build/mstreaming.jar" >
<compilerarg line="${javac.compilerargs7}" />
@ -46,6 +47,7 @@
srcdir="./test"
debug="true" deprecation="on" source="1.7" target="1.7"
includeAntRuntime="false"
encoding="UTF-8"
destdir="./build/obj"
classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
<compilerarg line="${javac.compilerargs7}" />

View File

@ -32,6 +32,7 @@
srcdir="./src"
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
destdir="./build/obj"
classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
<compilerarg line="${javac.compilerargs}" />
@ -60,6 +61,7 @@
srcdir="./test/junit"
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
destdir="./build/obj" >
<classpath>
<pathelement path="${javac.classpath}" />

View File

@ -48,6 +48,7 @@
<mkdir dir="${bin}" />
<javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
classpathref="cp" destdir="${bin}" srcdir="${src}" includes="**/*.java" >
<compilerarg line="${javac.compilerargs}" />
</javac>
@ -89,6 +90,7 @@
</java>
<javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
destdir="${bin}" srcdir="${tmp}" includes="**/*.java" classpathref="cp">
<compilerarg line="${javac.compilerargs}" />
</javac>
@ -183,6 +185,7 @@
</exec>
<javac source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
srcdir="build/messages-src" destdir="${bin}">
<compilerarg line="${javac.compilerargs}" />
</javac>

View File

@ -40,6 +40,7 @@
srcdir="./src/src"
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
destdir="./src/WEB-INF/classes">
<compilerarg line="${javac.compilerargs}" />
<classpath>
@ -136,6 +137,7 @@
</exec>
<javac source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
srcdir="build/messages-src" destdir="src/WEB-INF/classes">
<compilerarg line="${javac.compilerargs}" />
</javac>

View File

@ -34,6 +34,7 @@
target="${javac.version}"
destdir="./build/obj"
includeAntRuntime="false"
encoding="UTF-8"
includes="**/*.java"
classpath="../../../core/java/build/i2p.jar" >
<compilerarg line="${javac.compilerargs}" />

View File

@ -79,6 +79,7 @@
<javac sourcepath="" srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
debuglevel="lines,vars,source"
includeAntRuntime="false"
encoding="UTF-8"
destdir="./build/obj" classpath="${javac.classpath.mod}" >
<compilerarg line="${javac.compilerargs}" />
<include name="**/*.java" />
@ -149,6 +150,7 @@
</exec>
<javac source="${javac.version}" target="${javac.version}"
includeAntRuntime="false"
encoding="UTF-8"
srcdir="build/messages-src" destdir="build/obj">
<compilerarg line="${javac.compilerargs}" />
</javac>
@ -268,6 +270,7 @@
<javac srcdir="./test/junit" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
debuglevel="lines,vars,source"
includeAntRuntime="true"
encoding="UTF-8"
excludes="${source.exclude}"
destdir="./build/obj" >
<classpath>
@ -488,6 +491,7 @@
<javac srcdir="./bench" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
debuglevel="lines,vars,source"
includeAntRuntime="false"
encoding="UTF-8"
destdir="./build/obj_bench" >
<classpath>
<pathelement location="${jmh.home}/jmh-core.jar" />

View File

@ -26,6 +26,7 @@
<mkdir dir="./build/obj" />
<javac srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
includeAntRuntime="false"
encoding="UTF-8"
destdir="./build/obj" classpath="${javac.classpath}:../../core/java/build/obj" >
<compilerarg line="${javac.compilerargs}" />
</javac>

View File

@ -29,6 +29,7 @@
<mkdir dir="./build/obj" />
<javac srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
includeAntRuntime="false"
encoding="UTF-8"
destdir="./build/obj" >
<compilerarg line="${javac.compilerargs}" />
<classpath>

View File

@ -26,6 +26,7 @@
<mkdir dir="./build/obj" />
<javac srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
includeAntRuntime="false"
encoding="UTF-8"
destdir="./build/obj" classpath="${javac.classpath}:../../../build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../../build/router.jar" >
<compilerarg line="${javac.compilerargs}" />
</javac>

View File

@ -42,6 +42,7 @@
<javac srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
debuglevel="lines,vars,source"
includeAntRuntime="false"
encoding="UTF-8"
destdir="./build/obj" classpath="../../core/java/build/obj:../../core/java/build/i2p.jar:../../core/java/build/gnu-getopt.jar:../../core/java/build/httpclient.jar:../../core/java/build/httpcore.jar" >
<compilerarg line="${javac.compilerargs}" />
</javac>
@ -190,6 +191,7 @@
<javac srcdir="./test/junit" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
debuglevel="lines,vars,source"
includeAntRuntime="true"
encoding="UTF-8"
destdir="./build/obj">
<classpath>
<pathelement path="${javac.classpath}" />