[Scummvm-cvs-logs] SF.net SVN: scummvm:[52681] scummvm/trunk

[sev at users.sourceforge.net]

Revision: 52681
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52681&view=rev
Author:   sev
Date:     2010-09-12 08:08:37 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
TESTBED: Merge gsoc2010-testbed branch

Modified Paths:
--------------
    scummvm/trunk/base/plugins.cpp
    scummvm/trunk/configure
    scummvm/trunk/engines/engines.mk

Added Paths:
-----------
    scummvm/trunk/dists/engine-data/create-testbed-data.sh
    scummvm/trunk/dists/engine-data/testbed-audiocd-files/
    scummvm/trunk/engines/testbed/

Modified: scummvm/trunk/base/plugins.cpp
===================================================================
--- scummvm/trunk/base/plugins.cpp	2010-09-12 07:24:57 UTC (rev 52680)
+++ scummvm/trunk/base/plugins.cpp	2010-09-12 08:08:37 UTC (rev 52681)
@@ -157,6 +157,9 @@
 		#if PLUGIN_ENABLED_STATIC(TEENAGENT)
 		LINK_PLUGIN(TEENAGENT)
 		#endif
+		#if PLUGIN_ENABLED_STATIC(TESTBED)
+		LINK_PLUGIN(TESTBED)
+		#endif
 		#if PLUGIN_ENABLED_STATIC(TINSEL)
 		LINK_PLUGIN(TINSEL)
 		#endif

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2010-09-12 07:24:57 UTC (rev 52680)
+++ scummvm/trunk/configure	2010-09-12 08:08:37 UTC (rev 52681)
@@ -106,6 +106,7 @@
 add_engine sword1 "Broken Sword" yes
 add_engine sword2 "Broken Sword II" yes
 add_engine teenagent "Teen Agent" yes
+add_engine testbed "TestBed: the Testing framework" no
 add_engine tinsel "Tinsel" yes
 add_engine touche "Touche: The Adventures of the Fifth Musketeer" yes
 add_engine tucker "Bud Tucker in Double Trouble" yes

Copied: scummvm/trunk/dists/engine-data/create-testbed-data.sh (from rev 51837, scummvm/branches/gsoc2010-testbed/dists/engine-data/create-testbed-data.sh)
===================================================================
--- scummvm/trunk/dists/engine-data/create-testbed-data.sh	                        (rev 0)
+++ scummvm/trunk/dists/engine-data/create-testbed-data.sh	2010-09-12 08:08:37 UTC (rev 52681)
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+# Create the directory structure
+# Avoided bash shortcuts / file-seperators in interest of portability
+
+if [ -e testbed ]; then
+	echo "Game-data already present as testbed/"
+	echo "To regenerate, remove and rerun"
+	exit 0
+fi
+
+mkdir testbed
+
+cd testbed
+
+# For game detection
+echo "ScummVM rocks!" > TESTBED
+
+mkdir test1
+mkdir Test2
+mkdir TEST3
+mkdir tEST4
+mkdir test5
+
+
+cd test1
+echo "It works!" > file.txt
+cd ..
+
+cd Test2
+echo "It works!" > File.txt
+cd ..
+
+cd TEST3
+echo "It works!" > FILE.txt
+cd ..
+
+cd tEST4
+echo "It works!" > fILe.txt
+cd ..
+
+cd test5
+echo "It works!" > file.
+cd ..
+
+# back to the top
+cd ..
+
+# move the audiocd data to newly created directory
+cp -r testbed-audiocd-files testbed/audiocd-files
+
+echo "Game data created"

Modified: scummvm/trunk/engines/engines.mk
===================================================================
--- scummvm/trunk/engines/engines.mk	2010-09-12 07:24:57 UTC (rev 52680)
+++ scummvm/trunk/engines/engines.mk	2010-09-12 08:08:37 UTC (rev 52681)
@@ -141,6 +141,11 @@
 MODULES += engines/sword2
 endif
 
+ifdef ENABLE_TESTBED
+DEFINES += -DENABLE_TESTBED=$(ENABLE_TESTBED)
+MODULES += engines/testbed
+endif
+
 ifdef ENABLE_TEENAGENT
 DEFINES += -DENABLE_TEENAGENT=$(ENABLE_TEENAGENT)
 MODULES += engines/teenagent


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.