[Jython-checkins] jython: Tweak build.xml to allow for non-ascii paths on Windows.
jeff.allen
jython-checkins at python.org
Sun May 21 05:01:59 EDT 2017
https://hg.python.org/jython/rev/8b6113558573
changeset: 8082:8b6113558573
parent: 8072:b051f30c4cd4
user: Jeff Allen <ja.py at farowl.co.uk>
date: Sun Mar 26 08:32:21 2017 +0100
summary:
Tweak build.xml to allow for non-ascii paths on Windows.
Previously ANTLR (write) and javac (read), were given different information
about the encoding of files, and javac would choke on (the comments in) ANTLR's
output, where the ANTLR source file is mentioned. This is fixed, and we add an
encoding attribuite to the javadoc target for good measure.
files:
build.xml | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -236,6 +236,7 @@
<echo>output.dir = '${output.dir}'</echo>
<echo>compile.dir = '${compile.dir}'</echo>
<echo>exposed.dir = '${exposed.dir}'</echo>
+ <echo>gensrc.dir = '${gensrc.dir}'</echo>
<echo>dist.dir = '${dist.dir}'</echo>
<echo>apidoc.dir = '${apidoc.dir}'</echo>
<echo>templates.dir = '${templates.dir}'</echo>
@@ -434,6 +435,7 @@
<target name="antlr_gen" depends="prepare-output" unless="antlr.notneeded">
<java classname="org.antlr.Tool" failonerror="false" fork="true" dir="${jython.base.dir}">
<jvmarg value="-Xmx512m"/>
+ <jvmarg value="-Dfile.encoding=UTF-8"/>
<arg value="-Xconversiontimeout"/>
<arg value="2000"/>
<arg value="-fo"/>
@@ -704,6 +706,7 @@
<javadoc sourcepath="${source.dir}"
destdir="${apidoc.dir}"
source="${jdk.source.version}"
+ encoding="UTF-8"
maxmemory="1024m"
public="true"
breakiterator="yes"
--
Repository URL: https://hg.python.org/jython
More information about the Jython-checkins
mailing list