From 5afce02ece5495b4eafeae56bf70edd8b831630e Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Sat, 28 Aug 2021 18:27:02 +0200 Subject: [PATCH] ALL: Update to new stable --- buildbot-config/builds.py | 39 ++---------------------------------- buildbot-config/platforms.py | 39 ------------------------------------ 2 files changed, 2 insertions(+), 76 deletions(-) diff --git a/buildbot-config/builds.py b/buildbot-config/builds.py index 7c83ab9..031f0d2 100644 --- a/buildbot-config/builds.py +++ b/buildbot-config/builds.py @@ -511,42 +511,7 @@ class ScummVMStableBuild(ScummVMBuild): PATCHES = [ ] - # These settings must be updated when release is done - DATA_FILES = [ - "AUTHORS", - "COPYING", - "COPYING.LGPL", - "COPYING.BSD", - "COPYRIGHT", - "NEWS.md", - "README.md", - "gui/themes/translations.dat", - "gui/themes/scummclassic.zip", - "gui/themes/scummmodern.zip", - "gui/themes/scummremastered.zip", - "dists/engine-data/access.dat", - "dists/engine-data/cryomni3d.dat", - "dists/engine-data/drascula.dat", - "dists/engine-data/fonts.dat", - "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" - ] - CONFIGURE_GENERATED_FILE = "config.mk" + # Settings below (if any) are for stable version and must be updated when release is done class ScummVMToolsBuild(StandardBuild): __slots__ = [ 'verbose_build' ] @@ -577,6 +542,6 @@ class ScummVMToolsBuild(StandardBuild): builds = [] builds.append(ScummVMBuild("master", "https://github.com/scummvm/scummvm", "master", verbose_build=True, nightly=(4, 1), description="ScummVM latest")) -builds.append(ScummVMStableBuild("stable", "https://github.com/scummvm/scummvm", "branch-2-2", verbose_build=True, nightly=(4, 1), description="ScummVM stable")) +builds.append(ScummVMStableBuild("stable", "https://github.com/scummvm/scummvm", "branch-2-5", verbose_build=True, nightly=(4, 1), description="ScummVM stable")) #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, nightly=(4, 1), description="ScummVM tools")) diff --git a/buildbot-config/platforms.py b/buildbot-config/platforms.py index 92bec06..8b93211 100644 --- a/buildbot-config/platforms.py +++ b/buildbot-config/platforms.py @@ -149,8 +149,6 @@ def amigaos4(): platform.configureargs.append("--host=ppc-amigaos") platform.buildconfigureargs = { builds.ScummVMBuild: [ "--enable-plugins", "--default-dynamic", "--enable-detection-dynamic" ], - # Stable build doesn't have all necessary patches to make it work dynamic - builds.ScummVMStableBuild: [ "--enable-static" ], } platform.packaging_cmd = { builds.ScummVMBuild: "amigaosdist", @@ -158,7 +156,6 @@ def amigaos4(): } platform.built_files = { builds.ScummVMBuild: [ "install", "install.info" ], - builds.ScummVMStableBuild: [ "Games:ScummVM", "Games:ScummVM.info" ], builds.ScummVMToolsBuild: [ "construct_mohawk", "create_sjisfnt", @@ -284,15 +281,11 @@ def debian(name_suffix, image_suffix, host, if buildconfigureargs: platform.buildconfigureargs = buildconfigureargs - # stable build don't have this target yet platform.packaging_cmd = { builds.ScummVMBuild: "dist-generic", - builds.ScummVMStableBuild: None, } platform.built_files = { builds.ScummVMBuild: [ "dist-generic/*" ], - # stable build will use produced binary and additional files mentioned in builds.py - builds.ScummVMStableBuild: [ "scummvm" ], builds.ScummVMToolsBuild: [ "construct_mohawk", "create_sjisfnt", @@ -336,8 +329,6 @@ debian("x86-64-dynamic-detection", "x86_64", "x86_64-linux-gnu", package=False, build_tests=False, run_tests=False, buildconfigureargs = { builds.ScummVMBuild: [ "--enable-plugins", "--default-dynamic", "--enable-detection-dynamic" ], - # In stable, detection code was in engines - builds.ScummVMStableBuild: [ "--enable-plugins", "--default-dynamic" ], }) debian("x86-64-sdl1.2", "x86_64", "x86_64-linux-gnu", package=False, tools=False, build_tests=False, run_tests=False, @@ -619,12 +610,9 @@ def nds(): # stable build don't have this target yet platform.packaging_cmd = { builds.ScummVMBuild: "dsdist", - builds.ScummVMStableBuild: None, } platform.built_files = { builds.ScummVMBuild: [ "dsdist/*" ], - # stable build will use produced binary and additional files mentioned in builds.py - builds.ScummVMStableBuild: [ "scummvm.nds" "plugins" ], } platform.archiveext = "zip" platform.testable = False @@ -762,15 +750,11 @@ def raspberrypi(): platform.env["CXX"] = "ccache ${CXX}" platform.configureargs.append("--host=raspberrypi") - # stable build don't have this target yet platform.packaging_cmd = { builds.ScummVMBuild: "dist-generic", - builds.ScummVMStableBuild: None, } platform.built_files = { builds.ScummVMBuild: [ "dist-generic/*" ], - # stable build will use produced binary and additional files mentioned in builds.py - builds.ScummVMStableBuild: [ "scummvm" ], builds.ScummVMToolsBuild: [ "construct_mohawk", "create_sjisfnt", @@ -901,13 +885,6 @@ def vita(): "--disable-engines=titanic", "--enable-engine=testbed", ], - # Stable doesn't have myst3 nor stark - builds.ScummVMStableBuild: [ - "--disable-all-unstable-engines", - "--disable-engines=bladerunner", - "--disable-engines=glk", - "--enable-engine=testbed", - ], } platform.packaging_cmd = "psp2vpk" platform.built_files = { @@ -984,12 +961,9 @@ def windows_mxe(suffix, target, description=None): } platform.packaging_cmd = { builds.ScummVMBuild: ["win32dist-mingw", "DESTDIR=win32dist-mingw"], - # Stable hasn't this target - builds.ScummVMStableBuild: None, } platform.built_files = { builds.ScummVMBuild: [ "win32dist-mingw" ], - builds.ScummVMStableBuild: [ "scummvm.exe" ], builds.ScummVMToolsBuild: [ "construct_mohawk.exe", "create_sjisfnt.exe", @@ -1005,14 +979,6 @@ def windows_mxe(suffix, target, description=None): "scummvm-tools-cli.exe" ] } - # WinSparkle is built as a DLL (because we don't build it), so add it to the package - platform.data_files = { - # Automatically done in target - builds.ScummVMBuild: None, - builds.ScummVMStableBuild: [ - "${{MXE_PREFIX_DIR}}/{0}/bin/WinSparkle.dll".format(target), - ], - } platform.archiveext = "zip" platform.description = description @@ -1036,17 +1002,12 @@ def win9x(): platform.configureargs.append("--host=mingw32") platform.buildconfigureargs = { builds.ScummVMBuild: [ "--disable-windows-unicode" ], - # Stable build doesn't have --disable-windows-unicode - builds.ScummVMStableBuild: [ ], } platform.packaging_cmd = { builds.ScummVMBuild: ["win32dist-mingw", "DESTDIR=win32dist-mingw"], - # Stable hasn't this target - builds.ScummVMStableBuild: None, } platform.built_files = { builds.ScummVMBuild: [ "win32dist-mingw" ], - builds.ScummVMStableBuild: [ "scummvm.exe" ], builds.ScummVMToolsBuild: [ "construct_mohawk.exe", "create_sjisfnt.exe",