[Scummvm-git-logs] scummvm-sites buildbot -> 3de452b76e5c63f46c23490a40a8be8b246ac075

[rsn8887]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-sites' repo located at https://github.com/scummvm/scummvm-sites .

Summary:
3de452b76e BUILDBOT: Use three separate builds on PSP2 (Vita)


Commit: 3de452b76e5c63f46c23490a40a8be8b246ac075
    https://github.com/scummvm/scummvm-sites/commit/3de452b76e5c63f46c23490a40a8be8b246ac075
Author: rsn8887 (rsn8887 at users.noreply.github.com)
Date: 2022-06-19T10:51:13-05:00

Commit Message:
BUILDBOT: Use three separate builds on PSP2 (Vita)

Changed paths:
    config/master.cfg


diff --git a/config/master.cfg b/config/master.cfg
index 74a0900..6472215 100644
--- a/config/master.cfg
+++ b/config/master.cfg
@@ -1025,32 +1025,90 @@ p_master = {
 	"archive_format": "zip"
 }
 
-p_stable = copy.deepcopy(p_master)
-
 # HACK: To prevent memory-related crash on startup that seems related to the size of the executable
-# file, which grows with number of engines, we need to disable some of the engines...
-# Blade Runner is unplayably slow on the Vita.
-# Stark engine doesn't have a supported renderer on Vita.
-# Myst 3 engine is unplayably slow on Vita.
-# Glk is not very usable on Vita without a keyboard.
+# file, which grows with number of engines, we need to disable some of the engines here, and include them
+# into a separate build
 p_master["configureargs"].extend( [
 	"--disable-all-unstable-engines",
 	"--disable-engines=glk",
 	"--disable-engines=bladerunner",
 	"--disable-engines=stark",
-	"--disable-engines=myst3"
+	"--disable-engines=myst3",
+	"--disable-engines=grim",
+	"--disable-engines=titanic"
 ] )
 
-p_stable["configureargs"].extend( [
-	"--disable-all-unstable-engines",
-	"--disable-engines=glk",
-	"--disable-engines=bladerunner"
-] )
+p_stable = copy.deepcopy(p_master)
 
 scumm_platforms_master["psp2"] = p_master
 scumm_platforms_stable["psp2"] = p_stable
 scumm_untestable_platforms.append("psp2")
 
+# PSP2OTHER
+# This Vita build includes only the other stable engines not included in the main build 
+scumm_root_psp2other = "/opt/toolchains/psp2"
+scumm_env_psp2other = copy.deepcopy(scumm_env)
+scumm_env_psp2other["PATH"] = "%s/vitasdk/bin:%s" % (scumm_root_psp2other, DEFAULT_PATH)
+scumm_env_psp2other["PKG_CONFIG_LIBDIR"] = "%s/vitasdk/arm-vita-eabi/lib/pkgconfig" % scumm_root_psp2other
+scumm_env_psp2other["CXX"] = "ccache arm-vita-eabi-g++"
+scumm_env_psp2other["VITASDK"] = "%s/vitasdk" % (scumm_root_psp2other)
+
+p_master = {
+	"configureargs": [
+		"--host=psp2"
+	],
+	"env": scumm_env_psp2other,
+	"disttarget": "psp2othervpk",
+	"package": [ "scummvm-other-engines.vpk" ],
+	"archive_format": "zip"
+}
+
+p_master["configureargs"].extend( [
+	"--disable-all-engines",
+	"--enable-engines=glk",
+	"--enable-engines=bladerunner",
+	"--enable-engines=stark",
+	"--enable-engines=myst3",
+	"--enable-engines=grim",
+	"--enable-engines=titanic"
+] )
+
+p_stable = copy.deepcopy(p_master)
+
+scumm_platforms_master["psp2other"] = p_master
+scumm_platforms_stable["psp2other"] = p_stable
+scumm_untestable_platforms.append("psp2other")
+
+# PSP2UNSTABLE
+# This Vita build includes only the unstable engines
+scumm_root_psp2unstable = "/opt/toolchains/psp2"
+scumm_env_psp2unstable = copy.deepcopy(scumm_env)
+scumm_env_psp2unstable["PATH"] = "%s/vitasdk/bin:%s" % (scumm_root_psp2unstable, DEFAULT_PATH)
+scumm_env_psp2unstable["PKG_CONFIG_LIBDIR"] = "%s/vitasdk/arm-vita-eabi/lib/pkgconfig" % scumm_root_psp2unstable
+scumm_env_psp2unstable["CXX"] = "ccache arm-vita-eabi-g++"
+scumm_env_psp2unstable["VITASDK"] = "%s/vitasdk" % (scumm_root_psp2unstable)
+
+p_master = {
+	"configureargs": [
+		"--host=psp2"
+	],
+	"env": scumm_env_psp2unstable,
+	"disttarget": "psp2unstablevpk",
+	"package": [ "scummvm-unstable-engines.vpk" ],
+	"archive_format": "zip"
+}
+
+p_master["configureargs"].extend( [
+	"--disable-all-engines",
+	"--enable-all-unstable-engines"
+] )
+
+p_stable = copy.deepcopy(p_master)
+
+scumm_platforms_master["psp2unstable"] = p_master
+scumm_platforms_stable["psp2unstable"] = p_stable
+scumm_untestable_platforms.append("psp2unstable")
+
 #PSP2FULL
 # This Vita build includes all engines, but crashes on startup.
 # The crash presumably happens due to the large executable size.