diff --git a/master/builds.py b/master/builds.py index e1049dc..012d6da 100644 --- a/master/builds.py +++ b/master/builds.py @@ -165,10 +165,8 @@ class ScummVMBuild(StandardBuild): DATA_FILES = [ "AUTHORS", "COPYING", - "COPYING.BSD", - "COPYING.FREEFONT", "COPYING.LGPL", - "COPYING.OFL", + "COPYING.BSD", "COPYRIGHT", "NEWS.md", "README.md", @@ -179,6 +177,7 @@ class ScummVMBuild(StandardBuild): "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", @@ -186,12 +185,23 @@ class ScummVMBuild(StandardBuild): "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/pred.dic", + # Not in stable + "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" ] def __init__(self, *args, **kwargs): @@ -267,7 +277,7 @@ class ScummVMBuild(StandardBuild): packaging_cmd = platform.getPackagingCmd(self) else: if platform.getStripCmd(self) is not None: - f.addStep(scummsteps.Strip(command = platform.getStripCmd())) + f.addStep(scummsteps.Strip(command = platform.getStripCmd(self))) if platform.canPackage(self): f.addStep(scummsteps.Package(disttarget = packaging_cmd, @@ -295,12 +305,49 @@ class ScummVMBuild(StandardBuild): class ScummVMStableBuild(ScummVMBuild): PATCHES = [ - "./patches/fix-devkitppc.patch", + ] + + 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" ] class ScummVMToolsBuild(StandardBuild): __slots__ = [ 'data_files', 'verbose_build' ] + PATCHES = [ + ] + DATA_FILES = [ "COPYING", "NEWS", @@ -372,7 +419,7 @@ class ScummVMToolsBuild(StandardBuild): packaging_cmd = platform.getPackagingCmd(self) else: if platform.getStripCmd(self) is not None: - f.addStep(scummsteps.Strip(command = platform.getStripCmd())) + f.addStep(scummsteps.Strip(command = platform.getStripCmd(self))) if platform.canPackage(self): f.addStep(scummsteps.Package(disttarget = packaging_cmd, diff --git a/master/patches/fix-devkitppc.patch b/master/patches/fix-devkitppc.patch deleted file mode 100644 index bc370b7..0000000 --- a/master/patches/fix-devkitppc.patch +++ /dev/null @@ -1,125 +0,0 @@ -diff --git a/backends/fs/wii/wii-fs-factory.cpp b/backends/fs/wii/wii-fs-factory.cpp -index f234c1e300..ca4c3d3d88 100644 ---- a/backends/fs/wii/wii-fs-factory.cpp -+++ b/backends/fs/wii/wii-fs-factory.cpp -@@ -24,6 +24,7 @@ - - #define FORBIDDEN_SYMBOL_EXCEPTION_printf - #define FORBIDDEN_SYMBOL_EXCEPTION_getcwd -+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h - - #include - -diff --git a/backends/platform/wii/main.cpp b/backends/platform/wii/main.cpp -index 35d800a527..b1a4b32986 100644 ---- a/backends/platform/wii/main.cpp -+++ b/backends/platform/wii/main.cpp -@@ -33,6 +33,7 @@ - #include "backends/plugins/wii/wii-provider.h" - - #include -+#include - #include - #ifndef GAMECUBE - #include -@@ -52,7 +53,13 @@ extern "C" { - bool reset_btn_pressed = false; - bool power_btn_pressed = false; - -+#if ((_V_MAJOR_ > 1) || \ -+ (_V_MAJOR_ == 1 && _V_MINOR_ > 8 ) || \ -+ (_V_MAJOR_ == 1 && _V_MINOR_ == 8 && _V_PATCH_ >= 18)) -+void reset_cb(u32, void *) { -+#else - void reset_cb(void) { -+#endif - #ifdef DEBUG_WII_GDB - printf("attach gdb now\n"); - _break(); -@@ -223,6 +230,9 @@ int main(int argc, char *argv[]) { - res = scummvm_main(argc, argv); - g_system->quit(); - -+ g_system->destroy(); -+ g_system = nullptr; -+ - printf("shutdown\n"); - - SYS_UnregisterResetFunc(&resetinfo); -diff --git a/backends/platform/wii/osystem.cpp b/backends/platform/wii/osystem.cpp -index c2751f6ef4..54427bd20c 100644 ---- a/backends/platform/wii/osystem.cpp -+++ b/backends/platform/wii/osystem.cpp -@@ -145,7 +145,16 @@ void OSystem_Wii::initBackend() { - } - - void OSystem_Wii::quit() { -+ /* Delete _timerManager before deinitializing events as it's tied */ -+ delete _timerManager; -+ _timerManager = nullptr; -+ - deinitEvents(); -+ -+ /* Delete _eventManager before destroying FS to avoid problems when releasing virtual keyboard data */ -+ delete _eventManager; -+ _eventManager = nullptr; -+ - deinitSfx(); - deinitGfx(); - -diff --git a/backends/plugins/elf/elf32.h b/backends/plugins/elf/elf32.h -index 9f6f92fe95..aae92b12d4 100644 ---- a/backends/plugins/elf/elf32.h -+++ b/backends/plugins/elf/elf32.h -@@ -236,6 +236,7 @@ typedef struct { - #define R_ARM_V4BX 40 - - // PPC relocation types -+#define R_PPC_NONE 0 - #define R_PPC_ADDR32 1 - #define R_PPC_ADDR16_LO 4 - #define R_PPC_ADDR16_HI 5 -diff --git a/backends/plugins/elf/ppc-loader.cpp b/backends/plugins/elf/ppc-loader.cpp -index dffd95993b..8315a6a088 100644 ---- a/backends/plugins/elf/ppc-loader.cpp -+++ b/backends/plugins/elf/ppc-loader.cpp -@@ -61,6 +61,9 @@ bool PPCDLObject::relocate(Elf32_Off offset, Elf32_Word size, byte *relSegment) - //debug(8, "elfloader: i=%05d %p +0x%04x: (0x%08x) 0x%08x ", i, src, rel[i].r_addend, sym->st_value, *src); - - switch (REL_TYPE(rel[i].r_info)) { -+ case R_PPC_NONE: -+ debug(8, "elfloader: R_PPC_NONE"); -+ break; - case R_PPC_ADDR32: - *src = value; - debug(8, "elfloader: R_PPC_ADDR32 -> 0x%08x", *src); -diff --git a/configure b/configure -index aa1f446e3a..ca8b7fcccb 100755 ---- a/configure -+++ b/configure -@@ -2811,10 +2811,12 @@ case $_host_os in - append_var CXXFLAGS "-fmodulo-sched" - append_var CXXFLAGS "-fuse-cxa-atexit" - append_var CXXFLAGS "-I$DEVKITPRO/libogc/include" -+ append_var CXXFLAGS "-I$DEVKITPRO/portlibs/ppc/include" - # libogc is required to link the cc tests (includes _start()) - append_var LDFLAGS "-mogc" - append_var LDFLAGS "-mcpu=750" - append_var LDFLAGS "-L$DEVKITPRO/libogc/lib/cube" -+ append_var LDFLAGS "-L$DEVKITPRO/portlibs/ppc/lib" - append_var LDFLAGS "-logc" - if test "$_dynamic_modules" = "yes" ; then - # retarded toolchain patch forces --gc-sections, overwrite it -@@ -3007,10 +3009,12 @@ case $_host_os in - append_var CXXFLAGS "-fmodulo-sched" - append_var CXXFLAGS "-fuse-cxa-atexit" - append_var CXXFLAGS "-I$DEVKITPRO/libogc/include" -+ append_var CXXFLAGS "-I$DEVKITPRO/portlibs/ppc/include" - # libogc is required to link the cc tests (includes _start()) - append_var LDFLAGS "-mrvl" - append_var LDFLAGS "-mcpu=750" - append_var LDFLAGS "-L$DEVKITPRO/libogc/lib/wii" -+ append_var LDFLAGS "-L$DEVKITPRO/portlibs/ppc/lib" - append_var LDFLAGS "-logc" - if test "$_dynamic_modules" = "yes" ; then - # retarded toolchain patch forces --gc-sections, overwrite it diff --git a/master/platforms.py b/master/platforms.py index 8e6e310..f79145c 100644 --- a/master/platforms.py +++ b/master/platforms.py @@ -1,5 +1,4 @@ import copy -import os import config import builds @@ -92,7 +91,6 @@ class Platform: def getWorkerImage(self, build): return _getFromBuild(self.workerimage, build) - platforms = [] def register_platform(platform): if (config.platforms_whitelist and @@ -107,6 +105,8 @@ def _3ds(): platform = Platform("3ds") platform.workerimage = "devkit3ds" platform.compatibleBuilds = (builds.ScummVMBuild, ) + # Include CA certificates bundle to allow HTTPS + platform.env["DIST_3DS_EXTRA_FILES"] = "${DEVKITPRO}/cacert.pem" platform.env["CXX"] = "ccache /opt/devkitpro/devkitARM/bin/arm-none-eabi-c++" platform.configureargs.append("--host=3ds") platform.buildconfigureargs = { @@ -118,7 +118,6 @@ def _3ds(): } platform.archiveext = "zip" platform.testable = False - platform.run_tests = False register_platform(platform) _3ds() @@ -131,7 +130,7 @@ def amigaos4(): } platform.packaging_cmd = { builds.ScummVMBuild: "amigaosdist", - builds.ScummVMToolsBuild: "amigaos4dist" + builds.ScummVMToolsBuild: "amigaosdist" } platform.built_files = { builds.ScummVMBuild: [ "Games:ScummVM", "Games:ScummVM.info" ], @@ -151,11 +150,11 @@ def amigaos4(): ], } platform.archiveext = "zip" - platform.testable = False - platform.run_tests = False register_platform(platform) amigaos4() +# Android environment can't be specified in worker Dockerfile as it's a unified toolchain +# So we must pollute our configuration def android(suffix, scummvm_target, ndk_target, cxx_target, abi_version): platform = Platform("android_{0}".format(suffix)) platform.compatibleBuilds = (builds.ScummVMBuild, ) @@ -175,28 +174,6 @@ def android(suffix, scummvm_target, ndk_target, cxx_target, abi_version): "PATH": [ "${PATH}", "${{ANDROID_TOOLCHAIN}}/sysroot/usr/bin/{0}/{1}".format( ndk_target, abi_version)], }, - builds.ScummVMStableBuild: { - "AR": "${{ANDROID_TOOLCHAIN}}/bin/{0}-ar".format( - ndk_target), - "AS": "${{ANDROID_TOOLCHAIN}}/bin/{0}-as".format( - ndk_target), - "RANLIB": "${{ANDROID_TOOLCHAIN}}/bin/{0}-ranlib".format( - ndk_target), - "STRIP": "${{ANDROID_TOOLCHAIN}}/bin/{0}-strip".format( - ndk_target), - "STRINGS": "${{ANDROID_TOOLCHAIN}}/bin/{0}-strings".format( - ndk_target), - "CXX": "ccache ${{ANDROID_TOOLCHAIN}}/bin/{0}-clang++".format( - ndk_target), - "CC": "ccache ${{ANDROID_TOOLCHAIN}}/bin/{0}-clang".format( - ndk_target), - # Worker has all libraries installed in the toolchain - "PKG_CONFIG_LIBDIR": "${{ANDROID_TOOLCHAIN}}/sysroot/usr/lib/{0}/pkgconfig".format( - ndk_target), - # Altering PATH for curl-config, that lets us reuse environment variables instead of using configure args - "PATH": [ "${PATH}", "${{ANDROID_TOOLCHAIN}}/sysroot/usr/bin/{0}".format( - ndk_target)], - } } platform.configureargs.append("--host=android-{0}".format(scummvm_target)) @@ -207,7 +184,6 @@ def android(suffix, scummvm_target, ndk_target, cxx_target, abi_version): } platform.archiveext = "zip" platform.testable = False - platform.run_tests = False register_platform(platform) android(suffix="arm", @@ -235,8 +211,15 @@ def debian_x86_64(): platform = Platform("debian-x86_64") platform.env["CXX"] = "ccache g++" platform.configureargs.append("--host=x86_64-linux-gnu") + # stable build don't have this target yet + platform.packaging_cmd = { + builds.ScummVMBuild: "dist-generic", + builds.ScummVMStableBuild: None, + } platform.built_files = { - builds.ScummVMBuild: [ "scummvm" ], + 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", @@ -270,8 +253,6 @@ def caanoo(): builds.ScummVMBuild: [ "release/scummvm-caanoo.tar.bz2" ], } platform.archiveext = "tar.bz2" - platform.testable = False - platform.run_tests = False register_platform(platform) caanoo() @@ -289,8 +270,6 @@ def gamecube(): builds.ScummVMBuild: [ "wiidist/scummvm" ], } platform.archiveext = "tar.xz" - platform.testable = False - platform.run_tests = False register_platform(platform) gamecube() @@ -307,8 +286,6 @@ def gp2x(): builds.ScummVMBuild: [ "release/scummvm-gp2x.tar.bz2" ], } platform.archiveext = "tar.bz2" - platform.testable = False - platform.run_tests = False platform = Platform("gp2x-1") platform.buildconfigureargs = { @@ -346,8 +323,6 @@ def ios7(): builds.ScummVMBuild: [ "ScummVM.app" ], } platform.archiveext = "tar.bz2" - platform.testable = False - platform.run_tests = False register_platform(platform) ios7() @@ -442,7 +417,6 @@ macosx_i386() # } # platform.archiveext = "tar.xz" # platform.testable = False -# platform.run_tests = False # register_platform(platform) #nds() @@ -460,22 +434,20 @@ def openpandora(): builds.ScummVMBuild: [ "release/scummvm-op-pnd.tar.bz2" ], } platform.archiveext = "tar.bz2" - platform.testable = False - platform.run_tests = False register_platform(platform) openpandora() def ps3(): platform = Platform("ps3") platform.compatibleBuilds = (builds.ScummVMBuild, ) + # Include CA certificates bundle to allow HTTPS + platform.env["DIST_PS3_EXTRA_FILES"] = "${PS3DEV}/cacert.pem" platform.env["CXX"] = "ccache powerpc64-ps3-elf-g++" platform.configureargs.append("--host=ps3") platform.packaging_cmd = "ps3pkg" platform.built_files = { builds.ScummVMBuild: [ "scummvm-ps3.pkg" ], } - platform.testable = False - platform.run_tests = False register_platform(platform) ps3() @@ -485,16 +457,17 @@ def psp(): platform.env["CXX"] = "ccache psp-g++" platform.configureargs.extend(["--host=psp", "--disable-debug", "--enable-plugins", "--default-dynamic"]) - # HACK: The glk engine causes linker errors on psp buildbot, and is disabled. - # This was decided after discussion with dreammaster on irc. - # Since glk is an interactive fiction engine that requires lots of text entry, - # and there's no physical keyboard support on this platform, the engine is - # not comfortably usable on the psp anyways. + # HACK: The Ultima engine, when included, causes a crash in the add game dialog + # after selecting a game in the "Add Game" dialog and clicking on "Choose". + # This crash happens only on real hardware, but not on the PSP emulator PPSSPP. + # It was suggested that this is due to memory constraints on the platform. + # Due to this crash, we disable Ultima on PSP for now. + # Unstable engines are disabled because they cause a crash on real hardware when # adding a game (see further comment in the pspfull buildbot target) + platform.buildconfigureargs = { - builds.ScummVMBuild: [ "--disable-engines=glk", "--disable-all-unstable-engines" ], - builds.ScummVMStableBuild: [ ], + builds.ScummVMBuild: [ "--disable-engines=ultima", "--disable-all-unstable-engines" ], } platform.built_files = { builds.ScummVMBuild: [ @@ -508,8 +481,6 @@ def psp(): ], } platform.archiveext = "tar.xz" - platform.testable = False - platform.run_tests = False register_platform(platform) # PSP full @@ -520,15 +491,9 @@ def psp(): # The crash happens while it loads all the plugins to determine the engine # that matches the game. It is a hard crash that requires removing and # reinserting the battery. The crash does not happen on the PPSSPP emulator. - # - # HACK: The glk engine causes linker errors on psp buildbot, and is disabled. - # This was decided after discussion with dreammaster on irc. - # Since glk is an interactive fiction engine that requires lots of text entry, - # and there's no physical keyboard support on this platform, the engine is - # not comfortably usable on the psp anyways. + platform.buildconfigureargs = { - builds.ScummVMBuild: [ "--disable-engines=glk" ], - builds.ScummVMStableBuild: [ ], + builds.ScummVMBuild: [ ], } register_platform(platform) psp() @@ -569,7 +534,6 @@ def switch(): } platform.archiveext = "zip" platform.testable = False - platform.run_tests = False register_platform(platform) switch() @@ -578,12 +542,19 @@ def vita(): platform.compatibleBuilds = (builds.ScummVMBuild, ) platform.env["CXX"] = "ccache /usr/local/vitasdk/bin/arm-vita-eabi-g++" 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. platform.buildconfigureargs = { builds.ScummVMBuild: [ - "--disable-engines=lastexpress", + "--disable-engines=bladerunner", + "--disable-engines=stark", + "--disable-engines=myst3", "--disable-engines=glk", - "--disable-engines=dm", - "--disable-engines=director", ], } platform.packaging_cmd = "psp2vpk" @@ -592,7 +563,18 @@ def vita(): } platform.archiveext = "zip" platform.testable = False - platform.run_tests = False + register_platform(platform) + + # Vita full + platform = copy.deepcopy(platform) + platform.name = "vitafull" + + # This Vita build includes all engines, but crashes on startup. + # The crash presumably happens due to the large executable size. + + platform.buildconfigureargs = { + builds.ScummVMBuild: [ ], + } register_platform(platform) vita() @@ -610,8 +592,6 @@ def wii(): builds.ScummVMBuild: [ "wiidist/scummvm" ], } platform.archiveext = "tar.xz" - platform.testable = False - platform.run_tests = False register_platform(platform) wii() @@ -620,8 +600,10 @@ def windows_mxe(suffix, target): platform.workerimage = "mxe" platform.env["CXX"] = "ccache ${{MXE_PREFIX_DIR}}/bin/{0}-c++".format(target) + # strip is specified below, just be coherent and define it with environment + platform.env["STRIP"] = "${{MXE_PREFIX_DIR}}/bin/{0}-strip".format(target) # strings is detected using host alias and not host, override it here - platform.env["STRINGS"] = "ccache ${{MXE_PREFIX_DIR}}/bin/{0}-strings".format(target) + platform.env["STRINGS"] = "${{MXE_PREFIX_DIR}}/bin/{0}-strings".format(target) platform.env["PKG_CONFIG_LIBDIR"] = "${{MXE_PREFIX_DIR}}/{0}/lib/pkgconfig".format(target) # Altering PATH for curl-config, that lets us reuse environment variables instead of using configure args platform.env["PATH"] = [ "${PATH}", "${{MXE_PREFIX_DIR}}/{0}/bin".format(target)] @@ -633,6 +615,9 @@ def windows_mxe(suffix, target): platform.buildconfigureargs = { builds.ScummVMBuild: [ "--enable-updates"], } + platform.strip_cmd = { + builds.ScummVMBuild: ['${STRIP}', 'scummvm.exe'], + } platform.built_files = { builds.ScummVMBuild: [ "scummvm.exe" ], builds.ScummVMToolsBuild: [ @@ -657,7 +642,6 @@ def windows_mxe(suffix, target): ], } platform.archiveext = "zip" - platform.run_tests = False register_platform(platform) windows_mxe(suffix="x86",