# HG changeset patch
# User Brendan Donegan brendand@symbian.org
# Date 1253632177 -3600
# Node ID 4e2dcfb8639346db0c57605380a571e1986782ba
# Parent  972c3a0890a14ca5edfde4a14fb4516a73c7e0a9# Parent  8cefe1f652df4cc4e1aeedec0bfd111f44ceb3ee
merge

diff -r 8cefe1f652df -r 4e2dcfb86393 common/tools/ats/bctest/graphics/graphicssvs.pl
--- a/common/tools/ats/bctest/graphics/graphicssvs.pl	Tue Sep 22 15:53:50 2009 +0100
+++ b/common/tools/ats/bctest/graphics/graphicssvs.pl	Tue Sep 22 16:09:37 2009 +0100
@@ -16,117 +16,118 @@
 my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
 copy("graphicssvs.xml",                                                          "temp/test.xml");
 
-copy $epoc . "release/winscw/udeb/twsgraphicshare.exe",                                                     "temp/graphicssvs/winscw_udeb/twsgraphicshare.exe";
-copy $epoc . "release/winscw/udeb/twsgraphicunshare.exe",                                                   "temp/graphicssvs/winscw_udeb/twsgraphicunshare.exe";
-copy $epoc . "release/winscw/udeb/t_animplugin.dll",                                                        "temp/graphicssvs/winscw_udeb/t_animplugin.dll";
-copy $epoc . "release/winscw/udeb/t_fbservapi.exe",                                                         "temp/graphicssvs/winscw_udeb/t_fbservapi.exe";
-copy $epoc . "release/winscw/udeb/t_graphicsbitgdiapi.exe",                                                 "temp/graphicssvs/winscw_udeb/t_graphicsbitgdiapi.exe";
-copy $epoc . "release/winscw/udeb/t_graphicsfntstoreapi.exe",                                               "temp/graphicssvs/winscw_udeb/t_graphicsfntstoreapi.exe";
-copy $epoc . "release/winscw/udeb/t_graphicswservapi.exe",                                                  "temp/graphicssvs/winscw_udeb/t_graphicswservapi.exe";
+copy $epoc . "release/winscw/udeb/twsgraphicshare.exe",                                                     "temp/graphicssvs/winscw_udeb/twsgraphicshare.exe" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/twsgraphicunshare.exe",                                                   "temp/graphicssvs/winscw_udeb/twsgraphicunshare.exe" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/t_animplugin.dll",                                                        "temp/graphicssvs/winscw_udeb/t_animplugin.dll" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/t_fbservapi.exe",                                                         "temp/graphicssvs/winscw_udeb/t_fbservapi.exe" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/t_graphicsbitgdiapi.exe",                                                 "temp/graphicssvs/winscw_udeb/t_graphicsbitgdiapi.exe" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/t_graphicsfntstoreapi.exe",                                               "temp/graphicssvs/winscw_udeb/t_graphicsfntstoreapi.exe" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/t_graphicswservapi.exe",                                                  "temp/graphicssvs/winscw_udeb/t_graphicswservapi.exe" or die "failed : $!";
+
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitgc-publicapi-2.ini",                     "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi-2.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitgc-publicapi-3.ini",                     "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi-3.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitgc-publicapi.ini",                       "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitgc-publicapi.script",                    "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitgcfont-publicapi.ini",                   "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitgcfont-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitgcfont-publicapi.script",                "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitgcfont-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitmapdevice-publicapi.ini",                "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitmapdevice-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitmapdevice-publicapi.script",             "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitmapdevice-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsdevice-publicapi.ini",                      "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsdevice-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsdevice-publicapi.script",                   "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsdevice-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsscreendevice-publicapi.ini",                "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsscreendevice-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsscreendevice-publicapi.script",             "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsscreendevice-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-polygonfiller-publicapi.ini",                  "temp/graphicssvs/graphics/general/graphics-bitgdi-polygonfiller-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-polygonfiller-publicapi.script",               "temp/graphicssvs/graphics/general/graphics-bitgdi-polygonfiller-publicapi.script" or die "failed : $!";
 
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitgc-publicapi-2.ini",                     "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi-2.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitgc-publicapi-3.ini",                     "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi-3.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitgc-publicapi.ini",                       "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitgc-publicapi.script",                    "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitgcfont-publicapi.ini",                   "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitgcfont-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitgcfont-publicapi.script",                "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitgcfont-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitmapdevice-publicapi.ini",                "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitmapdevice-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitmapdevice-publicapi.script",             "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitmapdevice-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsdevice-publicapi.ini",                      "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsdevice-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsdevice-publicapi.script",                   "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsdevice-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsscreendevice-publicapi.ini",                "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsscreendevice-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsscreendevice-publicapi.script",             "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsscreendevice-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-polygonfiller-publicapi.ini",                  "temp/graphicssvs/graphics/general/graphics-bitgdi-polygonfiller-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-polygonfiller-publicapi.script",               "temp/graphicssvs/graphics/general/graphics-bitgdi-polygonfiller-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-bitmaputil-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-fbserv-bitmaputil-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-bitmaputil-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-fbserv-bitmaputil-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbsbitmap-publicapi.ini",                      "temp/graphicssvs/graphics/general/graphics-fbserv-fbsbitmap-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbsbitmap-publicapi.script",                   "temp/graphicssvs/graphics/general/graphics-fbserv-fbsbitmap-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbscolor256bitmaputil-publicapi.ini",          "temp/graphicssvs/graphics/general/graphics-fbserv-fbscolor256bitmaputil-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbscolor256bitmaputil-publicapi.script",       "temp/graphicssvs/graphics/general/graphics-fbserv-fbscolor256bitmaputil-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbsfont-publicapi.ini",                        "temp/graphicssvs/graphics/general/graphics-fbserv-fbsfont-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbsfont-publicapi.script",                     "temp/graphicssvs/graphics/general/graphics-fbserv-fbsfont-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbssession-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-fbserv-fbssession-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbssession-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-fbserv-fbssession-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbstypefacestore-publicapi.ini",               "temp/graphicssvs/graphics/general/graphics-fbserv-fbstypefacestore-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbstypefacestore-publicapi.script",            "temp/graphicssvs/graphics/general/graphics-fbserv-fbstypefacestore-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fntstore-bitmapfont-publicapi.ini",                   "temp/graphicssvs/graphics/general/graphics-fntstore-bitmapfont-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fntstore-bitmapfont-publicapi.script",                "temp/graphicssvs/graphics/general/graphics-fntstore-bitmapfont-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fntstore-fntstore-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-fntstore-fntstore-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fntstore-fntstore-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-fntstore-fntstore-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fntstore-openfontrasterizercontext-publicapi.ini",    "temp/graphicssvs/graphics/general/graphics-fntstore-openfontrasterizercontext-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fntstore-openfontrasterizercontext-publicapi.script", "temp/graphicssvs/graphics/general/graphics-fntstore-openfontrasterizercontext-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-anim-publicapi.ini",                            "temp/graphicssvs/graphics/general/graphics-wserv-anim-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-anim-publicapi.script",                         "temp/graphicssvs/graphics/general/graphics-wserv-anim-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animdll-publicapi.ini",                         "temp/graphicssvs/graphics/general/graphics-wserv-animdll-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animdll-publicapi.script",                      "temp/graphicssvs/graphics/general/graphics-wserv-animdll-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animgeneralfunctions-publicapi.ini",            "temp/graphicssvs/graphics/general/graphics-wserv-animgeneralfunctions-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animgeneralfunctions-publicapi.script",         "temp/graphicssvs/graphics/general/graphics-wserv-animgeneralfunctions-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animgfwe-publicapi.ini",                        "temp/graphicssvs/graphics/general/graphics-wserv-animgfwe-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animgfwe-publicapi.script",                     "temp/graphicssvs/graphics/general/graphics-wserv-animgfwe-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animspritefunctions-publicapi.ini",             "temp/graphicssvs/graphics/general/graphics-wserv-animspritefunctions-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animspritefunctions-publicapi.script",          "temp/graphicssvs/graphics/general/graphics-wserv-animspritefunctions-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animwindowfunctions-publicapi.ini",             "temp/graphicssvs/graphics/general/graphics-wserv-animwindowfunctions-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animwindowfunctions-publicapi.script",          "temp/graphicssvs/graphics/general/graphics-wserv-animwindowfunctions-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-backedupwindow-publicapi.ini",                  "temp/graphicssvs/graphics/general/graphics-wserv-backedupwindow-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-backedupwindow-publicapi.script",               "temp/graphicssvs/graphics/general/graphics-wserv-backedupwindow-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-blankwindow-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-wserv-blankwindow-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-blankwindow-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-wserv-blankwindow-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-directscreenaccess-publicapi.ini",              "temp/graphicssvs/graphics/general/graphics-wserv-directscreenaccess-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-directscreenaccess-publicapi.script",           "temp/graphicssvs/graphics/general/graphics-wserv-directscreenaccess-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-dsasession-publicapi.ini",                      "temp/graphicssvs/graphics/general/graphics-wserv-dsasession-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-dsasession-publicapi.script",                   "temp/graphicssvs/graphics/general/graphics-wserv-dsasession-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-events-publicapi.ini",                          "temp/graphicssvs/graphics/general/graphics-wserv-events-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-events-publicapi.script",                       "temp/graphicssvs/graphics/general/graphics-wserv-events-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-frame-publicapi.ini",                           "temp/graphicssvs/graphics/general/graphics-wserv-frame-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-frame-publicapi.script",                        "temp/graphicssvs/graphics/general/graphics-wserv-frame-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-session-publicapi.ini",                         "temp/graphicssvs/graphics/general/graphics-wserv-session-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-session-publicapi.script",                      "temp/graphicssvs/graphics/general/graphics-wserv-session-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-soundplugin-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-wserv-soundplugin-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-soundplugin-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-wserv-soundplugin-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-window-publicapi.ini",                          "temp/graphicssvs/graphics/general/graphics-wserv-window-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-window-publicapi.script",                       "temp/graphicssvs/graphics/general/graphics-wserv-window-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-windowgc-publicapi.ini",                        "temp/graphicssvs/graphics/general/graphics-wserv-windowgc-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-windowgc-publicapi.script",                     "temp/graphicssvs/graphics/general/graphics-wserv-windowgc-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-windowgroup-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-wserv-windowgroup-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-windowgroup-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-wserv-windowgroup-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsbitmap-publicapi.ini",                        "temp/graphicssvs/graphics/general/graphics-wserv-wsbitmap-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsbitmap-publicapi.script",                     "temp/graphicssvs/graphics/general/graphics-wserv-wsbitmap-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsgraphicbitmap-publicapi.ini",                 "temp/graphicssvs/graphics/general/graphics-wserv-wsgraphicbitmap-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsgraphicbitmap-publicapi.script",              "temp/graphicssvs/graphics/general/graphics-wserv-wsgraphicbitmap-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsgraphicbitmapanimation-publicapi.ini",        "temp/graphicssvs/graphics/general/graphics-wserv-wsgraphicbitmapanimation-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsgraphicbitmapanimation-publicapi.script",     "temp/graphicssvs/graphics/general/graphics-wserv-wsgraphicbitmapanimation-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsgraphicmsgbuf-publicapi.ini",                 "temp/graphicssvs/graphics/general/graphics-wserv-wsgraphicmsgbuf-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsgraphicmsgbuf-publicapi.script",              "temp/graphicssvs/graphics/general/graphics-wserv-wsgraphicmsgbuf-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wspointercursor-publicapi.ini",                 "temp/graphicssvs/graphics/general/graphics-wserv-wspointercursor-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wspointercursor-publicapi.script",              "temp/graphicssvs/graphics/general/graphics-wserv-wspointercursor-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsscreendevice-publicapi.ini",                  "temp/graphicssvs/graphics/general/graphics-wserv-wsscreendevice-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsscreendevice-publicapi.script",               "temp/graphicssvs/graphics/general/graphics-wserv-wsscreendevice-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wssprite-publicapi.ini",                        "temp/graphicssvs/graphics/general/graphics-wserv-wssprite-publicapi.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wssprite-publicapi.script",                     "temp/graphicssvs/graphics/general/graphics-wserv-wssprite-publicapi.script";
-copy $epoc . "release/winscw/udeb/z/graphics/t_graphics.ini",                                               "temp/graphicssvs/graphics/general/t_graphics.ini";
-copy $epoc . "release/winscw/udeb/z/graphics/t_graphics.tcs",                                               "temp/graphicssvs/graphics/general/t_graphics.tcs";
-copy $epoc . "release/winscw/udeb/z/graphics/t_graphics_panic.tcs",                                         "temp/graphicssvs/graphics/general/t_graphics_panic.tcs";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-bitmaputil-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-fbserv-bitmaputil-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-bitmaputil-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-fbserv-bitmaputil-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbsbitmap-publicapi.ini",                      "temp/graphicssvs/graphics/general/graphics-fbserv-fbsbitmap-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbsbitmap-publicapi.script",                   "temp/graphicssvs/graphics/general/graphics-fbserv-fbsbitmap-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbscolor256bitmaputil-publicapi.ini",          "temp/graphicssvs/graphics/general/graphics-fbserv-fbscolor256bitmaputil-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbscolor256bitmaputil-publicapi.script",       "temp/graphicssvs/graphics/general/graphics-fbserv-fbscolor256bitmaputil-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbsfont-publicapi.ini",                        "temp/graphicssvs/graphics/general/graphics-fbserv-fbsfont-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbsfont-publicapi.script",                     "temp/graphicssvs/graphics/general/graphics-fbserv-fbsfont-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbssession-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-fbserv-fbssession-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbssession-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-fbserv-fbssession-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbstypefacestore-publicapi.ini",               "temp/graphicssvs/graphics/general/graphics-fbserv-fbstypefacestore-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbstypefacestore-publicapi.script",            "temp/graphicssvs/graphics/general/graphics-fbserv-fbstypefacestore-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-fntstore-bitmapfont-publicapi.ini",                   "temp/graphicssvs/graphics/general/graphics-fntstore-bitmapfont-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-fntstore-bitmapfont-publicapi.script",                "temp/graphicssvs/graphics/general/graphics-fntstore-bitmapfont-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-fntstore-fntstore-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-fntstore-fntstore-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-fntstore-fntstore-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-fntstore-fntstore-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-fntstore-openfontrasterizercontext-publicapi.ini",    "temp/graphicssvs/graphics/general/graphics-fntstore-openfontrasterizercontext-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-fntstore-openfontrasterizercontext-publicapi.script", "temp/graphicssvs/graphics/general/graphics-fntstore-openfontrasterizercontext-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-anim-publicapi.ini",                            "temp/graphicssvs/graphics/general/graphics-wserv-anim-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-anim-publicapi.script",                         "temp/graphicssvs/graphics/general/graphics-wserv-anim-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animdll-publicapi.ini",                         "temp/graphicssvs/graphics/general/graphics-wserv-animdll-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animdll-publicapi.script",                      "temp/graphicssvs/graphics/general/graphics-wserv-animdll-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animgeneralfunctions-publicapi.ini",            "temp/graphicssvs/graphics/general/graphics-wserv-animgeneralfunctions-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animgeneralfunctions-publicapi.script",         "temp/graphicssvs/graphics/general/graphics-wserv-animgeneralfunctions-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animgfwe-publicapi.ini",                        "temp/graphicssvs/graphics/general/graphics-wserv-animgfwe-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animgfwe-publicapi.script",                     "temp/graphicssvs/graphics/general/graphics-wserv-animgfwe-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animspritefunctions-publicapi.ini",             "temp/graphicssvs/graphics/general/graphics-wserv-animspritefunctions-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animspritefunctions-publicapi.script",          "temp/graphicssvs/graphics/general/graphics-wserv-animspritefunctions-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animwindowfunctions-publicapi.ini",             "temp/graphicssvs/graphics/general/graphics-wserv-animwindowfunctions-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animwindowfunctions-publicapi.script",          "temp/graphicssvs/graphics/general/graphics-wserv-animwindowfunctions-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-backedupwindow-publicapi.ini",                  "temp/graphicssvs/graphics/general/graphics-wserv-backedupwindow-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-backedupwindow-publicapi.script",               "temp/graphicssvs/graphics/general/graphics-wserv-backedupwindow-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-blankwindow-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-wserv-blankwindow-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-blankwindow-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-wserv-blankwindow-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-directscreenaccess-publicapi.ini",              "temp/graphicssvs/graphics/general/graphics-wserv-directscreenaccess-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-directscreenaccess-publicapi.script",           "temp/graphicssvs/graphics/general/graphics-wserv-directscreenaccess-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-dsasession-publicapi.ini",                      "temp/graphicssvs/graphics/general/graphics-wserv-dsasession-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-dsasession-publicapi.script",                   "temp/graphicssvs/graphics/general/graphics-wserv-dsasession-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-events-publicapi.ini",                          "temp/graphicssvs/graphics/general/graphics-wserv-events-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-events-publicapi.script",                       "temp/graphicssvs/graphics/general/graphics-wserv-events-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-frame-publicapi.ini",                           "temp/graphicssvs/graphics/general/graphics-wserv-frame-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-frame-publicapi.script",                        "temp/graphicssvs/graphics/general/graphics-wserv-frame-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-session-publicapi.ini",                         "temp/graphicssvs/graphics/general/graphics-wserv-session-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-session-publicapi.script",                      "temp/graphicssvs/graphics/general/graphics-wserv-session-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-soundplugin-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-wserv-soundplugin-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-soundplugin-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-wserv-soundplugin-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-window-publicapi.ini",                          "temp/graphicssvs/graphics/general/graphics-wserv-window-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-window-publicapi.script",                       "temp/graphicssvs/graphics/general/graphics-wserv-window-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-windowgc-publicapi.ini",                        "temp/graphicssvs/graphics/general/graphics-wserv-windowgc-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-windowgc-publicapi.script",                     "temp/graphicssvs/graphics/general/graphics-wserv-windowgc-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-windowgroup-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-wserv-windowgroup-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-windowgroup-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-wserv-windowgroup-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsbitmap-publicapi.ini",                        "temp/graphicssvs/graphics/general/graphics-wserv-wsbitmap-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsbitmap-publicapi.script",                     "temp/graphicssvs/graphics/general/graphics-wserv-wsbitmap-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsgraphicbitmap-publicapi.ini",                 "temp/graphicssvs/graphics/general/graphics-wserv-wsgraphicbitmap-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsgraphicbitmap-publicapi.script",              "temp/graphicssvs/graphics/general/graphics-wserv-wsgraphicbitmap-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsgraphicbitmapanimation-publicapi.ini",        "temp/graphicssvs/graphics/general/graphics-wserv-wsgraphicbitmapanimation-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsgraphicbitmapanimation-publicapi.script",     "temp/graphicssvs/graphics/general/graphics-wserv-wsgraphicbitmapanimation-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsgraphicmsgbuf-publicapi.ini",                 "temp/graphicssvs/graphics/general/graphics-wserv-wsgraphicmsgbuf-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsgraphicmsgbuf-publicapi.script",              "temp/graphicssvs/graphics/general/graphics-wserv-wsgraphicmsgbuf-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wspointercursor-publicapi.ini",                 "temp/graphicssvs/graphics/general/graphics-wserv-wspointercursor-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wspointercursor-publicapi.script",              "temp/graphicssvs/graphics/general/graphics-wserv-wspointercursor-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsscreendevice-publicapi.ini",                  "temp/graphicssvs/graphics/general/graphics-wserv-wsscreendevice-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsscreendevice-publicapi.script",               "temp/graphicssvs/graphics/general/graphics-wserv-wsscreendevice-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wssprite-publicapi.ini",                        "temp/graphicssvs/graphics/general/graphics-wserv-wssprite-publicapi.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wssprite-publicapi.script",                     "temp/graphicssvs/graphics/general/graphics-wserv-wssprite-publicapi.script" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/t_graphics.ini",                                               "temp/graphicssvs/graphics/general/t_graphics.ini" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/t_graphics.tcs",                                               "temp/graphicssvs/graphics/general/t_graphics.tcs" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/t_graphics_panic.tcs",                                         "temp/graphicssvs/graphics/general/t_graphics_panic.tcs" or die "failed : $!";
 
-copy $epoc . "release/winscw/udeb/z/graphics/bitgdi/test_rwssprite_bitmap.mbm",                             "temp/graphicssvs/graphics/bitgdi/general/test_rwssprite_bitmap.mbm";
-copy $epoc . "release/winscw/udeb/z/graphics/bitgdi/testfontws.gdr",                                        "temp/graphicssvs/graphics/bitgdi/general/testfontws.gdr";
-copy $epoc . "release/winscw/udeb/z/graphics/fntstore/bad_entrysel",                                        "temp/graphicssvs/graphics/fntstore/general/bad_entrysel";
-copy $epoc . "release/winscw/udeb/z/graphics/fntstore/dummy",                                               "temp/graphicssvs/graphics/fntstore/general/dummy";
-copy $epoc . "release/winscw/udeb/z/graphics/fntstore/dummy",                                               "temp/graphicssvs/graphics/fntstore/general/dummy_2";
-copy $epoc . "release/winscw/udeb/z/graphics/fntstore/testfontws.gdr",                                      "temp/graphicssvs/graphics/fntstore/general/testfontws.gdr";
-copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/empty_file.txt",                                   "temp/graphicssvs/graphics/t_fbservapi/general/empty_file.txt";
-copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/scaniline_10bytes.txt",                            "temp/graphicssvs/graphics/t_fbservapi/general/scaniline_10bytes.txt";
-copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/testfontfb.gdr",                                   "temp/graphicssvs/graphics/t_fbservapi/general/testfontfb.gdr";
-copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/test_bitmap.mbm",                                  "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap.mbm";
-copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/test_bitmap_24bit_400x300.mbm",                    "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_24bit_400x300.mbm";
-copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/test_bitmap_32x8.mbm",                             "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_32x8.mbm";
-copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/test_bitmap_offset8.mbm",                          "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_offset8.mbm";
-copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/test_bitmap_rom.rbm",                              "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_rom.rbm";
-copy $epoc . "release/winscw/udeb/z/graphics/wserv/testfontws.gdr",                                         "temp/graphicssvs/graphics/wserv/general/testfontws.gdr";
-copy $epoc . "release/winscw/udeb/z/graphics/wserv/test_alpha.mbm",                                         "temp/graphicssvs/graphics/wserv/general/test_alpha.mbm";
-copy $epoc . "release/winscw/udeb/z/graphics/wserv/test_board.mbm",                                         "temp/graphicssvs/graphics/wserv/general/test_board.mbm";
-copy $epoc . "release/winscw/udeb/z/graphics/wserv/test_mask.mbm",                                          "temp/graphicssvs/graphics/wserv/general/test_mask.mbm";
-copy $epoc . "release/winscw/udeb/z/graphics/wserv/test_rwssprite_bitmap.mbm",                              "temp/graphicssvs/graphics/wserv/general/test_rwssprite_bitmap.mbm";
-copy $epoc . "release/winscw/udeb/z/graphics/wserv/wsgraphicbitmapanimation.mbm",                           "temp/graphicssvs/graphics/wserv/general/wsgraphicbitmapanimation.mbm";
+copy $epoc . "release/winscw/udeb/z/graphics/bitgdi/test_rwssprite_bitmap.mbm",                             "temp/graphicssvs/graphics/bitgdi/general/test_rwssprite_bitmap.mbm" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/bitgdi/testfontws.gdr",                                        "temp/graphicssvs/graphics/bitgdi/general/testfontws.gdr" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/fntstore/bad_entrysel",                                        "temp/graphicssvs/graphics/fntstore/general/bad_entrysel" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/fntstore/dummy",                                               "temp/graphicssvs/graphics/fntstore/general/dummy" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/fntstore/dummy",                                               "temp/graphicssvs/graphics/fntstore/general/dummy_2" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/fntstore/testfontws.gdr",                                      "temp/graphicssvs/graphics/fntstore/general/testfontws.gdr" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/empty_file.txt",                                   "temp/graphicssvs/graphics/t_fbservapi/general/empty_file.txt" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/scaniline_10bytes.txt",                            "temp/graphicssvs/graphics/t_fbservapi/general/scaniline_10bytes.txt" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/testfontfb.gdr",                                   "temp/graphicssvs/graphics/t_fbservapi/general/testfontfb.gdr" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/test_bitmap.mbm",                                  "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap.mbm" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/test_bitmap_24bit_400x300.mbm",                    "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_24bit_400x300.mbm" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/test_bitmap_32x8.mbm",                             "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_32x8.mbm" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/test_bitmap_offset8.mbm",                          "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_offset8.mbm" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/test_bitmap_rom.rbm",                              "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_rom.rbm" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/wserv/testfontws.gdr",                                         "temp/graphicssvs/graphics/wserv/general/testfontws.gdr" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/wserv/test_alpha.mbm",                                         "temp/graphicssvs/graphics/wserv/general/test_alpha.mbm" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/wserv/test_board.mbm",                                         "temp/graphicssvs/graphics/wserv/general/test_board.mbm" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/wserv/test_mask.mbm",                                          "temp/graphicssvs/graphics/wserv/general/test_mask.mbm" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/wserv/test_rwssprite_bitmap.mbm",                              "temp/graphicssvs/graphics/wserv/general/test_rwssprite_bitmap.mbm" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/z/graphics/wserv/wsgraphicbitmapanimation.mbm",                           "temp/graphicssvs/graphics/wserv/general/wsgraphicbitmapanimation.mbm" or die "failed : $!";
 
 system("7z a -tzip graphicssvs.zip ./temp/*");
diff -r 8cefe1f652df -r 4e2dcfb86393 common/tools/ats/bctest/graphics/graphicssvs.xml
--- a/common/tools/ats/bctest/graphics/graphicssvs.xml	Tue Sep 22 15:53:50 2009 +0100
+++ b/common/tools/ats/bctest/graphics/graphicssvs.xml	Tue Sep 22 16:09:37 2009 +0100
@@ -1542,16 +1542,45 @@
         </session>
 	</plan>
 	<files>
-        <file>graphicssvs/winscw_udeb/t_graphicswservapi.exe</file>
-        <file>graphicssvs/winscw_udeb/t_animplugin.dll</file>
+		<file>graphicssvs/winscw_udeb/twsgraphicshare.exe</file>
         <file>graphicssvs/winscw_udeb/twsgraphicunshare.exe</file>
-        <file>graphicssvs/graphics/wserv/general/test_rwssprite_bitmap.mbm</file>
-        <file>graphicssvs/graphics/wserv/general/test_alpha.mbm</file>
-        <file>graphicssvs/graphics/wserv/general/test_board.mbm</file>
-        <file>graphicssvs/graphics/wserv/general/test_mask.mbm</file>
-        <file>graphicssvs/graphics/wserv/general/wsgraphicbitmapanimation.mbm</file>
-        <file>graphicssvs/graphics/wserv/general/testfontws.gdr</file>
-        <file>graphicssvs/graphics/general/t_graphics.ini</file>
+        <file>graphicssvs/winscw_udeb/t_animplugin.dll</file>
+        <file>graphicssvs/winscw_udeb/t_fbservapi.exe</file>
+        <file>graphicssvs/winscw_udeb/t_graphicsbitgdiapi.exe</file>
+        <file>graphicssvs/winscw_udeb/t_graphicsfntstoreapi.exe</file>
+		<file>graphicssvs/winscw_udeb/t_graphicswservapi.exe</file>
+        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi.script</file>
+        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi.ini</file>
+        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi-2.ini</file>
+        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi-3.ini</file>
+        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitgcfont-publicapi.script</file>
+        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitgcfont-publicapi.ini</file>
+        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitmapdevice-publicapi.script</file>
+        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitmapdevice-publicapi.ini</file>
+        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsdevice-publicapi.script</file>
+        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsdevice-publicapi.ini</file>
+        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsscreendevice-publicapi.script</file>
+        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsscreendevice-publicapi.ini</file>
+        <file>graphicssvs/graphics/general/graphics-bitgdi-polygonfiller-publicapi.script</file>
+        <file>graphicssvs/graphics/general/graphics-bitgdi-polygonfiller-publicapi.ini</file>
+        <file>graphicssvs/graphics/general/graphics-fbserv-bitmaputil-publicapi.script</file>
+        <file>graphicssvs/graphics/general/graphics-fbserv-bitmaputil-publicapi.ini</file>
+        <file>graphicssvs/graphics/general/graphics-fbserv-fbsbitmap-publicapi.script</file>
+        <file>graphicssvs/graphics/general/graphics-fbserv-fbsbitmap-publicapi.ini</file>
+        <file>graphicssvs/graphics/general/graphics-fbserv-fbscolor256bitmaputil-publicapi.script</file>
+        <file>graphicssvs/graphics/general/graphics-fbserv-fbscolor256bitmaputil-publicapi.ini</file>
+        <file>graphicssvs/graphics/general/graphics-fbserv-fbsfont-publicapi.script</file>
+        <file>graphicssvs/graphics/general/graphics-fbserv-fbsfont-publicapi.ini</file>
+        <file>graphicssvs/graphics/general/graphics-fbserv-fbssession-publicapi.script</file>
+        <file>graphicssvs/graphics/general/graphics-fbserv-fbssession-publicapi.ini</file>
+        <file>graphicssvs/graphics/general/graphics-fbserv-fbstypefacestore-publicapi.script</file>
+        <file>graphicssvs/graphics/general/graphics-fbserv-fbstypefacestore-publicapi.ini</file>
+        <file>graphicssvs/graphics/general/graphics-fntstore-bitmapfont-publicapi.script</file>
+        <file>graphicssvs/graphics/general/graphics-fntstore-bitmapfont-publicapi.ini</file>
+        <file>graphicssvs/graphics/general/graphics-fntstore-fntstore-publicapi.script</file>
+        <file>graphicssvs/graphics/general/graphics-fntstore-fntstore-publicapi.ini</file>
+        <file>graphicssvs/graphics/general/graphics-fntstore-openfontrasterizercontext-publicapi.script</file>
+        <file>graphicssvs/graphics/general/graphics-fntstore-openfontrasterizercontext-publicapi.ini</file>
         <file>graphicssvs/graphics/general/graphics-wserv-anim-publicapi.script</file>
         <file>graphicssvs/graphics/general/graphics-wserv-anim-publicapi.ini</file>
         <file>graphicssvs/graphics/general/graphics-wserv-animdll-publicapi.script</file>
@@ -1600,25 +1629,16 @@
         <file>graphicssvs/graphics/general/graphics-wserv-wsscreendevice-publicapi.ini</file>        
         <file>graphicssvs/graphics/general/graphics-wserv-wssprite-publicapi.script</file>
         <file>graphicssvs/graphics/general/graphics-wserv-wssprite-publicapi.ini</file>
-        <file>graphicssvs/winscw_udeb/t_graphicsbitgdiapi.exe</file>
+        <file>graphicssvs/graphics/general/t_graphics.ini</file>
+        <file>graphicssvs/graphics/general/t_graphics.tcs</file>
+        <file>graphicssvs/graphics/general/t_graphics_panic.tcs</file>
         <file>graphicssvs/graphics/bitgdi/general/test_rwssprite_bitmap.mbm</file>
         <file>graphicssvs/graphics/bitgdi/general/testfontws.gdr</file>
+        <file>graphicssvs/graphics/fntstore/general/bad_entrysel</file>
+        <file>graphicssvs/graphics/fntstore/general/dummy</file>
+        <file>graphicssvs/graphics/fntstore/general/dummy_2</file>
+        <file>graphicssvs/graphics/fntstore/general/testfontws.gdr</file>
         <file>graphicssvs/graphics/t_fbservapi/general/test_bitmap_rom.rbm</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi-2.ini</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi-3.ini</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitgcfont-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitgcfont-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitmapdevice-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitmapdevice-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsdevice-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsdevice-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsscreendevice-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsscreendevice-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-polygonfiller-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-polygonfiller-publicapi.ini</file>
-        <file>graphicssvs/winscw_udeb/t_fbservapi.exe</file>
         <file>graphicssvs/graphics/t_fbservapi/general/empty_file.txt</file>
         <file>graphicssvs/graphics/t_fbservapi/general/scaniline_10bytes.txt</file>
         <file>graphicssvs/graphics/t_fbservapi/general/testfontfb.gdr</file>
@@ -1626,28 +1646,11 @@
         <file>graphicssvs/graphics/t_fbservapi/general/test_bitmap_24bit_400x300.mbm</file>
         <file>graphicssvs/graphics/t_fbservapi/general/test_bitmap_32x8.mbm</file>
         <file>graphicssvs/graphics/t_fbservapi/general/test_bitmap_offset8.mbm</file>
-        <file>graphicssvs/graphics/general/graphics-fbserv-bitmaputil-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-fbserv-bitmaputil-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-fbserv-fbsbitmap-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-fbserv-fbsbitmap-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-fbserv-fbscolor256bitmaputil-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-fbserv-fbscolor256bitmaputil-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-fbserv-fbsfont-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-fbserv-fbsfont-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-fbserv-fbssession-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-fbserv-fbssession-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-fbserv-fbstypefacestore-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-fbserv-fbstypefacestore-publicapi.ini</file>
-        <file>graphicssvs/winscw_udeb/t_graphicsfntstoreapi.exe</file>
-        <file>graphicssvs/graphics/fntstore/general/bad_entrysel</file>
-        <file>graphicssvs/graphics/fntstore/general/dummy</file>
-        <file>graphicssvs/graphics/fntstore/general/dummy_2</file>
-        <file>graphicssvs/graphics/fntstore/general/testfontws.gdr</file>
-        <file>graphicssvs/graphics/general/graphics-fntstore-bitmapfont-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-fntstore-bitmapfont-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-fntstore-fntstore-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-fntstore-fntstore-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-fntstore-openfontrasterizercontext-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-fntstore-openfontrasterizercontext-publicapi.ini</file>
+        <file>graphicssvs/graphics/wserv/general/test_rwssprite_bitmap.mbm</file>
+        <file>graphicssvs/graphics/wserv/general/test_alpha.mbm</file>
+        <file>graphicssvs/graphics/wserv/general/test_board.mbm</file>
+        <file>graphicssvs/graphics/wserv/general/test_mask.mbm</file>
+        <file>graphicssvs/graphics/wserv/general/wsgraphicbitmapanimation.mbm</file>
+        <file>graphicssvs/graphics/wserv/general/testfontws.gdr</file>
     </files>
 </test>
diff -r 8cefe1f652df -r 4e2dcfb86393 common/tools/ats/bctest/multimedia/multimediasvs.pl
--- a/common/tools/ats/bctest/multimedia/multimediasvs.pl	Tue Sep 22 15:53:50 2009 +0100
+++ b/common/tools/ats/bctest/multimedia/multimediasvs.pl	Tue Sep 22 16:09:37 2009 +0100
@@ -30,6 +30,7 @@
 mkpath "temp/multimediatest/general/multimedia/t_audiotoneutility";
 mkpath "temp/multimediatest/general/multimedia/t_midiclientutility";
 mkpath "temp/multimediatest/general/multimedia/t_videoplayerutility";
+mkpath "temp/multimediatest/general/multimedia/t_mdaaudiorecorderutility";
 mkpath "temp/multimediatest/winscw_udeb/z/resource/plugins";
 
 my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
diff -r 8cefe1f652df -r 4e2dcfb86393 common/tools/ats/bctest/package_definition.xml
--- a/common/tools/ats/bctest/package_definition.xml	Tue Sep 22 15:53:50 2009 +0100
+++ b/common/tools/ats/bctest/package_definition.xml	Tue Sep 22 16:09:37 2009 +0100
@@ -3,68 +3,79 @@
  <systemModel>
   <layer name="bc" long-name="Binary Compatability" levels="generic specific">
    <block long-name="Dynamic BC Tests" level="specific" name="dynamicbctest" levels="fts">
-    <collection name="dynamicbc" long-name="Dynamic BC Test Harnesses">
+    <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"/>
       </component>
+	</collection>
+	<collection name="hostconnsis" long-name="50_asp_hostconn.sis">
       <component id="hostconn" name="Hostlet Connection Test">
         <unit bldFile="sf/mw/websrv/websrv_pub/hostlet_connection_api/tsrc/bc/hostconn/group"/>
       </component>
+	</collection>
+	<collection name="newsoapclassessis" long-name="50_asp_newsoapclasses.sis">
       <component id="newsoapclasses" name="New SOAP Classes Test">
         <unit bldFile="sf/mw/websrv/websrv_pub/web_service_messaging_api/tsrc/bc/newsoapclasses/group"/>
       </component>
-      <component id="favouritesbctest" name="Browser Favourites BC Test">
-        <unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/browser/apps/FavouritesBCTest/group"/>
-      </component>
-      <component id="downloadmgrbctest" name="Download Manager BC Test">
-        <unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/browser/apps/DownloadMgrBCTest/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>
-      <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>
-      <component id="pluginbio" name="Messaging Plugin BIO BC Test">
-        <unit bldFile="sf/app/messaging/msg_pub/plugin_bio_control_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>
-      <component id="pbkdataaddedit" name="Phonebook Data Add Edit BC Test">
-        <unit bldFile="sf/app/contacts/contacts_pub/phonebook_data_addedit_ui_api/tsrc/bc/group"/>
-      </component>
-      <component id="pbkdatamgmt" name="Phonebook Data Management BC Test">
-        <unit bldFile="sf/app/contacts/contacts_pub/phonebook_data_management_api/tsrc/bc/group"/>
-      </component>
-      <component id="pbkfetchui" name="Phonebook Fetch UI BC Test">
-        <unit bldFile="sf/app/contacts/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/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>
+	
+    <component id="favouritesbctest" name="Browser Favourites BC Test">
+      <unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/browser/apps/FavouritesBCTest/group"/>
+    </component>
+    <component id="downloadmgrbctest" name="Download Manager BC Test">
+      <unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/browser/apps/DownloadMgrBCTest/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>
+    <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>
+    <component id="pluginbio" name="Messaging Plugin BIO BC Test">
+      <unit bldFile="sf/app/messaging/msg_pub/plugin_bio_control_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>
+    <component id="pbkdataaddedit" name="Phonebook Data Add Edit BC Test">
+      <unit bldFile="sf/app/contacts/contacts_pub/phonebook_data_addedit_ui_api/tsrc/bc/group"/>
+    </component>
+    <component id="pbkdatamgmt" name="Phonebook Data Management BC Test">
+      <unit bldFile="sf/app/contacts/contacts_pub/phonebook_data_management_api/tsrc/bc/group"/>
+    </component>
+    <component id="pbkfetchui" name="Phonebook Fetch UI BC Test">
+      <unit bldFile="sf/app/contacts/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/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>
+	
+    <component id="basesvs" name="SVS Base API Tests" class="test">
+      <unit bldFile="sf/os/kernelhwsrv/baseapitest/basesvs/group"/>
+    </component>
+    <component id="graphicssvs" name="SVS Graphics API Tests" class="test">
+      <unit bldFile="sf/os/graphics/graphicsapitest/graphicssvs/group"/>
+    </component>
 	  
-      <component id="basesvs" name="SVS Base API Tests" class="test">
-        <unit bldFile="sf/os/kernelhwsrv/baseapitest/basesvs/group"/>
-      </component>
+	<collection name="graphicssvs" long-name="SVS Graphics API Tests">
+	</collection>
 	  
-    </collection>
-   </block>
+    </block>
   </layer>
  </systemModel>
 </SystemDefinition>
\ No newline at end of file