diff --git a/buildbot-config/builds.py b/buildbot-config/builds.py index 09361a8..55f1971 100644 --- a/buildbot-config/builds.py +++ b/buildbot-config/builds.py @@ -533,47 +533,6 @@ class ScummVMStableBuild(ScummVMBuild): DISABLE_ENGINES_BUILD_FLAG = "--disable-all-unstable-engines" # Settings below (if any) are for stable version and must be updated when release is done - DATA_FILES = [ - "AUTHORS", - "COPYING", - "COPYRIGHT", - "LICENSES", - "NEWS.md", - "README.md", - "gui/themes/translations.dat", - "gui/themes/scummclassic.zip", - "gui/themes/scummmodern.zip", - "gui/themes/scummremastered.zip", - "gui/themes/gui-icons.dat", - "dists/engine-data/access.dat", - "dists/engine-data/cryomni3d.dat", - "dists/engine-data/drascula.dat", - "dists/engine-data/fonts.dat", - #"dists/engine-data/freescape.dat", #Not in stable - "dists/engine-data/hugo.dat", - "dists/engine-data/kyra.dat", - "dists/engine-data/lure.dat", - "dists/engine-data/mort.dat", - "dists/engine-data/neverhood.dat", - "dists/engine-data/queen.tbl", - "dists/engine-data/sky.cpt", - "dists/engine-data/supernova.dat", - "dists/engine-data/teenagent.dat", - "dists/engine-data/titanic.dat", - "dists/engine-data/tony.dat", - "dists/engine-data/toon.dat", - "dists/engine-data/ultima.dat", - "dists/engine-data/wintermute.zip", - "dists/engine-data/xeen.ccs", - "dists/networking/wwwroot.zip", - "dists/pred.dic", - "dists/engine-data/cryo.dat", - "dists/engine-data/macgui.dat", - "dists/engine-data/macventure.dat", - "dists/engine-data/myst3.dat", - "dists/engine-data/grim-patch.lab", - "dists/engine-data/monkey4-patch.m4b" - ] class ScummVMToolsBuild(StandardBuild): __slots__ = [ 'verbose_build' ] @@ -604,6 +563,6 @@ class ScummVMToolsBuild(StandardBuild): builds = [] builds.append(ScummVMBuild("master", "https://github.com/scummvm/scummvm", "master", verbose_build=True, daily=(4, 1), description="ScummVM latest\nBranch master")) -builds.append(ScummVMStableBuild("stable", "https://github.com/scummvm/scummvm", "branch-2-6", verbose_build=True, daily=(4, 1), description="ScummVM stable\nFuture 2.6.x")) +builds.append(ScummVMStableBuild("stable", "https://github.com/scummvm/scummvm", "branch-2-7", verbose_build=True, daily=(4, 1), description="ScummVM stable\nFuture 2.7.x")) #builds.append(ScummVMBuild("gsoc2012", "https://github.com/digitall/scummvm", "gsoc2012-scalers-cont", verbose_build=True)) builds.append(ScummVMToolsBuild("tools-master", "https://github.com/scummvm/scummvm-tools", "master", verbose_build=True, daily=(4, 1), description="ScummVM tools")) diff --git a/buildbot-config/platforms.py b/buildbot-config/platforms.py index 80e8865..b1bf8b8 100644 --- a/buildbot-config/platforms.py +++ b/buildbot-config/platforms.py @@ -808,33 +808,10 @@ def vita(): platform.compatibleBuilds = (builds.ScummVMBuild, ) platform.configureargs.append("--host=psp2") - # 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. - # Grim is unplayably slow on Vita. - # Titanic is not very usable on Vita without a keyboard. - # Wintermute is unplayably slow on Vita. - # Tsage has nothing wrong with it, but we need to keep exe size down platform.buildconfigureargs = { builds.ScummVMBuild: [ "--enable-plugins" ], - builds.ScummVMStableBuild: [ - "--disable-all-unstable-engines", - "--disable-engines=bladerunner", - "--disable-engines=stark", - "--disable-engines=myst3", - "--disable-engines=glk", - "--disable-engines=grim", - "--disable-engines=titanic", - "--disable-engines=wintermute", - "--disable-engines=tsage", - "--disable-engines=ags", - "--enable-engine=testbed", - ], } platform.packaging_cmd = "psp2vpk" platform.built_files = { @@ -847,50 +824,6 @@ def vita(): platform.icon = 'psp2' register_platform(platform) - - # Vita Other Engines - platform = copy.deepcopy(platform) - platform.name = "vitaother" - platform.compatibleBuilds = (builds.ScummVMStableBuild, ) - platform.buildconfigureargs = { - builds.ScummVMStableBuild: [ - "--disable-all-engines", - "--enable-engines=bladerunner", - "--enable-engines=stark", - "--enable-engines=myst3", - "--enable-engines=glk", - "--enable-engines=grim", - "--enable-engines=titanic", - "--enable-engines=wintermute,foxtail,herocraft", - "--enable-engines=tsage", - "--enable-engines=ags", - "--enable-engines=testbed", - ], - } - platform.packaging_cmd = "psp2othervpk" - platform.built_files = { - builds.ScummVMBuild: [ "scummvm-other-engines.vpk" ], - } - platform.description = "PlayStation Vita (other engines)" - - register_platform(platform) - - # Vita Unstable Engines - platform = copy.deepcopy(platform) - platform.name = "vitaunstable" - platform.buildconfigureargs = { - builds.ScummVMStableBuild: [ - "--disable-all-engines", - "--enable-all-unstable-engines", - ], - } - platform.packaging_cmd = "psp2unstablevpk" - platform.built_files = { - builds.ScummVMBuild: [ "scummvm-unstable-engines.vpk" ], - } - platform.description = "PlayStation Vita (unstable engines)" - - register_platform(platform) vita() def wii():