Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-01-26 13:38:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make proton, gen_wrapper and user_settings python scripts version-agnostic

Browse Source
This commit is contained in:
Mayeul Cantan 2018-08-23 13:21:22 +02:00
parent 2863402e9e
commit 9c3667c083
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lsteamclient/gen_wrapper.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python2
#!/usr/bin/env python
#NOTE: If you make modifications here, consider whether they should
#be duplicated in ../vrclient/gen_wrapper.py
@ -502,7 +502,7 @@ for sdkver in sdk_versions:
diagnostics = list(tu.diagnostics)
if len(diagnostics) > 0:
print 'There were parse errors'
print('There were parse errors')
pprint.pprint(diagnostics)
else:
children = list(tu.cursor.get_children())

16
proton
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python3
#!/usr/bin/env python
#script to launch Wine with the correct environment
@ -309,7 +309,8 @@ if "nod3d11" in config_opts:
del dlloverrides["dxgi"]
s = ""
for dll, setting in dlloverrides.items():
for dll in dlloverrides:
setting = dlloverrides[dll]
if len(s) > 0:
s = s + ";" + dll + "=" + setting
else:
@ -457,6 +458,13 @@ def run():
else:
run_wine([wine_path] + sys.argv[2:])
if sys.version_info[0] == 2:
binary_stdout = sys.stdout
elif sys.version_info[0] == 3:
binary_stdout = sys.stdout.buffer
else:
raise Exception("Unsuported python version")
#determine mode
if sys.argv[1] == "run":
#start target app
@ -469,11 +477,11 @@ elif sys.argv[1] == "waitforexitandrun":
elif sys.argv[1] == "getcompatpath":
#linux -> windows path
path = subprocess.check_output([wine_path, "winepath", "-w", sys.argv[2]], env=env, stderr=lfile)
sys.stdout.write(path.decode('utf-8'))
binary_stdout.write(path)
elif sys.argv[1] == "getnativepath":
#windows -> linux path
path = subprocess.check_output([wine_path, "winepath", sys.argv[2]], env=env, stderr=lfile)
sys.stdout.write(path.decode('utf-8'))
binary_stdout.write(path)
else:
log("Need a verb.")
sys.exit(1)

2
user_settings.sample.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python2.7
#!/usr/bin/env python
#to enable these settings, name this file "user_settings.py"

6
vrclient_x64/gen_wrapper.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python2
#!/usr/bin/env python
#NOTE: If you make modifications here, consider whether they should
#be duplicated in ../lsteamclient/gen_wrapper.py
@ -403,7 +403,7 @@ def get_capi_thunk_params(method):
def toBOOL(x):
return "TRUE" if x else "FALSE"
returns_record = method.result_type.get_canonical().kind == clang.cindex.TypeKind.RECORD
param_types = map(lambda x: x.type, get_params(method))
param_types = [x.type for x in get_params(method)]
if returns_record:
param_types.insert(0, method.result_type)
param_count = len(param_types)
@ -970,7 +970,7 @@ for sdkver in sdk_versions:
diagnostics = list(tu.diagnostics)
if len(diagnostics) > 0:
print 'There were parse errors'
print('There were parse errors')
pprint.pprint(diagnostics)
else:
children = list(tu.cursor.get_children())