[Scummvm-git-logs] scummvm master -> e60b0be71a472aea2419dc58721f3fb985102d68

[ccawley2011]

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

Summary:
e60b0be71a DS: Update scripts for creating split builds


Commit: e60b0be71a472aea2419dc58721f3fb985102d68
    https://github.com/scummvm/scummvm/commit/e60b0be71a472aea2419dc58721f3fb985102d68
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-09-02T22:14:53+01:00

Commit Message:
DS: Update scripts for creating split builds

Changed paths:
    .gitignore
    backends/platform/ds/ds.mk
    backends/platform/ds/setup-builddirs.sh


diff --git a/.gitignore b/.gitignore
index 3f6fc6c442..0f87de6d54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,7 +32,7 @@ lib*.a
 /*.ipk
 /map.txt
 *.elf
-/*.nds
+*.nds
 /*.3dsx
 /*.cia
 /*.smdh
diff --git a/backends/platform/ds/ds.mk b/backends/platform/ds/ds.mk
index 6082baa959..7b9bb9b2a6 100644
--- a/backends/platform/ds/ds.mk
+++ b/backends/platform/ds/ds.mk
@@ -1,29 +1,8 @@
-# To approximate the DS builds A, B, C, ... run our configure like this
-#   configure --host=ds --disable-translation --disable-all-engines OPTIONS
-# where OPTIONS is...
-# build A:  --enable-scumm
-# build B:  --enable-sky --enable-queen
-# build C:  --enable-agos
-# build D:  --enable-gob --enable-cine --enable-agi
-# build E:  --enable-saga --disable-mad
-# build F:  --enable-kyra --disable-mad
-# build G:  --enable-lure
-# build H:  --enable-parallaction
-# build I:  --enable-made --disable-mad
-# build K:  --enable-cruise --disable-mad
-#
-# However, this could be automated using a simple script, which generates
-# subdirs for each build, and runs configure in those subdirs with the right
-# parameters (all builds would still share the same set of source code files,
-# thanks to our "out of tree" building support).
-#
-# This does not currently take care of some things:
-# * It does not #define DS_BUILD_A etc. -- most uses of that should be
-#   eliminated, though. Only usage should be for selecting the default config
-#   file (and for that we should really rather allow overriding the value of
-#   DEFAULT_CONFIG_FILE).
-#   There are a few game specific hacks which are currently controlled by this,
-#   too; we need to investigate those.
+ifdef DYNAMIC_MODULES
+DESCRIPTION ?= Built with dynamic plugin support
+else
+DESCRIPTION ?= DS Port
+endif
 
 all: scummvm.nds
 
@@ -43,7 +22,7 @@ dsdist: scummvm.nds $(DIST_FILES_DOCS)
 .PHONY: dsclean dsdist
 
 %.nds: %.elf romfs
-	ndstool -c $@ -9 $< -b $(srcdir)/backends/platform/ds/logo.bmp "$(@F);ScummVM $(VERSION);DS Port" -d romfs
+	ndstool -c $@ -9 $< -b $(srcdir)/backends/platform/ds/logo.bmp "$(@F);ScummVM $(VERSION);$(DESCRIPTION)" -d romfs
 
 romfs: $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(PLUGINS)
 	@rm -rf romfs
diff --git a/backends/platform/ds/setup-builddirs.sh b/backends/platform/ds/setup-builddirs.sh
index f83876e8d1..c2c6c7b2bd 100755
--- a/backends/platform/ds/setup-builddirs.sh
+++ b/backends/platform/ds/setup-builddirs.sh
@@ -1,55 +1,14 @@
 #!/bin/sh
 
-# TODO: Allow specifying (a list of) build ids (a, b, ...) on the command line.
+srcdir=$(realpath $(dirname $0)/../../..)
+mkdir -p all-builds
 
-# TODO: Computer srcdir in a better way
-srcdir=../../../`dirname $0`/..
-
-BASE_PARAM="--host=ds --disable-translation --disable-debug --disable-all-engines"
-
-for build in a b c d e f g h i k; do
+for build in scumm access agi agos bbvs cge cge2 cine cruise director draci dragons drascula dreamweb gob griffon hugo illusions kyra lab lure made mads parallaction queen saga sci sherlock sky supernova teenagent tinsel tsage tucker voyeur xeen; do
 	echo "--- Setting up build $build ---"
 	mkdir -p build-$build && cd build-$build
-	case $build in
-	a)
-		EXTRA_PARAM="--enable-scumm"
-		;;
-	b)
-		EXTRA_PARAM="--enable-sky --enable-queen"
-		;;
-	c)
-		EXTRA_PARAM="--enable-agos"
-		;;
-	d)
-		EXTRA_PARAM="--enable-gob --enable-cine --enable-agi"
-		;;
-	e)
-		EXTRA_PARAM="--enable-saga --disable-mad"
-		;;
-	f)
-		EXTRA_PARAM="--enable-kyra --disable-mad"
-		;;
-	g)
-		EXTRA_PARAM="--enable-lure"
-		;;
-	h)
-		EXTRA_PARAM="--enable-parallaction"
-		;;
-	i)
-		EXTRA_PARAM="--enable-made --disable-mad"
-		;;
-	k)
-		EXTRA_PARAM="--enable-cruise --disable-mad"
-		;;
-	*)
-		echo "Invalid build $build selected"
-		exit 1
-		;;
-	esac
-
-	defname="DS_BUILD_`echo $build | tr '[a-z]' '[A-Z]'`"
-	CPPFLAGS="$CPPFLAGS -D$defname"
-	$srcdir/configure $BASE_PARAM $EXTRA_PARAM
+	$srcdir/configure --host=ds --disable-translation --disable-debug --disable-all-engines --enable-engine=$build --disable-ogg
+	make -j$(nproc) DESCRIPTION="Enabled engines: $build"
+	cp scummvm.nds ../all-builds/scummvm-$build.nds
 	cd ..
 	echo DONE
 	echo