diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-17 08:05:54 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-17 08:05:54 +0400 |
| commit | 1cfbde0eb469f7d827b73667d7406eddc0065ceb (patch) | |
| tree | 3765064220fa1247eab3240ccd464f49aa2962f4 /build_files/cmake/project_source_info.py | |
| parent | 68fa959de56f09f2dd575408699e4284eac77857 (diff) | |
pass encoding to uses of decode() incase the default isnt utf-8. ignore decode errors in some cases.
This should fix an error with generated qtcreator projects.
also replace decoded bytes for unicode escape sequences in the VIEW3D_MT_edit_text_chars menu.
Diffstat (limited to 'build_files/cmake/project_source_info.py')
| -rw-r--r-- | build_files/cmake/project_source_info.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build_files/cmake/project_source_info.py b/build_files/cmake/project_source_info.py index 5d646eea2c1..d4b48ccd859 100644 --- a/build_files/cmake/project_source_info.py +++ b/build_files/cmake/project_source_info.py @@ -73,7 +73,7 @@ def do_ignore(filepath, ignore_prefix_list): def makefile_log(): import subprocess import time - # Check blender is not 2.5x until it supports playback again + print("running make with --dry-run ...") process = subprocess.Popen(["make", "--always-make", "--dry-run", "--keep-going", "VERBOSE=1"], stdout=subprocess.PIPE, @@ -85,7 +85,7 @@ def makefile_log(): out = process.stdout.read() process.stdout.close() print("done!", len(out), "bytes") - return out.decode("ascii").split("\n") + return out.decode("utf-8", errors="ignore").split("\n") def build_info(use_c=True, use_cxx=True, ignore_prefix_list=None): |