--- a/common/build.xml	Wed Oct 07 14:12:03 2009 +0100
+++ b/common/build.xml	Wed Oct 07 14:29:43 2009 +0100
@@ -452,6 +452,7 @@
 
     <target name="sf-preprocess-package-config">
         <mkdir dir="${sf.common.config.dir}/generated"/>
+	<echo message="${sf.spec.sourcesync.sourcespecdir}/${sf.spec.sourcesync.sourcespecfile}"/>
         <exec executable="perl" dir="${build.drive}/" failonerror="false" output="${build.log.dir}/zipconfig.log">
             <arg value="${sf.common.config.dir}/tools/populateziptemplate.pl"/>
             <arg value="${sf.spec.sourcesync.sourcespecdir}/${sf.spec.sourcesync.sourcespecfile}"/>

--- a/common/tools/ats/bctest/multimedia/multimediasvs.pl	Wed Oct 07 14:12:03 2009 +0100
+++ b/common/tools/ats/bctest/multimedia/multimediasvs.pl	Wed Oct 07 14:29:43 2009 +0100
@@ -40,73 +40,65 @@
 copy($epoc . "data/z/resource/plugins/ecamtestplugin.rsc",	"temp/multimediatest/winscw_udeb/z/resource/plugins/ecamtestplugin.rsc") or die "failed : $!";
 copy($epoc . "release/winscw/udeb/ecamtestplugin.dll",		"temp/multimediatest/winscw_udeb/ecamtestplugin.dll") or die "failed : $!";
 
-copy($epoc . "data/z/resource/plugins/xvidencoderdevice.rsc",	"temp/multimediatest/winscw_udeb/z/resource/plugins/xvidencoderdevice.rsc") or die "failed : $!";
-copy($epoc . "data/z/resource/plugins/xviddecoderdevice.rsc",	"temp/multimediatest/winscw_udeb/z/resource/plugins/xviddecoderdevice.rsc") or die "failed : $!";
-copy($epoc . "release/winscw/udeb/xvidencoderdevice.dll",		"temp/multimediatest/winscw_udeb/xvidencoderdevice.dll") or die "failed : $!";
-copy($epoc . "release/winscw/udeb/xviddecoderdevice.dll",		"temp/multimediatest/winscw_udeb/xviddecoderdevice.dll") or die "failed : $!";
-
 copy($epoc . "release/winscw/udeb/testframeworkserver.exe",	"temp/multimediatest/winscw_udeb/testframeworkserver.exe") or die "failed : $!";
 copy($epoc . "release/winscw/udeb/testframeworkclient.dll",	"temp/multimediatest/winscw_udeb/testframeworkclient.dll") or die "failed : $!";
 
-copy($epoc . "data/z/resource/plugins/xvidhwdeviceplugins.rsc",	"temp/multimediatest/winscw_udeb/z/resource/plugins/xvidhwdeviceplugins.rsc") or die "failed : $!";
-copy($epoc . "release/winscw/udeb/xvidhwdeviceplugins.dll",		"temp/multimediatest/winscw_udeb/xvidhwdeviceplugins.dll") or die "failed : $!";
-
 copy($epoc . "data/z/resource/plugins/ts_miditstcntrl.rsc",	"temp/multimediatest/winscw_udeb/z/resource/plugins/ts_miditstcntrl.rsc") or die "failed : $!";
 copy($epoc . "release/winscw/udeb/ts_miditstcntrl.dll",		"temp/multimediatest/winscw_udeb/ts_miditstcntrl.dll") or die "failed : $!";
 
-copy($epoc . "data/z/multimedia/t_multimedia.tcs",			"temp/multimediatest/general/multimedia/t_multimedia.tcs") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_multimedia.ini",			"temp/multimediatest/general/multimedia/t_multimedia.ini") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_multimedia_location.ini",	"temp/multimediatest/general/multimedia/t_multimedia_location.ini") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_multimedia.tcs",			"temp/multimediatest/general/multimedia/t_multimedia.tcs") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_multimedia.ini",			"temp/multimediatest/general/multimedia/t_multimedia.ini") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_multimedia_location.ini",	"temp/multimediatest/general/multimedia/t_multimedia_location.ini") or die "failed : $!";
 
-copy($epoc . "data/z/multimedia/102070cc.txt",				"temp/multimediatest/general/102070CC.txt") or die "failed : $!";
-copy($epoc . "data/z/multimedia/mm-ecm-publicapi.script",	"temp/multimediatest/general/multimedia/mm-ecm-publicapi.script") or die "failed : $!";
-copy($epoc . "data/z/multimedia/mm-ecm-publicapi.ini",		"temp/multimediatest/general/multimedia/mm-ecm-publicapi.ini") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/102070cc.txt",				"temp/multimediatest/general/102070CC.txt") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/mm-ecm-publicapi.script",	"temp/multimediatest/general/multimedia/mm-ecm-publicapi.script") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/mm-ecm-publicapi.ini",		"temp/multimediatest/general/multimedia/mm-ecm-publicapi.ini") or die "failed : $!";
 
-copy($epoc . "data/z/multimedia/mm-icl-decde-publicapi.script",	"temp/multimediatest/general/multimedia/mm-icl-decde-publicapi.script") or die "failed : $!";
-copy($epoc . "data/z/multimedia/mm-icl-decde-publicapi.ini",	"temp/multimediatest/general/multimedia/mm-icl-decde-publicapi.ini") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/24bit.apm",		"temp/multimediatest/general/multimedia/t_imagedecoder/24bit.apm") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/1bit.bmp",		"temp/multimediatest/general/multimedia/t_imagedecoder/1bit.bmp") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/4bit.bmp",		"temp/multimediatest/general/multimedia/t_imagedecoder/4bit.bmp") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/8bit.bmp",		"temp/multimediatest/general/multimedia/t_imagedecoder/8bit.bmp") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/24bit.bmp",		"temp/multimediatest/general/multimedia/t_imagedecoder/24bit.bmp") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/24bit.clp",		"temp/multimediatest/general/multimedia/t_imagedecoder/24bit.clp") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/1bit.gif",		"temp/multimediatest/general/multimedia/t_imagedecoder/1bit.gif") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/2bit.gif",		"temp/multimediatest/general/multimedia/t_imagedecoder/2bit.gif") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/4bit.gif",		"temp/multimediatest/general/multimedia/t_imagedecoder/4bit.gif") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/6bit.gif",		"temp/multimediatest/general/multimedia/t_imagedecoder/6bit.gif") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/8bit.gif",		"temp/multimediatest/general/multimedia/t_imagedecoder/8bit.gif") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/commented.gif",	"temp/multimediatest/general/multimedia/t_imagedecoder/commented.gif") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/4bit.ico",		"temp/multimediatest/general/multimedia/t_imagedecoder/4bit.ico") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/8bit.ico",		"temp/multimediatest/general/multimedia/t_imagedecoder/8bit.ico") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/8bit.jpg",		"temp/multimediatest/general/multimedia/t_imagedecoder/8bit.jpg") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/24bit.jpg",		"temp/multimediatest/general/multimedia/t_imagedecoder/24bit.jpg") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/thumbnail.jpg",	"temp/multimediatest/general/multimedia/t_imagedecoder/thumbnail.jpg") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/commented.jpg",	"temp/multimediatest/general/multimedia/t_imagedecoder/commented.jpg") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/mm-icl-decde-publicapi.script",	"temp/multimediatest/general/multimedia/mm-icl-decde-publicapi.script") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/mm-icl-decde-publicapi.ini",	"temp/multimediatest/general/multimedia/mm-icl-decde-publicapi.ini") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/24bit.apm",		"temp/multimediatest/general/multimedia/t_imagedecoder/24bit.apm") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/1bit.bmp",		"temp/multimediatest/general/multimedia/t_imagedecoder/1bit.bmp") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/4bit.bmp",		"temp/multimediatest/general/multimedia/t_imagedecoder/4bit.bmp") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/8bit.bmp",		"temp/multimediatest/general/multimedia/t_imagedecoder/8bit.bmp") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/24bit.bmp",		"temp/multimediatest/general/multimedia/t_imagedecoder/24bit.bmp") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/24bit.clp",		"temp/multimediatest/general/multimedia/t_imagedecoder/24bit.clp") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/1bit.gif",		"temp/multimediatest/general/multimedia/t_imagedecoder/1bit.gif") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/2bit.gif",		"temp/multimediatest/general/multimedia/t_imagedecoder/2bit.gif") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/4bit.gif",		"temp/multimediatest/general/multimedia/t_imagedecoder/4bit.gif") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/6bit.gif",		"temp/multimediatest/general/multimedia/t_imagedecoder/6bit.gif") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/8bit.gif",		"temp/multimediatest/general/multimedia/t_imagedecoder/8bit.gif") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/commented.gif",	"temp/multimediatest/general/multimedia/t_imagedecoder/commented.gif") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/4bit.ico",		"temp/multimediatest/general/multimedia/t_imagedecoder/4bit.ico") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/8bit.ico",		"temp/multimediatest/general/multimedia/t_imagedecoder/8bit.ico") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/8bit.jpg",		"temp/multimediatest/general/multimedia/t_imagedecoder/8bit.jpg") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/24bit.jpg",		"temp/multimediatest/general/multimedia/t_imagedecoder/24bit.jpg") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/thumbnail.jpg",	"temp/multimediatest/general/multimedia/t_imagedecoder/thumbnail.jpg") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/commented.jpg",	"temp/multimediatest/general/multimedia/t_imagedecoder/commented.jpg") or die "failed : $!";
 copy($epoc . "data/z/multimedia/t_imagedecoder/dec1bit.mbm",	"temp/multimediatest/general/multimedia/t_imagedecoder/dec1bit.mbm") or die "failed : $!";
 copy($epoc . "data/z/multimedia/t_imagedecoder/dec2bit.mbm",	"temp/multimediatest/general/multimedia/t_imagedecoder/dec2bit.mbm") or die "failed : $!";
 copy($epoc . "data/z/multimedia/t_imagedecoder/dec4bit.mbm",	"temp/multimediatest/general/multimedia/t_imagedecoder/dec4bit.mbm") or die "failed : $!";
 copy($epoc . "data/z/multimedia/t_imagedecoder/dec8bit.mbm",	"temp/multimediatest/general/multimedia/t_imagedecoder/dec8bit.mbm") or die "failed : $!";
 copy($epoc . "data/z/multimedia/t_imagedecoder/dec16bit.mbm",	"temp/multimediatest/general/multimedia/t_imagedecoder/dec16bit.mbm") or die "failed : $!";
 copy($epoc . "data/z/multimedia/t_imagedecoder/dec24bit.mbm",	"temp/multimediatest/general/multimedia/t_imagedecoder/dec24bit.mbm") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/24bit.mng",		"temp/multimediatest/general/multimedia/t_imagedecoder/24bit.mng") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/1bit.ota",		"temp/multimediatest/general/multimedia/t_imagedecoder/1bit.ota") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/1bit.png",		"temp/multimediatest/general/multimedia/t_imagedecoder/1bit.png") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/4bit.png",		"temp/multimediatest/general/multimedia/t_imagedecoder/4bit.png") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/8bit.png",		"temp/multimediatest/general/multimedia/t_imagedecoder/8bit.png") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/24bit.png",		"temp/multimediatest/general/multimedia/t_imagedecoder/24bit.png") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/1bitg3.tif",		"temp/multimediatest/general/multimedia/t_imagedecoder/1bitg3.tif") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/1bitg4.tif",		"temp/multimediatest/general/multimedia/t_imagedecoder/1bitg4.tif") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/1bit.tif",		"temp/multimediatest/general/multimedia/t_imagedecoder/1bit.tif") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/4bit.tif",		"temp/multimediatest/general/multimedia/t_imagedecoder/4bit.tif") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/8bit.tif",		"temp/multimediatest/general/multimedia/t_imagedecoder/8bit.tif") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/24bit.tif",		"temp/multimediatest/general/multimedia/t_imagedecoder/24bit.tif") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/1bit.wbmp",		"temp/multimediatest/general/multimedia/t_imagedecoder/1bit.wbmp") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/24bit.wmf",		"temp/multimediatest/general/multimedia/t_imagedecoder/24bit.wmf") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/corrupted.bmp",	"temp/multimediatest/general/multimedia/t_imagedecoder/corrupted.bmp") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_imagedecoder/partial.bmp",	"temp/multimediatest/general/multimedia/t_imagedecoder/partial.bmp") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/24bit.mng",		"temp/multimediatest/general/multimedia/t_imagedecoder/24bit.mng") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/1bit.ota",		"temp/multimediatest/general/multimedia/t_imagedecoder/1bit.ota") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/1bit.png",		"temp/multimediatest/general/multimedia/t_imagedecoder/1bit.png") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/4bit.png",		"temp/multimediatest/general/multimedia/t_imagedecoder/4bit.png") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/8bit.png",		"temp/multimediatest/general/multimedia/t_imagedecoder/8bit.png") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/24bit.png",		"temp/multimediatest/general/multimedia/t_imagedecoder/24bit.png") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/1bitg3.tif",		"temp/multimediatest/general/multimedia/t_imagedecoder/1bitg3.tif") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/1bitg4.tif",		"temp/multimediatest/general/multimedia/t_imagedecoder/1bitg4.tif") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/1bit.tif",		"temp/multimediatest/general/multimedia/t_imagedecoder/1bit.tif") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/4bit.tif",		"temp/multimediatest/general/multimedia/t_imagedecoder/4bit.tif") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/8bit.tif",		"temp/multimediatest/general/multimedia/t_imagedecoder/8bit.tif") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/24bit.tif",		"temp/multimediatest/general/multimedia/t_imagedecoder/24bit.tif") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/1bit.wbmp",		"temp/multimediatest/general/multimedia/t_imagedecoder/1bit.wbmp") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/24bit.wmf",		"temp/multimediatest/general/multimedia/t_imagedecoder/24bit.wmf") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/corrupted.bmp",	"temp/multimediatest/general/multimedia/t_imagedecoder/corrupted.bmp") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_imagedecoder/partial.bmp",	"temp/multimediatest/general/multimedia/t_imagedecoder/partial.bmp") or die "failed : $!";
 
-copy($epoc . "data/z/multimedia/mm-icl-encde-publicapi.script",	"temp/multimediatest/general/multimedia/mm-icl-encde-publicapi.script") or die "failed : $!";
-copy($epoc . "data/z/multimedia/mm-icl-encde-publicapi.ini",	"temp/multimediatest/general/multimedia/mm-icl-encde-publicapi.ini") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/mm-icl-encde-publicapi.script",	"temp/multimediatest/general/multimedia/mm-icl-encde-publicapi.script") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/mm-icl-encde-publicapi.ini",	"temp/multimediatest/general/multimedia/mm-icl-encde-publicapi.ini") or die "failed : $!";
 copy($epoc . "data/z/multimedia/t_imageencoder/enc1bit.mbm",	"temp/multimediatest/general/multimedia/t_imageencoder/enc1bit.mbm") or die "failed : $!";
 copy($epoc . "data/z/multimedia/t_imageencoder/enc2bit.mbm",	"temp/multimediatest/general/multimedia/t_imageencoder/enc2bit.mbm") or die "failed : $!";
 copy($epoc . "data/z/multimedia/t_imageencoder/enc4bit.mbm",	"temp/multimediatest/general/multimedia/t_imageencoder/enc4bit.mbm") or die "failed : $!";
@@ -114,54 +106,45 @@
 copy($epoc . "data/z/multimedia/t_imageencoder/enc16bit.mbm",	"temp/multimediatest/general/multimedia/t_imageencoder/enc16bit.mbm") or die "failed : $!";
 copy($epoc . "data/z/multimedia/t_imageencoder/enc24bit.mbm",	"temp/multimediatest/general/multimedia/t_imageencoder/enc24bit.mbm") or die "failed : $!";
 
-copy($epoc . "data/z/multimedia/mm-mmf-aclnt-cnvrt-publicapi.script",					"temp/multimediatest/general/multimedia/mm-mmf-aclnt-cnvrt-publicapi.script") or die "failed : $!";
-copy($epoc . "data/z/multimedia/mm-mmf-aclnt-cnvrt-publicapi.ini",						"temp/multimediatest/general/multimedia/mm-mmf-aclnt-cnvrt-publicapi.ini") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_mdaaudioconvertutility/note.wav",						"temp/multimediatest/general/multimedia/t_mdaaudioconvertutility/note.wav") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_mdaaudioconvertutility/note.raw",						"temp/multimediatest/general/multimedia/t_mdaaudioconvertutility/note.raw") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_mdaaudioconvertutility/corrupted.wav",				"temp/multimediatest/general/multimedia/t_mdaaudioconvertutility/corrupted.wav") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/mm-mmf-aclnt-cnvrt-publicapi.script",					"temp/multimediatest/general/multimedia/mm-mmf-aclnt-cnvrt-publicapi.script") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/mm-mmf-aclnt-cnvrt-publicapi.ini",						"temp/multimediatest/general/multimedia/mm-mmf-aclnt-cnvrt-publicapi.ini") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_mdaaudioconvertutility/note.wav",						"temp/multimediatest/general/multimedia/t_mdaaudioconvertutility/note.wav") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_mdaaudioconvertutility/note.raw",						"temp/multimediatest/general/multimedia/t_mdaaudioconvertutility/note.raw") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_mdaaudioconvertutility/corrupted.wav",				"temp/multimediatest/general/multimedia/t_mdaaudioconvertutility/corrupted.wav") or die "failed : $!";
 copy($epoc . "release/winscw/udeb/z/multimedia/t_mdaaudioconvertutility/explode.wav",	"temp/multimediatest/general/multimedia/t_mdaaudioconvertutility/explode.wav") or die "failed : $!";
 
-copy($epoc . "data/z/multimedia/mm-mmf-aclnt-inpt-publicapi.script",	"temp/multimediatest/general/multimedia/mm-mmf-aclnt-inpt-publicapi.script") or die "failed : $!";
-copy($epoc . "data/z/multimedia/mm-mmf-aclnt-inpt-publicapi.ini",		"temp/multimediatest/general/multimedia/mm-mmf-aclnt-inpt-publicapi.ini") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/mm-mmf-aclnt-inpt-publicapi.script",	"temp/multimediatest/general/multimedia/mm-mmf-aclnt-inpt-publicapi.script") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/mm-mmf-aclnt-inpt-publicapi.ini",		"temp/multimediatest/general/multimedia/mm-mmf-aclnt-inpt-publicapi.ini") or die "failed : $!";
 
-copy($epoc . "data/z/multimedia/mm-mmf-aclnt-outpt-publicapi.script",						"temp/multimediatest/general/multimedia/mm-mmf-aclnt-outpt-publicapi.script") or die "failed : $!";
-copy($epoc . "data/z/multimedia/mm-mmf-aclnt-outpt-publicapi.ini",							"temp/multimediatest/general/multimedia/mm-mmf-aclnt-outpt-publicapi.ini") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_mdaaudiooutputstream/mm-mmf-aclnt-outpt-publicapi.raw",	"temp/multimediatest/general/multimedia/t_mdaaudiooutputstream/mm-mmf-aclnt-outpt-publicapi.raw") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/mm-mmf-aclnt-outpt-publicapi.script",						"temp/multimediatest/general/multimedia/mm-mmf-aclnt-outpt-publicapi.script") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/mm-mmf-aclnt-outpt-publicapi.ini",							"temp/multimediatest/general/multimedia/mm-mmf-aclnt-outpt-publicapi.ini") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_mdaaudiooutputstream/mm-mmf-aclnt-outpt-publicapi.raw",	"temp/multimediatest/general/multimedia/t_mdaaudiooutputstream/mm-mmf-aclnt-outpt-publicapi.raw") or die "failed : $!";
 
-copy($epoc . "data/z/multimedia/mm-mmf-aclnt-plyr-publicapi.script",			"temp/multimediatest/general/multimedia/mm-mmf-aclnt-plyr-publicapi.script") or die "failed : $!";
-copy($epoc . "data/z/multimedia/mm-mmf-aclnt-plyr-publicapi.ini",				"temp/multimediatest/general/multimedia/mm-mmf-aclnt-plyr-publicapi.ini") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_mdaaudioplayerutility/test.wav",				"temp/multimediatest/general/multimedia/t_mdaaudioplayerutility/test.wav") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_mdaaudioplayerutility/test.bad",				"temp/multimediatest/general/multimedia/t_mdaaudioplayerutility/test.bad") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_mdaaudioplayerutility/test_err.wav",			"temp/multimediatest/general/multimedia/t_mdaaudioplayerutility/test_err.wav") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_mdaaudioplayerutility/empty.wav",				"temp/multimediatest/general/multimedia/t_mdaaudioplayerutility/empty.wav") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_mdaaudioplayerutility/answeringmachine.wav",	"temp/multimediatest/general/multimedia/t_mdaaudioplayerutility/answeringmachine.wav") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_mdaaudioplayerutility/explode.au",			"temp/multimediatest/general/multimedia/t_mdaaudioplayerutility/explode.au") or die "failed : $!";
-
-copy($epoc . "data/z/multimedia/mm-mmf-aclnt-rcrdr-publicapi.script",			"temp/multimediatest/general/multimedia/mm-mmf-aclnt-rcrdr-publicapi.script") or die "failed : $!";
-copy($epoc . "data/z/multimedia/mm-mmf-aclnt-rcrdr-publicapi.ini",				"temp/multimediatest/general/multimedia/mm-mmf-aclnt-rcrdr-publicapi.ini") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_mdaaudiorecorderutility/pcm16stereo8khz.wav",	"temp/multimediatest/general/multimedia/t_mdaaudiorecorderutility/pcm16stereo8khz.wav") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_mdaaudiorecorderutility/corrupted.wav",		"temp/multimediatest/general/multimedia/t_mdaaudiorecorderutility/corrupted.wav") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/mm-mmf-aclnt-plyr-publicapi.script",			"temp/multimediatest/general/multimedia/mm-mmf-aclnt-plyr-publicapi.script") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/mm-mmf-aclnt-plyr-publicapi.ini",				"temp/multimediatest/general/multimedia/mm-mmf-aclnt-plyr-publicapi.ini") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_mdaaudioplayerutility/test.wav",				"temp/multimediatest/general/multimedia/t_mdaaudioplayerutility/test.wav") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_mdaaudioplayerutility/test.bad",				"temp/multimediatest/general/multimedia/t_mdaaudioplayerutility/test.bad") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_mdaaudioplayerutility/test_err.wav",			"temp/multimediatest/general/multimedia/t_mdaaudioplayerutility/test_err.wav") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_mdaaudioplayerutility/empty.wav",				"temp/multimediatest/general/multimedia/t_mdaaudioplayerutility/empty.wav") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_mdaaudioplayerutility/answeringmachine.wav",	"temp/multimediatest/general/multimedia/t_mdaaudioplayerutility/answeringmachine.wav") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_mdaaudioplayerutility/explode.au",			"temp/multimediatest/general/multimedia/t_mdaaudioplayerutility/explode.au") or die "failed : $!";
 
-copy($epoc . "data/z/multimedia/mm-mmf-aclnt-tone-publicapi.script",	"temp/multimediatest/general/multimedia/mm-mmf-aclnt-tone-publicapi.script") or die "failed : $!";
-copy($epoc . "data/z/multimedia/mm-mmf-aclnt-tone-publicapi.ini",		"temp/multimediatest/general/multimedia/mm-mmf-aclnt-tone-publicapi.ini") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_audiotoneutility/sequence1.sqn",		"temp/multimediatest/general/multimedia/t_audiotoneutility/sequence1.sqn") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_audiotoneutility/sequence2.sqn",		"temp/multimediatest/general/multimedia/t_audiotoneutility/sequence2.sqn") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_audiotoneutility/badsequence.sqn",	"temp/multimediatest/general/multimedia/t_audiotoneutility/badsequence.sqn") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/mm-mmf-aclnt-rcrdr-publicapi.script",			"temp/multimediatest/general/multimedia/mm-mmf-aclnt-rcrdr-publicapi.script") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/mm-mmf-aclnt-rcrdr-publicapi.ini",				"temp/multimediatest/general/multimedia/mm-mmf-aclnt-rcrdr-publicapi.ini") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_mdaaudiorecorderutility/pcm16stereo8khz.wav",	"temp/multimediatest/general/multimedia/t_mdaaudiorecorderutility/pcm16stereo8khz.wav") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_mdaaudiorecorderutility/corrupted.wav",		"temp/multimediatest/general/multimedia/t_mdaaudiorecorderutility/corrupted.wav") or die "failed : $!";
 
-copy($epoc . "data/z/multimedia/mm-mmf-midi-publicapi.script",			"temp/multimediatest/general/multimedia/mm-mmf-midi-publicapi.script") or die "failed : $!";
-copy($epoc . "data/z/multimedia/mm-mmf-midi-publicapi.ini",				"temp/multimediatest/general/multimedia/mm-mmf-midi-publicapi.ini") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_midiclientutility/midi.mid",			"temp/multimediatest/general/multimedia/t_midiclientutility/midi.mid") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_midiclientutility/textmidi.mid",		"temp/multimediatest/general/multimedia/t_midiclientutility/textmidi.mid") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_midiclientutility/midiclienttest.gm",	"temp/multimediatest/general/multimedia/t_midiclientutility/midiclienttest.gm") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/mm-mmf-aclnt-tone-publicapi.script",	"temp/multimediatest/general/multimedia/mm-mmf-aclnt-tone-publicapi.script") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/mm-mmf-aclnt-tone-publicapi.ini",		"temp/multimediatest/general/multimedia/mm-mmf-aclnt-tone-publicapi.ini") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_audiotoneutility/sequence1.sqn",		"temp/multimediatest/general/multimedia/t_audiotoneutility/sequence1.sqn") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_audiotoneutility/sequence2.sqn",		"temp/multimediatest/general/multimedia/t_audiotoneutility/sequence2.sqn") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_audiotoneutility/badsequence.sqn",	"temp/multimediatest/general/multimedia/t_audiotoneutility/badsequence.sqn") or die "failed : $!";
 
-copy($epoc . "data/z/multimedia/mm-mmf-vclnt-plyr-publicapi.script",	"temp/multimediatest/general/multimedia/mm-mmf-vclnt-plyr-publicapi.script") or die "failed : $!";
-copy($epoc . "data/z/multimedia/mm-mmf-vclnt-plyr-publicapi.ini",		"temp/multimediatest/general/multimedia/mm-mmf-vclnt-plyr-publicapi.ini") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_videoplayerutility/alter.mp4",		"temp/multimediatest/general/multimedia/t_videoplayerutility/alter.mp4") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_videoplayerutility/xvid_clock.avi",	"temp/multimediatest/general/multimedia/t_videoplayerutility/xvid_clock.avi") or die "failed : $!";
-copy($epoc . "data/z/multimedia/t_videoplayerutility/corrupted.avi",	"temp/multimediatest/general/multimedia/t_videoplayerutility/corrupted.avi") or die "failed : $!";
-
-copy($epoc . "data/z/multimedia/mm-mmf-vclnt-rcrdr-publicapi.script",	"temp/multimediatest/general/multimedia/mm-mmf-vclnt-rcrdr-publicapi.script") or die "failed : $!";
-copy($epoc . "data/z/multimedia/mm-mmf-vclnt-rcrdr-publicapi.ini",		"temp/multimediatest/general/multimedia/mm-mmf-vclnt-rcrdr-publicapi.ini") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/mm-mmf-midi-publicapi.script",			"temp/multimediatest/general/multimedia/mm-mmf-midi-publicapi.script") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/mm-mmf-midi-publicapi.ini",				"temp/multimediatest/general/multimedia/mm-mmf-midi-publicapi.ini") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_midiclientutility/midi.mid",			"temp/multimediatest/general/multimedia/t_midiclientutility/midi.mid") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_midiclientutility/textmidi.mid",		"temp/multimediatest/general/multimedia/t_midiclientutility/textmidi.mid") or die "failed : $!";
+copy($epoc . "winscw/c/multimedia/t_midiclientutility/sample.gm",	"temp/multimediatest/general/multimedia/t_midiclientutility/sample.gm") or die "failed : $!";
 
 copy($epoc . "release/winscw/udeb/t_camera.exe",					"temp/multimediatest/winscw_udeb/t_camera.exe") or die "failed : $!";
 copy($epoc . "release/winscw/udeb/t_imagedecoder.exe",				"temp/multimediatest/winscw_udeb/t_imagedecoder.exe") or die "failed : $!";
@@ -173,7 +156,5 @@
 copy($epoc . "release/winscw/udeb/t_mdaaudiorecorderutility.exe",	"temp/multimediatest/winscw_udeb/t_mdaaudiorecorderutility.exe") or die "failed : $!";
 copy($epoc . "release/winscw/udeb/t_mdaaudiotoneutility.exe",		"temp/multimediatest/winscw_udeb/t_mdaaudiotoneutility.exe") or die "failed : $!";
 copy($epoc . "release/winscw/udeb/t_midiclientutility.exe",			"temp/multimediatest/winscw_udeb/t_midiclientutility.exe") or die "failed : $!";
-copy($epoc . "release/winscw/udeb/t_videoplayerutility.exe",		"temp/multimediatest/winscw_udeb/t_videoplayerutility.exe") or die "failed : $!";
-copy($epoc . "release/winscw/udeb/t_videorecorderutility.exe",		"temp/multimediatest/winscw_udeb/t_videorecorderutility.exe") or die "failed : $!";
 
 system("7z a -tzip multimediatest.zip ./temp/*");

--- a/common/tools/ats/bctest/multimedia/multimediatest.xml	Wed Oct 07 14:12:03 2009 +0100
+++ b/common/tools/ats/bctest/multimedia/multimediatest.xml	Wed Oct 07 14:29:43 2009 +0100
@@ -815,330 +815,12 @@
 						</params>
 					</step>
 				</case>
-				<case id="" name="T_VideoPlayerUtility" harness="GENERIC" enabled="true" passrate="100">
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="t_videoplayerutility.exe"/>
-							<param dst="c:\sys\bin\t_videoplayerutility.exe"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/plugins/xvidencoderdevice.rsc"/>
-							<param dst="z:\resource\plugins\xvidencoderdevice.rsc"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/plugins/xviddecoderdevice.rsc"/>
-							<param dst="z:\resource\plugins\xviddecoderdevice.rsc"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="xvidencoderdevice.dll"/>
-							<param dst="c:\sys\bin\xvidencoderdevice.dll"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="xviddecoderdevice.dll"/>
-							<param dst="c:\sys\bin\xviddecoderdevice.dll"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/plugins/xvidhwdeviceplugins.rsc"/>
-							<param dst="z:\resource\plugins\xvidhwdeviceplugins.rsc"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="xvidhwdeviceplugins.dll"/>
-							<param dst="c:\sys\bin\xvidhwdeviceplugins.dll"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="testframeworkserver.exe"/>
-							<param dst="c:\sys\bin\testframeworkserver.exe"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="testframeworkclient.dll"/>
-							<param dst="c:\sys\bin\testframeworkclient.dll"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (device)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="multimedia/t_multimedia.tcs"/>
-							<param dst="c:\multimedia\t_multimedia.tcs"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (device)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="multimedia/t_multimedia.ini"/>
-							<param dst="c:\multimedia\t_multimedia.ini"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 2 (location)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="multimedia/t_multimedia_location.ini"/>
-							<param dst="c:\multimedia\t_multimedia_location.ini"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 3 (case data)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="multimedia/t_videoplayerutility/*"/>
-							<param dst="c:\multimedia\t_videoplayerutility\"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 3 (case data)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="multimedia/mm-mmf-vclnt-plyr-publicapi.script"/>
-							<param dst="c:\multimedia\mm-mmf-vclnt-plyr-publicapi.script"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 3 (case data)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="multimedia/mm-mmf-vclnt-plyr-publicapi.ini"/>
-							<param dst="c:\multimedia\mm-mmf-vclnt-plyr-publicapi.ini"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 4 (execute)" harness="GENERIC" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="\multimedia\mm-mmf-vclnt-plyr-publicapi.script -tcs \multimedia\t_multimedia.tcs"/>
-							<param result-file="c:\logs\testexecute\mm-mmf-vclnt-plyr-publicapi.htm"/>
-							<param parser="TEFTestResultParser"/>
-							<param timeout="1000"/>
-						</params>
-					</step>
-				</case>
-				<case id="" name="T_VideoRecorderUtility" harness="GENERIC" enabled="true" passrate="100">
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="t_videorecorderutility.exe"/>
-							<param dst="c:\sys\bin\t_videorecorderutility.exe"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/plugins/ecamtestplugin.rsc"/>
-							<param dst="z:\resource\plugins\ecamtestplugin.rsc"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="ecamtestplugin.dll"/>
-							<param dst="c:\sys\bin\ecamtestplugin.dll"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (device)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="102070CC.txt"/>
-							<param dst="c:\102070CC.txt"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/plugins/xvidencoderdevice.rsc"/>
-							<param dst="z:\resource\plugins\xvidencoderdevice.rsc"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/plugins/xviddecoderdevice.rsc"/>
-							<param dst="z:\resource\plugins\xviddecoderdevice.rsc"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="xvidencoderdevice.dll"/>
-							<param dst="c:\sys\bin\xvidencoderdevice.dll"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="xviddecoderdevice.dll"/>
-							<param dst="c:\sys\bin\xviddecoderdevice.dll"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/plugins/xvidhwdeviceplugins.rsc"/>
-							<param dst="z:\resource\plugins\xvidhwdeviceplugins.rsc"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="xvidhwdeviceplugins.dll"/>
-							<param dst="c:\sys\bin\xvidhwdeviceplugins.dll"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="testframeworkserver.exe"/>
-							<param dst="c:\sys\bin\testframeworkserver.exe"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="testframeworkclient.dll"/>
-							<param dst="c:\sys\bin\testframeworkclient.dll"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (device)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="multimedia/t_multimedia.tcs"/>
-							<param dst="c:\multimedia\t_multimedia.tcs"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (device)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="multimedia/t_multimedia.ini"/>
-							<param dst="c:\multimedia\t_multimedia.ini"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 2 (location)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="multimedia/t_multimedia_location.ini"/>
-							<param dst="c:\multimedia\t_multimedia_location.ini"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 3 (case data)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="multimedia/mm-mmf-vclnt-rcrdr-publicapi.script"/>
-							<param dst="c:\multimedia\mm-mmf-vclnt-rcrdr-publicapi.script"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 3 (case data)" harness="GENERIC" enabled="true" passrate="100">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="multimedia/mm-mmf-vclnt-rcrdr-publicapi.ini"/>
-							<param dst="c:\multimedia\mm-mmf-vclnt-rcrdr-publicapi.ini"/>
-							<param component-path="multimediatest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 4 (execute)" harness="GENERIC" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="testexecute.exe"/>
-							<param parameters="\multimedia\mm-mmf-vclnt-rcrdr-publicapi.script -tcs \multimedia\t_multimedia.tcs"/>
-							<param result-file="c:\logs\testexecute\mm-mmf-vclnt-rcrdr-publicapi.htm"/>
-							<param parser="TEFTestResultParser"/>
-							<param timeout="1000"/>
-						</params>
-					</step>
-				</case>
 			</set>
 		</session>
 	</plan>
 	<files>
 		<file>multimediatest/winscw_udeb/z/resource/plugins/ecamtestplugin.rsc</file>
 		<file>multimediatest/winscw_udeb/ecamtestplugin.dll</file>
-		<file>multimediatest/winscw_udeb/z/resource/plugins/xvidencoderdevice.rsc</file>
-		<file>multimediatest/winscw_udeb/z/resource/plugins/xviddecoderdevice.rsc</file>
-		<file>multimediatest/winscw_udeb/xvidencoderdevice.dll</file>
-		<file>multimediatest/winscw_udeb/xviddecoderdevice.dll</file>
-		<file>multimediatest/winscw_udeb/z/resource/plugins/xvidhwdeviceplugins.rsc</file>
-		<file>multimediatest/winscw_udeb/xvidhwdeviceplugins.dll</file>
 		<file>multimediatest/winscw_udeb/testframeworkserver.exe</file>
 		<file>multimediatest/winscw_udeb/testframeworkclient.dll</file>
 		<file>multimediatest/winscw_udeb/z/resource/plugins/ts_miditstcntrl.rsc</file>
@@ -1229,14 +911,7 @@
 		<file>multimediatest/general/multimedia/mm-mmf-midi-publicapi.ini</file>
 		<file>multimediatest/general/multimedia/t_midiclientutility/midi.mid</file>
 		<file>multimediatest/general/multimedia/t_midiclientutility/textmidi.mid</file>
-		<file>multimediatest/general/multimedia/t_midiclientutility/midiclienttest.gm</file>
-		<file>multimediatest/general/multimedia/mm-mmf-vclnt-plyr-publicapi.script</file>
-		<file>multimediatest/general/multimedia/mm-mmf-vclnt-plyr-publicapi.ini</file>
-		<file>multimediatest/general/multimedia/t_videoplayerutility/alter.mp4</file>
-		<file>multimediatest/general/multimedia/t_videoplayerutility/xvid_clock.avi</file>
-		<file>multimediatest/general/multimedia/t_videoplayerutility/corrupted.avi</file>
-		<file>multimediatest/general/multimedia/mm-mmf-vclnt-rcrdr-publicapi.script</file>
-		<file>multimediatest/general/multimedia/mm-mmf-vclnt-rcrdr-publicapi.ini</file>
+		<file>multimediatest/general/multimedia/t_midiclientutility/sample.gm</file>
 		<file>multimediatest/winscw_udeb/t_camera.exe</file>
 		<file>multimediatest/winscw_udeb/t_imagedecoder.exe</file>
 		<file>multimediatest/winscw_udeb/t_imageencoder.exe</file>
@@ -1247,7 +922,5 @@
 		<file>multimediatest/winscw_udeb/t_mdaaudiorecorderutility.exe</file>
 		<file>multimediatest/winscw_udeb/t_mdaaudiotoneutility.exe</file>
 		<file>multimediatest/winscw_udeb/t_midiclientutility.exe</file>
-		<file>multimediatest/winscw_udeb/t_videoplayerutility.exe</file>
-		<file>multimediatest/winscw_udeb/t_videorecorderutility.exe</file>
 	</files>
 </test>

--- a/common/tools/ats/bctest/package_definition.xml	Wed Oct 07 14:12:03 2009 +0100
+++ b/common/tools/ats/bctest/package_definition.xml	Wed Oct 07 14:29:43 2009 +0100
@@ -189,7 +189,7 @@
 				<command cmd="&cmd.perl;		sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/group/SetEnv.pl" />
 			</meta>
 		</layer>
-		<layer name="bld_production" long-name="Binary Compatability Production code build" levels="generic specific">
+		<layer name="bld-production" long-name="Binary Compatability Production code build" levels="generic specific">
 			<collection name="aspconnectionsis" long-name="50_asp_connection.sis">
 				<component id="aspconnection" name="ASP Connection Test">
 					<unit bldFile="sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/connection/group"/>
@@ -216,37 +216,35 @@
 				</component>	
 			</collection>
 
-					<component id="lmksearch" name="Landmark Search Test">
-						<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_search_api/group"/>
-					</component>
-					<component id="lmkdbmgmt" name="Landmark Database Management Test">
-						<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_database_management_api/group"/>
-					</component>
-					<component id="landmarks" name="Landmarks API Test">
-						<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_api/group"/>
-					</component>
+			<component id="lmksearch" name="Landmark Search Test">
+				<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_search_api/group"/>
+			</component>
+			<component id="lmkdbmgmt" name="Landmark Database Management Test">
+				<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_database_management_api/group"/>
+			</component>
+			<component id="landmarks" name="Landmarks API Test">
+				<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_api/group"/>
+			</component>
 
 			<collection name="mmsclientmtmsis" long-name="50_Messaging_MMSClientMTM.SIS">
 				<component id="mmsclientmtm" name="Messaging MMS Client MTM BC Test">
 					<unit bldFile="sf/app/messaging/msg_pub/mms_client_mtm_api/tsrc/bc/group"/>
 				</component>
 			</collection>
-
 			<collection name="senduiapisis" long-name="50_msg_sendui.sis">
 				<component id="sendui" name="Messaging Send UI API BC Test">
 					<unit bldFile="sf/mw/messagingmw/msgfw_pub/send_ui_api/tsrc/bc/group"/>
 				</component>
 			</collection>
-
 			<collection name="pluginbiosis" long-name="50_Messaging_PluginBio.sis">
 				<component id="pluginbio" name="Messaging Plugin BIO BC Test">
 					<unit bldFile="sf/app/messaging/msg_pub/plugin_bio_control_api/tsrc/bc/group"/>
 				</component>
 			</collection>
 
-					<component id="drmcaf" name="DRM CAF BC Test">
-						<unit bldFile="sf/mw/drm/drm_pub/oma_drm_caf_agent_api/tsrc/bc/group"/>
-					</component>
+			<component id="drmcaf" name="DRM CAF BC Test">
+				<unit bldFile="sf/mw/drm/drm_pub/oma_drm_caf_agent_api/tsrc/bc/group"/>
+			</component>
 
 			<collection name="pbkdataaddeditsis" long-name="50_PIM_PbkDataAddEdit.SIS">
 				<component id="pbkdataaddedit" name="Phonebook Data Add Edit BC Test">
@@ -266,18 +264,18 @@
 				</component>
 			</collection>
 
-					<component id="pbkuiutil" name="Phonebook UI Utils BC Test">
-						<unit bldFile="sf/app/contacts/contacts_pub/phonebook_ui_utilities_api/tsrc/bc/group"/>
-					</component>
-					<component id="pbkvcard" name="Phonebook vCard Import Export BC Test">
-						<unit bldFile="sf/app/contacts/contacts_pub/phonebook_vcard_importexport_api/tsrc/bc/group"/>
-					</component>
-					<component id="pbkspeeddial" name="Phonebook Speed Dial BC Test">
-						<unit bldFile="sf/app/contacts/contacts_pub/speed_dial_utility_control_api/tsrc/bc/group"/>
-					</component>
-					<component id="proengwrap" name="Profiles Engine Wrapper Test">
-						<unit bldFile="sf/mw/appsupport/appsupport_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group"/>
-					</component>
+			<component id="pbkuiutil" name="Phonebook UI Utils BC Test">
+				<unit bldFile="sf/app/contacts/contacts_pub/phonebook_ui_utilities_api/tsrc/bc/group"/>
+			</component>
+			<component id="pbkvcard" name="Phonebook vCard Import Export BC Test">
+				<unit bldFile="sf/app/contacts/contacts_pub/phonebook_vcard_importexport_api/tsrc/bc/group"/>
+			</component>
+			<component id="pbkspeeddial" name="Phonebook Speed Dial BC Test">
+				<unit bldFile="sf/app/contacts/contacts_pub/speed_dial_utility_control_api/tsrc/bc/group"/>
+			</component>
+			<component id="proengwrap" name="Profiles Engine Wrapper Test">
+				<unit bldFile="sf/mw/appsupport/appsupport_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group"/>
+			</component>
 
 			<collection name="multimediasvs" long-name="SVS Multimedia API Tests">
 				<component id="testfwsrv" name="Multimedia Test Framework Server">
@@ -285,55 +283,13 @@
 				</component>
 			</collection>
 
-			<collection name="systemswsis" long-name="50_systemsw.sis">
-				<component id="systemsw" name="System Software">
-					<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/systemsw/group"/>
-				</component>
-				<component id="featurediscovery" name="Feature Discovery API">
-					<unit bldFile="sf/os/devicesrv/devicesrv_pub/feature_discovery_api/tsrc/bc/featurediscovery/group"/>
-				</component>
-				<component id="finditem" name="Find Item API">
-					<unit bldFile="sf/os/devicesrv/devicesrv_pub/find_item_api/tsrc/bc/finditem/group"/>
-				</component>
-				<component id="light" name="Light API">
-					<unit bldFile="sf/os/devicesrv/devicesrv_pub/light_api/tsrc/bc/light/group"/>
-				</component>
-				<component id="phoneparser" name="Phone Parser API">
-					<unit bldFile="sf/os/devicesrv/devicesrv_pub/phone_parser_api/tsrc/bc/phoneparser/group"/>
-				</component>
-				<component id="platformenv" name="Platform Environment API">
-					<unit bldFile="sf/os/devicesrv/devicesrv_pub/platform_environment_api/tsrc/bc/platformenv/group"/>
-				</component>
-				<component id="powerstate" name="HW Resource Management Power State API">
-					<unit bldFile="sf/os/devicesrv/devicesrv_pub/hwrm_power_state_api/tsrc/bc/powerstate/group"/>
-				</component>
-				<component id="sysutil" name="System Utilities API">
-					<unit bldFile="sf/os/devicesrv/devicesrv_pub/sysutil_api/tsrc/bc/sysutil/group"/>
-				</component>
-				<component id="textresolver" name="Text Resolver API">
-					<unit bldFile="sf/os/devicesrv/devicesrv_pub/text_resolver_api/tsrc/bc/textresolver/group"/>
-				</component>
-				<component id="vibra" name="Vibra API">
-					<unit bldFile="sf/os/devicesrv/devicesrv_pub/vibra_api/tsrc/bc/vibra/group"/>
-				</component>
-				<component id="platformvertest" name="Platform Version Test">
-					<unit bldFile="sf/os/devicesrv/devicesrv_pub/version_info_api/tsrc/bc/platformvertest/group"/>
-				</component>
-				<component id="accmonapibctests" name="Accessory Monitoring API BC Test">
-					<unit bldFile="sf/os/devicesrv/devicesrv_pub/accessory_monitoring_api/tsrc/bc/accmonapibctests/group"/>
-				</component>
-				<component id="networkstatus" name="Network Status API">
-					<unit bldFile="sf/mw/appsupport/appsupport_pub/network_status_api/tsrc/bc/networkstatus/group"/>
-				</component>
-			</collection>
-
 			<collection name="proengwrapsis" long-name="50_SP_PROENG.SIS">
 				<component id="proeng" name="Profile Engine Wrapper">
 					<unit bldFile="sf/mw/appsupport/appsupport_pub/profiles_engine_wrapper_api/tsrc/bc/profilesenginewrapperapi/group"/>
 				</component>
 			</collection>
 		</layer>
-		<layer name="bld_test" long-name="Binary Compatability Test code build" levels="generic specific">
+		<layer name="bld-test" long-name="Binary Compatability Test code build" levels="generic specific">
 			<collection name="basesvs" long-name="SVS Base API Tests">
 				<component id="basesvs" name="SVS Base API Tests" class="test">
 					<unit bldFile="sf/os/kernelhwsrv/baseapitest/basesvs/group"/>

--- a/common/tools/ats/bctest/pim/clock/clock.pl	Wed Oct 07 14:12:03 2009 +0100
+++ b/common/tools/ats/bctest/pim/clock/clock.pl	Wed Oct 07 14:29:43 2009 +0100
@@ -20,7 +20,7 @@
 use File::Path;
 
 unlink "clocktest.zip";
-##rmtree "temp";
+rmtree "temp";
 mkpath "temp/clocktest/general/testframework";
 mkpath "temp/clocktest/general/bcardtest2";
 mkpath "temp/clocktest/winscw_udeb/z/resource/plugins";
@@ -28,9 +28,9 @@
 my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
 copy("clock.xml",	"temp/test.xml");
 
-copy($epoc . "release/winscw/udeb/bctestclock.dll",					"temp/clocktest/winscw_udeb/bctestclock.dll");
-copy($epoc . "winscw/c/testframework/testframework_pimclock.ini",	"temp/clocktest/general/testframework/testframework_pimclock.ini");
-copy($epoc . "winscw/c/testframework/tcbctestclock.cfg",			"temp/clocktest/general/testframework/tcbctestclock.cfg");
-copy($epoc . "winscw/c/testframework/ui_bctestclock.cfg",			"temp/clocktest/general/testframework/ui_bctestclock.cfg");
+copy($epoc . "release/winscw/udeb/bctestclock.dll",					"temp/clocktest/winscw_udeb/bctestclock.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/testframework_pimclock.ini",	"temp/clocktest/general/testframework/testframework_pimclock.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/tcbctestclock.cfg",			"temp/clocktest/general/testframework/tcbctestclock.cfg") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/ui_bctestclock.cfg",			"temp/clocktest/general/testframework/ui_bctestclock.cfg") or die "failed : $!";
 
 system("7z a -tzip clocktest.zip ./temp/*");

--- a/common/tools/ats/bctest/syslibs/syslibstest.xml	Wed Oct 07 14:12:03 2009 +0100
+++ b/common/tools/ats/bctest/syslibs/syslibstest.xml	Wed Oct 07 14:29:43 2009 +0100
@@ -4,13 +4,13 @@
 	<owner>admin</owner>
 	<priority>10</priority>
 	<buildid></buildid>
-	<name>multimediaSVStest</name>
+	<name>OS Services SVS Tests</name>
 	<target>
         <device rank="master" alias="emulator_udeb">
             <property name="HARNESS" value="GENERIC" />
         </device>
 	</target>
-	<plan id="0.54" name="SyslibsSVSTests WINSCW UDEB" harness="GENERIC" enabled="true" passrate="100">
+	<plan id="" name="OS Services SVS Tests WINSCW UDEB" harness="GENERIC" enabled="true" passrate="100">
 		<target>
 			<device rank="master" alias="emulator_udeb"/>
 		</target>

--- a/common/tools/populateziptemplate.pl	Wed Oct 07 14:12:03 2009 +0100
+++ b/common/tools/populateziptemplate.pl	Wed Oct 07 14:29:43 2009 +0100
@@ -72,7 +72,7 @@
 {
 	warn "Warning: Package $package->{dst} does not appear on the local system\n" unless -d $package->{dst};
 	$package->{dst} =~ s{^/}{}g;
-	if ($package->{source} =~ m{/(sfl|oss)/(MCL|FCL)/(sf|utilities)/(([^/]+)/([^/]+))?})
+	if ($package->{source} =~ m{/(sfl|oss)/(MCL|FCL)/(sf|utilities|interim)/(([^/]+)/)?([^/]+)?})
 	{
 		my ($license, $codeline, $thingy, $layer, $packageName) = ($1, $2, $3, $5, $6);
 		# $thingy is the part of the path after the codeline. For
@@ -86,6 +86,19 @@
 			$layer = "tools";
 			$packageName = "utilities";
 		}
+		elsif ($thingy eq "interim")
+		{
+			if ($layer eq "QEMU")
+			{
+				$packageName = $layer;
+				$layer = "os";
+			}
+			else
+			{
+				warn "ERROR: Don't know how to deal with interim package $layer\n";
+				goto MISC_PACKAGE;
+			}
+		}
 		elsif (!defined $packageName)
 		{
 			goto MISC_PACKAGE;