diff options
| author | Stefan Boberg <[email protected]> | 2022-01-26 13:12:45 +0100 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2022-01-26 13:12:45 +0100 |
| commit | a008040b493e7df15222517546213ffd63137106 (patch) | |
| tree | a7a123015374493507d5dc81f2a38c5021d7d4f1 /scripts | |
| parent | Added some more exclusions for vs-chromium (diff) | |
| parent | Merge branch 'main' of https://github.com/EpicGames/zen (diff) | |
| download | zen-a008040b493e7df15222517546213ffd63137106.tar.xz zen-a008040b493e7df15222517546213ffd63137106.zip | |
Merge branch 'main' of https://github.com/EpicGames/zen
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/deploybuild.py | 15 | ||||
| -rw-r--r-- | scripts/upload_syms.bat | 3 |
2 files changed, 6 insertions, 12 deletions
diff --git a/scripts/deploybuild.py b/scripts/deploybuild.py index 4327d14f7..37518fd0c 100644 --- a/scripts/deploybuild.py +++ b/scripts/deploybuild.py @@ -30,12 +30,10 @@ origcwd = os.getcwd() parser = argparse.ArgumentParser(description='Deploy a zen build to an UE tree') parser.add_argument("root", help="Path to an UE5 root directory") parser.add_argument("--sentry", action="store_true", help="Whether to upload symobls to Sentry") -parser.add_argument("--xmake", action="store_true", help="Build with XMake") args = parser.parse_args() engineroot = args.root upload_symbols = args.sentry -use_xmake = args.xmake if not os.path.isfile(os.path.join(engineroot, "RunUAT.bat")): print(f"{Fore.RED}Not a valid UE5 engine root directory: '{engineroot}'") @@ -53,16 +51,9 @@ jazz_print("Zen root:", zenroot) # Build fresh binaries try: - if use_xmake: - subprocess.run(["xmake.exe", "config", "-p", "windows", "-a", "x64", "-m", "release"], check=True) - build_cmd = ["xmake.exe", "build", "--rebuild", "zenserver"] - build_output_dir = r'build\windows\x64\release' - else: - vs_path = vswhere.get_latest_path() # can also specify prerelease=True - jazz_print("BUILDING CODE", f"using VS root: {vs_path}") - devenv_path = os.path.join(vs_path, "Common7\\IDE\\devenv.com") - build_cmd = [devenv_path, "/build", "Release", "vsxmake2019\\zen.sln"] - build_output_dir = r'x64\Release' + subprocess.run(["xmake.exe", "config", "-p", "windows", "-a", "x64", "-m", "release"], check=True) + build_cmd = ["xmake.exe", "build", "--rebuild", "zenserver"] + build_output_dir = r'build\windows\x64\release' subprocess.run(build_cmd, check=True) except: diff --git a/scripts/upload_syms.bat b/scripts/upload_syms.bat new file mode 100644 index 000000000..663d64e06 --- /dev/null +++ b/scripts/upload_syms.bat @@ -0,0 +1,3 @@ +rem This is a temporary hack until everyone has access to Sentry + +scripts\sentry-cli upload-dif --org to --project zen-server \ue5-main\Engine\Binaries\Win64\zenserver.exe \ue5-main\engine\Binaries\Win64\zenserver.pdb |