Improvements to build deploy scripts

Deploybuild script now builds code first
Jazzed up terminal output

1 files changed, 24 insertions, 7 deletions

diff --git a/scripts/deploybuild.py b/scripts/deploybuild.py
index 1062f8b2e..1d9d5d839 100644
--- a/scripts/deploybuild.py
+++ b/scripts/deploybuild.py
@@ -4,9 +4,14 @@ import os
 import fileinput
 import colorama
 import shutil
+import vswhere
+import subprocess
 from peafour import P4
 from colorama import Fore, Back, Style
 
+def jazz_print(tag, detail = ""):
+    print(f"{Fore.WHITE}{Style.BRIGHT}||> {tag}{Style.RESET_ALL} {detail}")
+
 colorama.init()
 
 origcwd = os.getcwd()
@@ -31,10 +36,20 @@ zenroot = __file__
 while not os.path.exists(os.path.join(zenroot, "zen.sln")):
     zenroot = os.path.dirname(zenroot)
 
-print(f"Zen root: {zenroot}")
+jazz_print("Zen root:", zenroot)
+
+# Build fresh binaries
+
+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")
+
+subprocess.run([devenv_path, "/build", "Release", "zen.sln"])
 
 # Upload symbols etc to Sentry
 
+jazz_print("Uploading symbols", "to Sentry")
+subprocess.run(["scripts\sentry-cli.exe", "upload-dif",  "--org", "to", "--project", "zen-server", "x64\\Release\\zenserver.exe", "x64\\Release\\zenserver.pdb"])
 # scripts\sentry-cli.exe upload-dif --org to --project zen-server x64\Release\zenserver.exe x64\Release\zenserver.pdb
 
 # Change into root directory to pick up Perforce environment
@@ -49,7 +64,7 @@ if not os.path.samefile(p4info.clientRoot, engineroot):
 
 # check out the binaries
 
-print(f"Reverting any previous unsubmitted deploy")
+jazz_print("Reverting", "any previous unsubmitted deploy")
 
 try:
     P4.revert("Engine/Binaries/Win64/zenserver.*").run()
@@ -57,7 +72,7 @@ try:
 except:
     pass
 
-print(f"Checking out zenserver executables")
+jazz_print("Checking out", "zenserver executables")
 
 try:
     P4.edit("Engine/Binaries/Win64/zenserver.*").run()
@@ -65,16 +80,18 @@ try:
 except:
     pass
 
-print(f"Placing zenserver executables into tree")
+bin_dir = os.path.join(engineroot, "Engine\\Binaries\\Win64")
+
+jazz_print("Placing zenserver", f"executables into tree at '{bin_dir}'")
 
 crashpadtarget = os.path.join(engineroot, "Engine/Binaries/Win64/crashpad_handler.exe")
 
 try:
-    shutil.copy(os.path.join(zenroot, "x64\Release\zenserver.exe"), os.path.join(engineroot, "Engine/Binaries/Win64/zenserver.exe"))
-    shutil.copy(os.path.join(zenroot, "x64\Release\zenserver.pdb"), os.path.join(engineroot, "Engine/Binaries/Win64/zenserver.pdb"))
+    shutil.copy(os.path.join(zenroot, "x64\Release\zenserver.exe"), os.path.join(bin_dir, "zenserver.exe"))
+    shutil.copy(os.path.join(zenroot, "x64\Release\zenserver.pdb"), os.path.join(bin_dir, "zenserver.pdb"))
     shutil.copy(os.path.join(zenroot, r'vcpkg_installed\x64-windows-static\tools\sentry-native\crashpad_handler.exe'), crashpadtarget)
     P4.add(crashpadtarget).run()
-    print("All done and good!")
+    jazz_print("All done and good!")
 except Exception as e:
     print(f"Noooooo: {e.args}")
     pass