diff options
| author | Martin Ridgers <[email protected]> | 2021-11-25 11:07:49 +0100 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-11-25 11:07:49 +0100 |
| commit | 594501a96a4b64d3832d844909172a33fa14e7e2 (patch) | |
| tree | 4e48156c975064f5edf32202e02e18b720f503b9 /scripts | |
| parent | Tests for building ArgV for a fork-exec (diff) | |
| parent | Merge branch 'main' of https://github.com/EpicGames/zen (diff) | |
| download | zen-594501a96a4b64d3832d844909172a33fa14e7e2.tar.xz zen-594501a96a4b64d3832d844909172a33fa14e7e2.zip | |
Merged main
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/deploybuild.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/scripts/deploybuild.py b/scripts/deploybuild.py index c81235a8c..d137c3da1 100644 --- a/scripts/deploybuild.py +++ b/scripts/deploybuild.py @@ -50,20 +50,20 @@ while not os.path.exists(os.path.join(zenroot, "zen.sln")): zenroot = os.path.dirname(zenroot) jazz_print("Zen root:", zenroot) - # Build fresh binaries -if use_xmake: - build_cmd = ["xmake", "-b", "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", "zen.sln"] - build_output_dir = r'x64\Release' - 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", "zen.sln"] + build_output_dir = r'x64\Release' + subprocess.run(build_cmd, check=True) except: jazz_fail("Build failed!") |