Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2024-12-27 07:05:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

proton: Make debug logging a little simpler

Browse Source
This commit is contained in:
Andrew Eikum 2018-03-16 11:02:04 -05:00
parent 5b3ceebc20
commit ba3e23fb31
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
proton
View File

@ -13,6 +13,8 @@ import tarfile
from filelock import FileLock, Timeout from filelock import FileLock, Timeout
#WITH_WINEDEBUG="+timestamp,+pid,+tid,+seh"
CURRENT_PREFIX_VERSION="3.0-1" CURRENT_PREFIX_VERSION="3.0-1"
PFX="Proton: " PFX="Proton: "
@ -78,18 +80,15 @@ with dist_lock:
env = dict(os.environ) env = dict(os.environ)
env["WINEDEBUG"] = "-all" try:
lfile_path = None env["WINEDEBUG"] = WITH_WINEDEBUG
lfile_path = os.environ["HOME"] + "/steam-" + os.environ["SteamGameId"] + ".log"
#env["WINEDEBUG"] = "+timestamp,+tid,+seh"
#lfile_path = os.environ["HOME"] + "/steam-" + os.environ["SteamGameId"] + ".log"
if lfile_path is None:
lfile = open("/dev/null", "w")
else:
if os.path.exists(lfile_path): if os.path.exists(lfile_path):
os.remove(lfile_path) os.remove(lfile_path)
lfile = open(lfile_path, "w") lfile = open(lfile_path, "w")
except (NameError, KeyError): #WITH_WINEDEBUG is unset, or SteamGameId is unset
env["WINEDEBUG"] = "-all"
lfile = open("/dev/null", "w")
if ld_path_var in os.environ: if ld_path_var in os.environ:
env[ld_path_var] = lib64dir + ":" + libdir + ":" + os.environ[ld_path_var] env[ld_path_var] = lib64dir + ":" + libdir + ":" + os.environ[ld_path_var]
@ -279,14 +278,16 @@ def determine_architecture(path):
return ARCH_UNKNOWN return ARCH_UNKNOWN
def dump_dbg_env(f): def dump_dbg_env(f):
f.write("SteamGameId=\"" + env["SteamGameId"] + "\" \\\n") f.write("PATH=\"" + env["PATH"] + "\" \\\n")
f.write("\tSteamAppId=\"" + env["SteamAppId"] + "\" \\\n")
f.write("\tTERM=\"xterm\" \\\n") #XXX f.write("\tTERM=\"xterm\" \\\n") #XXX
f.write("\tPATH=\"" + env["PATH"] + "\" \\\n")
f.write("\tWINEDEBUG=\"-all\" \\\n") f.write("\tWINEDEBUG=\"-all\" \\\n")
f.write("\tWINEDLLPATH=\"" + env["WINEDLLPATH"] + "\" \\\n") f.write("\tWINEDLLPATH=\"" + env["WINEDLLPATH"] + "\" \\\n")
f.write("\t" + ld_path_var + "=\"" + env[ld_path_var] + "\" \\\n") f.write("\t" + ld_path_var + "=\"" + env[ld_path_var] + "\" \\\n")
f.write("\tWINEPREFIX=\"" + env["WINEPREFIX"] + "\" \\\n") f.write("\tWINEPREFIX=\"" + env["WINEPREFIX"] + "\" \\\n")
if "SteamGameId" in env:
f.write("\tSteamGameId=\"" + env["SteamGameId"] + "\" \\\n")
if "SteamAppId" in env:
f.write("\tSteamAppId=\"" + env["SteamAppId"] + "\" \\\n")
if "PROTON_VR_RUNTIME" in env: if "PROTON_VR_RUNTIME" in env:
f.write("\tPROTON_VR_RUNTIME=\"" + env["PROTON_VR_RUNTIME"] + "\" \\\n") f.write("\tPROTON_VR_RUNTIME=\"" + env["PROTON_VR_RUNTIME"] + "\" \\\n")
if "WINEDLLOVERRIDES" in env: if "WINEDLLOVERRIDES" in env: