[Scummvm-cvs-logs] scummvm master -> f98a8bb98c16cc52ba7388f324215195d23b4959

[wjp]

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

Summary:
08bc6f85ad CONFIGURE: Fix more unintentional globbing
8ac07bc349 CONFIGURE: Clean up all-games test
f98a8bb98c CONFIGURE: Automatically enable parent engine if subengine is enabled


Commit: 08bc6f85ad28954b87ddef60635705fba48ff615
    https://github.com/scummvm/scummvm/commit/08bc6f85ad28954b87ddef60635705fba48ff615
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2012-09-11T09:38:14-07:00

Commit Message:
CONFIGURE: Fix more unintentional globbing

Changed paths:
    configure



diff --git a/configure b/configure
index 4ecf420..20c4e52 100755
--- a/configure
+++ b/configure
@@ -707,7 +707,12 @@ get_subengines_build_string() {
 		subengine_build=`get_engine_build $subeng`
 		subengine_build_default=`get_engine_build_default $subeng`
 		if test \( $subengine_build = $2 -a "$parent_status" != wip \) -o \( "$parent_status" = wip -a $subengine_build != no -a "$subengine_build_default" = no \) ; then
-			subengine_string="$subengine_string [`get_engine_name $subeng`]"
+			s="[`get_engine_name $subeng`]"
+			if test -n "$subengine_string"; then
+				subengine_string="$subengine_string $s"
+			else
+				subengine_string="$s"
+			fi
 		else
 			all=no
 		fi
@@ -4004,28 +4009,28 @@ fi
 echo
 if test -n "$_engines_built_static" ; then
 	echo "Engines (builtin):"
-	echo $_engines_built_static | sed 's/@/\
+	echo "$_engines_built_static" | sed 's/@/\
 /g
 s/#/    /g'
 fi
 
 if test -n "$_engines_built_dynamic" ; then
 	echo "Engines (plugins):"
-	echo $_engines_built_dynamic | sed 's/@/\
+	echo "$_engines_built_dynamic" | sed 's/@/\
 /g
 s/#/    /g'
 fi
 
 if test -n "$_engines_skipped" ; then
 	echo "Engines Skipped:"
-	echo $_engines_skipped | sed 's/@/\
+	echo "$_engines_skipped" | sed 's/@/\
 /g
 s/#/    /g'
 fi
 
 if test -n "$_engines_built_wip" ; then
 	echo "WARNING: This ScummVM build contains the following UNSTABLE engines:"
-	echo $_engines_built_wip | sed 's/@/\
+	echo "$_engines_built_wip" | sed 's/@/\
 /g
 s/#/    /g'
 fi


Commit: 8ac07bc34908622662926d44e7cb87b70411b672
    https://github.com/scummvm/scummvm/commit/8ac07bc34908622662926d44e7cb87b70411b672
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2012-09-11T09:38:40-07:00

Commit Message:
CONFIGURE: Clean up all-games test

Changed paths:
    configure



diff --git a/configure b/configure
index 20c4e52..f13f036 100755
--- a/configure
+++ b/configure
@@ -697,11 +697,19 @@ get_engine_build_string() {
 
 # Get the string about building subengines
 get_subengines_build_string() {
-	all=yes
 	parent_engine=$1
 	subengine_string=$3
 	parent_status=$4
 	parent_engine_build_default=`get_engine_build_default $parent_engine`
+	all=yes
+
+	# If the base engine is built by default, we can never return "[all games]"
+	# as work-in-progress.
+	if test "$parent_status" = wip ; then
+		if test $parent_engine_build_default = yes ; then
+			all=no
+		fi
+	fi
 
 	for subeng in `get_engine_subengines $parent_engine` ; do
 		subengine_build=`get_engine_build $subeng`
@@ -716,14 +724,6 @@ get_subengines_build_string() {
 		else
 			all=no
 		fi
-
-		# handle engines that are on by default and have a single subengine that is off by default
-		if test "$parent_status" = wip ; then
-			if test $parent_engine_build_default = yes -a subengine ; then
-				all=no
-			fi
-		fi
-
 	done
 
 	if test $2 != no ; then


Commit: f98a8bb98c16cc52ba7388f324215195d23b4959
    https://github.com/scummvm/scummvm/commit/f98a8bb98c16cc52ba7388f324215195d23b4959
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2012-09-11T09:39:03-07:00

Commit Message:
CONFIGURE: Automatically enable parent engine if subengine is enabled

Changed paths:
    configure



diff --git a/configure b/configure
index f13f036..8dadd68 100755
--- a/configure
+++ b/configure
@@ -75,6 +75,7 @@ add_engine() {
 	set_var _engine_${1}_deps "${5}"
 	for sub in ${4}; do
 		set_var _engine_${sub}_sub "yes"
+		set_var _engine_${sub}_parent "${1}"
 	done
 }
 
@@ -518,6 +519,11 @@ get_engine_sub() {
 	echo $sub
 }
 
+# Get a subengine's parent (undefined for non-subengines)
+get_subengine_parent() {
+	get_var _engine_$1_parent
+}
+
 # Enable *all* engines
 engine_enable_all() {
 	for engine in $_engines; do
@@ -545,9 +551,15 @@ engine_enable() {
 	engine=`echo $eng | sed 's/-/_/g'`
 
 	# Filter the parameter for the subengines
-	if test "`get_engine_sub ${engine}`" != "no" -a "$opt" != "yes" ; then
-		subengine_option_error ${engine}
-		return
+	if test "`get_engine_sub ${engine}`" != "no" ; then
+		if test "$opt" != "yes" ; then
+			subengine_option_error ${engine}
+			return
+		fi
+		parent=`get_subengine_parent ${engine}`
+		if test `get_engine_build ${parent}` = "no" ; then
+			set_var _engine_${parent}_build "yes"
+		fi		
 	fi
 
 	if test "$opt" = "static" -o "$opt" = "dynamic" -o "$opt" = "yes" ; then