More work on patch-both-repositories.py
This commit is contained in:
@@ -18,7 +18,7 @@
|
||||
# UNREALENGINE/Engine/Source/Runtime/Core/Private/Logging/LogMacros.cpp
|
||||
#
|
||||
|
||||
import sys, os, json
|
||||
import sys, os, json, shutil
|
||||
from pathlib import Path
|
||||
|
||||
#
|
||||
@@ -93,14 +93,13 @@ with open("Integration.uproject", "w") as rewritten:
|
||||
json.dump(UPROJECT, rewritten, indent=4)
|
||||
|
||||
#
|
||||
# Write the Makefile
|
||||
# Run Setup.sh in UNREALENGINE
|
||||
#
|
||||
|
||||
writefile("Makefile", f"""
|
||||
all:
|
||||
(cd luprex ; make)
|
||||
dotnet {UNREALENGINE}/Engine/Binaries/DotNET/UnrealBuildTool/UnrealBuildTool.dll IntegrationEditor Linux DebugGame -project="{INTEGRATION}/Integration.uproject" -waitmutex
|
||||
""")
|
||||
os.chdir(UNREALENGINE)
|
||||
print("Running setup.sh...")
|
||||
os.system("./Setup.sh")
|
||||
os.chdir(INTEGRATION)
|
||||
|
||||
#
|
||||
# Use UnrealBuildTool to generate a rough draft of Integration.code-workspace.
|
||||
@@ -156,7 +155,6 @@ LUPREXBUILDTASK["options"]["cwd"] = f"{INTEGRATION}/luprex"
|
||||
LLDBINIT=[
|
||||
f"command script import {UNREALENGINE}/Engine/Extras/LLDBDataFormatters/UEDataFormatters_2ByteChars.py",
|
||||
'target stop-hook add --one-liner "p ::UngrabAllInputImpl()"',
|
||||
"breakpoint set --name UBreakPoint::OnLogError"
|
||||
]
|
||||
|
||||
for config in WORKSPACE["launch"]["configurations"]:
|
||||
@@ -182,3 +180,30 @@ WORKSPACE["launch"]["configurations"] = [x for x in WORKSPACE["launch"]["configu
|
||||
with open("Integration.code-workspace", "w") as rewritten:
|
||||
json.dump(WORKSPACE, rewritten, indent=4)
|
||||
|
||||
#
|
||||
# Do an initial build of Luprex
|
||||
#
|
||||
|
||||
os.chdir(f"{INTEGRATION}/luprex")
|
||||
print("Building luprex...")
|
||||
os.system("make")
|
||||
os.chdir(INTEGRATION)
|
||||
|
||||
#
|
||||
# Build ShaderCompileWorker
|
||||
#
|
||||
|
||||
os.chdir(UNREALENGINE)
|
||||
print("Building ShaderCompileWorker...")
|
||||
os.system("Engine/Build/BatchFiles/Linux/Build.sh ShaderCompileWorker Linux Shipping -waitmutex")
|
||||
Path("Engine/Binaries/Linux/ShaderCompileWorker").unlink(missing_ok=True)
|
||||
shutil.copyfile("Engine/Binaries/Linux/ShaderCompileWorker-Linux-Shipping", "Engine/Binaries/Linux/ShaderCompileWorker")
|
||||
os.chdir(INTEGRATION)
|
||||
|
||||
#
|
||||
# Build Integration
|
||||
#
|
||||
|
||||
print("Building integration...")
|
||||
os.system(f'dotnet {UNREALENGINE}/Engine/Binaries/DotNET/UnrealBuildTool/UnrealBuildTool.dll IntegrationEditor Linux DebugGame -project="{INTEGRATION}/Integration.uproject" -waitmutex')
|
||||
|
||||
|
||||
Reference in New Issue
Block a user