diff -r 1fa00c60da46 -r 4762134f02d0 common/tools/ats/bctest/graphics/graphicssvs.pl
--- a/common/tools/ats/bctest/graphics/graphicssvs.pl	Fri Oct 09 14:18:52 2009 +0100
+++ b/common/tools/ats/bctest/graphics/graphicssvs.pl	Wed Oct 07 12:30:20 2009 +0100
@@ -7,127 +7,40 @@
 unlink "graphicssvs.zip";
 rmtree "temp";
 mkpath "temp/graphicssvs/graphics/general";
+mkpath "temp/graphicssvs/graphics/winscw/general";
 mkpath "temp/graphicssvs/winscw_udeb";
-mkpath "temp/graphicssvs/graphics/bitgdi/general";
-mkpath "temp/graphicssvs/graphics/fntstore/general";
 mkpath "temp/graphicssvs/graphics/t_fbservapi/general";
-mkpath "temp/graphicssvs/graphics/wserv/general";
 
 my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
-copy("graphicssvs.xml",                                                          "temp/test.xml");
+copy("graphicssvs.xml",                                                          			"temp/test.xml");
 
-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/t_fbservapi.exe",                                            "temp/graphicssvs/winscw_udeb/t_fbservapi.exe" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_graphics.ini",                                               "temp/graphicssvs/graphics/general/t_graphics.ini" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/winscw/t_graphics.ini",                                        "temp/graphicssvs/graphics/winscw/general/t_graphics.ini" 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 . "winscw/c/graphics/graphics-fbserv-publicapi.tcs",                                 "temp/graphicssvs/graphics/general/graphics-fbserv-publicapi.tcs" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-publicapi.script",                  		   "temp/graphicssvs/graphics/general/graphics-fbserv-publicapi.script" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-bitmaputil-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-fbserv-bitmaputil-publicapi.script" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbsbitmap-publicapi.script",                   "temp/graphicssvs/graphics/general/graphics-fbserv-fbsbitmap-publicapi.script" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbscolor256bitmaputil-publicapi.script",       "temp/graphicssvs/graphics/general/graphics-fbserv-fbscolor256bitmaputil-publicapi.script" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbsfont-publicapi.script",                     "temp/graphicssvs/graphics/general/graphics-fbserv-fbsfont-publicapi.script" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbssession-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-fbserv-fbssession-publicapi.script" or die "failed : $!";
+copy $epoc . "winscw/c/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-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 . "winscw/c/graphics/graphics-fbserv-bitmaputil-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-fbserv-bitmaputil-publicapi.ini" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbsbitmap-publicapi.ini",                      "temp/graphicssvs/graphics/general/graphics-fbserv-fbsbitmap-publicapi.ini" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbscolor256bitmaputil-publicapi.ini",          "temp/graphicssvs/graphics/general/graphics-fbserv-fbscolor256bitmaputil-publicapi.ini" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbsfont-publicapi.ini",                        "temp/graphicssvs/graphics/general/graphics-fbserv-fbsfont-publicapi.ini" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbssession-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-fbserv-fbssession-publicapi.ini" or die "failed : $!";
+copy $epoc . "winscw/c/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/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 : $!";
+copy $epoc . "winscw/c/graphics/t_fbservapi/empty_file.txt",                                   "temp/graphicssvs/graphics/t_fbservapi/general/empty_file.txt" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_fbservapi/scaniline_10bytes.txt",                            "temp/graphicssvs/graphics/t_fbservapi/general/scaniline_10bytes.txt" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_fbservapi/testfontfb.gdr",                                   "temp/graphicssvs/graphics/t_fbservapi/general/testfontfb.gdr" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_fbservapi/test_bitmap.mbm",                                  "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap.mbm" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_fbservapi/test_bitmap_24bit_400x300.mbm",                    "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_24bit_400x300.mbm" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_fbservapi/test_bitmap_32x8.mbm",                             "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_32x8.mbm" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_fbservapi/test_bitmap_offset8.mbm",                          "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_offset8.mbm" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_fbservapi/test_bitmap_rom.rbm",                              "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_rom.rbm" or die "failed : $!";
 
 system("7z a -tzip graphicssvs.zip ./temp/*");