Use cp1252 on Windows for the wxWidgets build too,

and add a note to the README about it.
This commit is contained in:
Robin Dunn
2016-02-29 19:11:49 -08:00
parent e07098db6d
commit 5c029d5955
2 changed files with 14 additions and 3 deletions

View File

@@ -41,18 +41,28 @@ or building an egg.
Using the build.py script allows for greater control over the build process Using the build.py script allows for greater control over the build process
than setup.py does, including commands for performing the various than setup.py does, including commands for performing the various
code-generation steps. So developers working on Phoenix itself or building code-generation steps. So developers working on Phoenix itself or building
from a Git checkout, instead of just building it from a source snapshot, from a Git checkout, instead of a source snapshot tarball, should be using
should be using the build.py script. Build.py provides a fairly simple the build.py script. The build.py script provides a fairly simple
command-line interface consisting of commands and options. To see the full command-line interface consisting of commands and options. To see the full
list run ``python build.py --help``. The most important commands are listed list run ``python build.py --help``. The most important commands are listed
below. below.
**Windows Users NOTE:** If you are building Phoenix on Windows and have a
non-English language installation of Microsoft Visual Studio then you may
need to set the code page in your console window in order to avoid Unicode
decoding errors. For example::
chcp 1252
python build.py <build commands>...
If you just want to do a standard setuptools-style build using setup.py and If you just want to do a standard setuptools-style build using setup.py and
are using a full source tarball, then you can stop reading at this point. If are using a full source tarball, then you can stop reading at this point. If
you want to build from a source repository checkout, or need to make changes you want to build from a source repository checkout, or need to make changes
and/or to regenerate some of the generated source files, then please continue and/or to regenerate some of the generated source files, then please continue
reading. reading.
Building wxWidgets Building wxWidgets
------------------ ------------------

View File

@@ -160,7 +160,8 @@ def getoutput(cmd):
output = None output = None
output = sp.stdout.read() output = sp.stdout.read()
if sys.version_info > (3,): if sys.version_info > (3,):
output = output.decode('utf-8') # TODO: is utf-8 okay here? outputEncoding = 'cp1252' if sys.platform == 'win32' else 'utf-8'
output = output.decode(outputEncoding)
output = output.rstrip() output = output.rstrip()
rval = sp.wait() rval = sp.wait()
if rval: if rval: