Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1530 from akien-mga/py-two-old 

SCons: Remove old Python 2 compat code
pull/1534/head
David Snopek 2024-07-24 09:06:01 -05:00 committed by GitHub
parent 628606b28b 958776dfc3
commit f2b521f55a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/ios.py
View File

@ -1,3 +1,4 @@
import codecs
import os import os
import subprocess import subprocess
import sys import sys
@ -5,17 +6,6 @@ import sys
import common_compiler_flags import common_compiler_flags
from SCons.Variables import BoolVariable from SCons.Variables import BoolVariable
if sys.version_info < (3,):
def decode_utf8(x):
return x
else:
import codecs
def decode_utf8(x):
return codecs.utf_8_decode(x)[0]
def has_ios_osxcross(): def has_ios_osxcross():
return "OSXCROSS_IOS" in os.environ return "OSXCROSS_IOS" in os.environ
@ -53,9 +43,9 @@ def generate(env):
if sys.platform == "darwin": if sys.platform == "darwin":
if env["IOS_SDK_PATH"] == "": if env["IOS_SDK_PATH"] == "":
try: try:
env["IOS_SDK_PATH"] = decode_utf8( env["IOS_SDK_PATH"] = codecs.utf_8_decode(
subprocess.check_output(["xcrun", "--sdk", sdk_name, "--show-sdk-path"]).strip() subprocess.check_output(["xcrun", "--sdk", sdk_name, "--show-sdk-path"]).strip()
) )[0]
except (subprocess.CalledProcessError, OSError): except (subprocess.CalledProcessError, OSError):
raise ValueError( raise ValueError(
"Failed to find SDK path while running xcrun --sdk {} --show-sdk-path.".format(sdk_name) "Failed to find SDK path while running xcrun --sdk {} --show-sdk-path.".format(sdk_name)