More improvements to build-everything

This commit is contained in:
2024-11-07 17:53:05 -05:00
parent 9e680d5a66
commit 7239d3d7f9

View File

@@ -38,8 +38,8 @@ def writefile(fn, str):
f.write(str) f.write(str)
def shell(cmd): def shell(cmd):
print("Running:", cmd) print("Running:", cmd)
subprocess.run(cmd, shell=True, check=True) subprocess.run(cmd, shell=True, check=True)
# #
# These are some directory paths that we will need. # These are some directory paths that we will need.
@@ -90,8 +90,9 @@ writefile("Source/Integration/lpx-paths.hpp", f"""
os.chdir(UNREALENGINE) os.chdir(UNREALENGINE)
print("Applying patch to Unreal Engine...") print("Applying patch to Unreal Engine...")
shell("git checkout HEAD Engine/Source/Runtime/ApplicationCore/Private/Linux/LinuxPlatformApplicationMisc.cpp") for line in readfile(f"{INTEGRATION}/EnginePatches/EnginePatch").splitlines():
shell("git checkout HEAD Engine/Source/Runtime/Core/Private/Logging/LogMacros.cpp") if line.startswith("--- a/"):
shell(f"git checkout HEAD {line[6:]}")
shell(f"git apply {INTEGRATION}/EnginePatches/EnginePatch") shell(f"git apply {INTEGRATION}/EnginePatches/EnginePatch")
os.chdir(INTEGRATION) os.chdir(INTEGRATION)
@@ -183,6 +184,26 @@ def goodconf(config):
WORKSPACE["launch"]["configurations"] = [x for x in WORKSPACE["launch"]["configurations"] if goodconf(x)] WORKSPACE["launch"]["configurations"] = [x for x in WORKSPACE["launch"]["configurations"] if goodconf(x)]
#
# Add some recommended extensions.
#
EXTENSIONS=set(WORKSPACE["extensions"]["recommendations"])
EXTENSIONS.add("ms-python.python")
EXTENSIONS.add("vadimcn.vscode-lldb")
WORKSPACE["extensions"]["recommendations"] = list(EXTENSIONS)
#
# Tell vscode not to try watching all the UnrealEngine source code for modifications.
# Attempting this overruns a Linux hardwired limit on file watches.
#
WORKSPACE["settings"]["files.watcherExclude"] = {
f'{UNREALENGINE}/Engine/**' : True,
f'{UNREALENGINE}/Samples/**' : True,
f'{UNREALENGINE}/Templates/**' : True
}
# #
# Write Integration.code-workspace. # Write Integration.code-workspace.
# #