Remove Qt Maintanance build in favor of aqt

Update osx steam contentbuilder bins
Add skip build option

.gitignore

@@ -255,5 +255,6 @@ cython_debug/
 
 # SteamCmd creates a ton of tmp files
 /Tools/Steam/ContentBuilder/builder/**
+/Tools/Steam/ContentBuilder/builder_osx/**
 /tmp_steam_config/**
 /Tools/Steam/ContentBuilder/output/**

Tools/Steam/ContentBuilder/Frameworks

@@ -0,0 +1 @@
+MacOS/Frameworks

Tools/Steam/ContentBuilder/builder_osx/steamcmd.sh

@@ -31,7 +31,8 @@ if [ "$DEBUGGER" == "gdb" ] || [ "$DEBUGGER" == "cgdb" ]; then
     unset LD_PRELOAD
   fi
 
-  $DEBUGGER -x "$ARGSFILE" "$STEAMEXE" "$@"
+  : "${DEBUGGER_ARGS=}"
+  $DEBUGGER -x "$ARGSFILE" $DEBUGGER_ARGS --args "$STEAMEXE" "$@"
   rm "$ARGSFILE"
 else
   $DEBUGGER "$STEAMEXE" "$@"

Tools/build.py

@@ -57,10 +57,8 @@ class BuildConfig:
     qt_ifw_version: str
     ifw_root_path: str
     cmake_toolchain_file: str
-    use_aqt: bool
     aqt_install_qt_packages: str
     aqt_install_tool_packages: str
-    aqt_path: str
     executable_file_ending: str
     build_folder: str
     bin_dir: str
@@ -137,14 +135,11 @@ def execute(
 
 def setup(build_config: BuildConfig, build_result: BuildResult) -> Tuple[BuildConfig, BuildResult]:
 
-    if build_config.use_aqt:
-        build_config.aqt_path = defines.AQT_PATH
+    build_config.qt_path = defines.QT_PATH
 
-        if not build_config.aqt_path.exists():
-            print(f"aqt path does not exist at {build_config.aqt_path}. Please make sure to run setup.py!")
-            exit(2)
-    
-    build_config.qt_path = defines.AQT_PATH if build_config.use_aqt else defines.MAINTENANCE_PATH
+    if not build_config.qt_path.exists():
+        print(f"Qt path does not exist at {build_config.qt_path}. Please make sure to run setup.py!")
+        exit(2)
     build_config.qt_bin_path = Path(build_config.qt_path).joinpath(f"{build_config.qt_version}/{defines.QT_PLATFORM}").resolve()
     build_config.ifw_root_path = Path(f"{build_config.qt_path}/Tools/QtInstallerFramework/{build_config.qt_ifw_version}").resolve()    
     
@@ -436,7 +431,6 @@ if __name__ == "__main__":
     build_config.build_deploy = build_deploy
     build_config.create_installer = create_installer
     build_config.build_type = build_type
-    build_config.use_aqt = use_aqt
     build_config.screenplay_version = screenplay_version
     build_config.build_architecture = args.build_architecture
 

Tools/build_and_publish.py

@@ -15,10 +15,10 @@ from sys import stdout
 
 stdout.reconfigure(encoding='utf-8')
 
-
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description='Build and Package ScreenPlay')
-    parser.add_argument('-skip_publish', '-skp', action="store_true", dest="skip_publish",  help="Steam password")
+    parser.add_argument('-skip_publish', '-skp', action="store_true", dest="skip_publish", default=False,  help="skip publish")
+    parser.add_argument('-skip_build', '-skb', action="store_true", dest="skip_build", default=False, help="skip build. If we already have a build and only want to upload it")
     parser.add_argument('-steam_password', '-sp', action="store", dest="steam_password",  help="Steam password")
     parser.add_argument('-hosting_username','-hu', action="store", dest="hosting_username", help="ssh username")
     parser.add_argument('-hosting_password', '-hp', action="store", dest="hosting_password",  help="ssh password")
@@ -41,9 +41,8 @@ if __name__ == "__main__":
     build_config.build_deploy = "ON"
     build_config.create_installer = "ON"
     build_config.build_type = "release"
-    build_config.use_aqt = False
 
-    if platform.system() == "Darwin":
+    if platform.system() == "Darwin" and not args.skip_build:
         # We do not yet support a standalone osx installer
         build_config.create_installer = "OFF"
         # OSX builds needs to build for x86 and arm
@@ -76,9 +75,8 @@ if __name__ == "__main__":
         build_config.bin_dir = os.path.join(build_config.root_path,'build-universal-osx-release/bin/')
         print(f"Change binary dir to: {build_config.bin_dir}")
         macos_sign.sign(build_config=build_config)
-        sys.exit(0)
 
-    if platform.system() == "Windows":
+    if platform.system() == "Windows" and not args.skip_build:
         build_config.build_architecture = "x64"
         
         if not args.skip_publish:

Tools/defines.py

@@ -8,8 +8,7 @@ VCPKG_VERSION = "2871ddd"  # Master 11.11.2022
 QT_VERSION = "6.4.1" if sys.platform != "darwin" else "6.3.2"
 QT_IFW_VERSION = "4.5"
 SCREENPLAY_VERSION = "0.15.0-RC3"
-AQT_PATH = Path.cwd().parent.parent.joinpath("aqt")
-MAINTENANCE_PATH = Path("C:/Qt") if sys.platform == "win32" else Path().home().joinpath("Qt")
+QT_PATH = Path.cwd().parent.parent.joinpath("aqt")
 # Defined by Qt
 if sys.platform == "win32":
     OS = "windows"

Tools/setup.py

@@ -63,7 +63,7 @@ def download(aqt_path: Path, qt_platform: Path):
 
 def setup_qt():
 
-    aqt_path = defines.AQT_PATH
+    aqt_path = defines.QT_PATH
 
     print(f"Setup Qt via aqt at {aqt_path}")