--- a/NewGraphicsArchitecture/os/graphics/package_definition.xml	Fri Jan 08 15:50:34 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="graphics" long-name="Graphics" tech_domain="ui" level="services" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-    <collection name="graphicsaccelaration" long-name="Graphics Accelaration" level="adaptation">
-     <component name="vgi" long-name="VGI" origin-model="foundation">
-      <unit bldFile="/sf/os/graphics/graphicsaccelaration/vgi/group"/>
-     </component>
-     <component name="2d_openvg_1_0" long-name="2D Open VG 1.0" origin-model="foundation"/>
-     <component name="3d_opengl_es_1_1" long-name="3d OpenGL ES 1.1" origin-model="foundation"/>
-    </collection>
-    <collection name="m3g" long-name="M3G" level="internal-adaptations">
-     <component name="m3gcore11" long-name="M3G Core 11" origin-model="foundation">
-      <unit bldFile="/sf/os/graphics/m3g/m3gcore11/group"/>
-     </component>
-    </collection>
-    <collection name="graphicstest" long-name="Graphics Test" level="app-if">
-     <component name="graphicstestharness" long-name="Graphics Test Harness" introduced="8.1" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/graphics/graphicstest/graphicstestharness/group/graphics_testharness.mrp"/>
-     </component>
-     <component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/graphicstest/uibench/group" mrp="/sf/os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-     </component>
-    </collection>
-    <collection name="graphics_info" long-name="Graphics Info" level="app-if">
-     <component unofficial="yes" name="graphicssvs" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/graphics/graphicsapitest/graphicssvs/wserv/animplugin/group"/> -->
-      <!-- <unit bldFile="/sf/os/graphics/graphicsapitest/graphicssvs/wserv/twsgraphicshare"/> -->
-	  <unit mrp="/sf/os/graphics/graphicsapitest/graphicssvs/group/graphicssvs.mrp"/>
-     </component>
-     <component unofficial="yes" name="graphics_pub" long-name="Graphics Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/graphics/graphics_pub/group"/> -->
-     </component>
-     <component unofficial="yes" name="graphics_build" long-name="Graphics Build" origin-model="foundation">
-     <!-- <unit bldFile="/sf/os/graphics/group"/> -->
-     </component>
-     <component unofficial="yes" name="graphics_plat" long-name="Graphics Platform Interfaces" class="api" origin-model="foundation">
-       <!-- <unit bldFile="/sf/os/graphics/graphics_plat/group"/> -->
-     </component>
-    <component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-     </component>
-     <component name="graphics_metadata" long-name="Graphics Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-     </component>
-    </collection>
-   <collection name="windowing" long-name="Windowing" level="app-if">
-     <component name="windowserver" long-name="Window Server" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/windowing/windowserver/group" mrp="/sf/os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-     </component>
-     <component name="windowserverplugins" long-name="Window Server Plugins" purpose="mandatory" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/windowing/windowserverplugins/group" /> <!--Added for NGA - Plugins for the windowserver -->
-     </component>
-    </collection>
-    <collection name="printingservices" long-name="Printing Services" level="app-if">
-     <component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/printingservices/printerdriversupport/group" mrp="/sf/os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-     </component>
-     <component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/printingservices/printerdrivers/group" mrp="/sf/os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-     </component>
-    </collection>
-    <collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-     <component name="fontandbitmapserver" long-name="Font and Bitmap Server" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/fbs/fontandbitmapserver/group" mrp="/sf/os/graphics/fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
-     </component>
-    </collection>
-    <collection name="opengles" long-name="OpenGLES" level="internal-adaptations">
-     <component name="openglesinterface" long-name="OpenGL ES Interface" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/opengles/openglesinterface/group" mrp="/sf/os/graphics/opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
-     </component>
-     <component name="n:openglesimplementation" long-name="OpenGL ES Implementation" filter="gt" introduced="8.0" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/graphics/opengles/openglesimplementation/group/" mrp="os/graphics/opengles/openglesimplementation/group/graphics_opengles.mrp"/> -->
-     </component>
-     <component name="n:openglesdisplayproperties" long-name="OpenGL ES Display Properties" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/graphics/opengles/openglesdisplayproperties/group" mrp="os/graphics/opengles/openglesdisplayproperties/group/graphics_openglesdisplayproperty.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-     <component name="openvginterface" long-name="OpenVG Interface" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/openvg/openvginterface/group" mrp="/sf/os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
-     </component>
-	 <component name="openvg11" long-name="OpenVG11" level="internal-adaptations">
-      <unit bldFile="/sf/os/graphics/openvg/openvginterface/group/openvg11"/>
-     </component>
-    </collection>
-    <collection name="egl" long-name="EGL" level="internal-adaptations">
-     <component name="eglinterface" long-name="EGL Interface" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/egl/eglinterface/group" mrp="/sf/os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
-     </component>
-     <component name="n:eglimplementation" long-name="EGL Implementation" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
-       <unit bldFile="/sf/os/graphics/egl/eglrefimpl/group/" />  <!-- for NGA graphics drop -->
-     </component>
-     <component name="n:eglswitch" long-name="EGL Emulator Switch">
-       <unit bldFile="/sf/os/graphics/egl/eglswitch/group/" />  <!-- for NGA graphics drop -->
-     </component>
-    </collection> 
-     <collection name="openWF" long-name="OpenWF" > <!-- for NGA graphics drop -->
-        <component name="openwfcinterface" long-name="openwfcinterface">
-            <unit bldFile="/sf/os/graphics/graphicscomposition/openwfcinterface/group" /> <!-- OpenWF header files -->
-        </component>
-        <component name="openwfcompositionengine" long-name="openwfcompositionengine">
-            <unit bldFile="/sf/os/graphics/graphicscomposition/openwfcompositionengine/group" /> <!-- OpenWF composition engine implementation -->
-        </component>
-        <component name="openwfsupport" long-name="openwfsupport">
-            <unit bldFile="/sf/os/graphics/graphicscomposition/openwfsupport/group" /> <!-- OpenWF Adaptation features specific to the Symbian architecture -->
-        </component>
-        <component name="surfaceupdate" long-name="surfaceupdate">
-            <unit bldFile="/sf/os/graphics/graphicscomposition/surfaceupdate/group" /> <!-- Surface content changes server -->
-        </component>
-    </collection>
-    <collection name="graphicsutils">
-        <component name="commongraphicsheaders" long-name="common graphics headers">
-            <unit bldFile="/sf/os/graphics/graphicsutils/commongraphicsheaders/group" /> <!-- Common headers needed to build and run the tests -->
-	</component>
-    </collection>
-    <collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-     <component name="gdi" long-name="GDI" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/gdi/group" mrp="/sf/os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-     </component>
-     <component name="bitgdi" long-name="BitGDI" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="/sf/os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-     </component>
-     <component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="/sf/os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-     </component>
-     <component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/screendriver/group" mrp="/sf/os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-     </component>
-    </collection>
-    <collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-	 <!-- Following component removed to avoid bmconv.exe collision with S60 version, collaterals: fontcomp.exe not built by OS anymore -->
-<!--     <component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-     </component>
--->
-    </collection>
-    <collection name="graphcisapitest" long-name="Graphics API Tests" level="app-if">
-     <component name="screendriverhaitest" long-name="Screen Driver HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DS.1645"
-      <unit mrp="graphicsapitest/screendriverhaitest/group/screendriverhai.mrp"/>
-	-->
-     </component>
-    </collection>
-    
-<!-- added from PDK 3.0.c model -->
-    
-    
-    <component name="directgdi" long-name="DirectGDI" introduced="tb92" purpose="optional">
-        <unit bldFile="/sf/os\graphics\graphicsdeviceinterface\directgdi\group" mrp="/sf/os\graphics\graphicsdeviceinterface\directgdi\group\graphics_directgdi.mrp"/>
-    </component>
-    <component name="directgdiinterface" long-name="DirectGDI Interface" introduced="tb92" purpose="optional">
-        <unit bldFile="/sf/os\graphics\graphicsdeviceinterface\directgdiinterface\group" mrp="/sf/os\graphics\graphicsdeviceinterface\directgdiinterface\group\graphics_directgdiheaders.mrp"/>
-    </component>
-    <component name="directgdiadaptation" long-name="DirectGDI Adaptation" introduced="tb92" purpose="optional">
-        <unit bldFile="/sf/os\graphics\graphicsdeviceinterface\directgdiadaptation\group" mrp="/sf/os\graphics\graphicsdeviceinterface\directgdiadaptation\group\graphics_directgdiadapter.mrp"/>
-    </component>
-    
-    <collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
-        <component name="displayldd" long-name="Display Drivers" introduced="tb92" purpose="optional">
-            <!-- <unit bldFile="/sf/os\kernelhwsrv\kernel\eka\drivers\display" mrp="/sf/os\kernelhwsrv\kernel\eka\drivers\display\base_e32_drivers_display.mrp"/> -->
-        </component>
-        <component name="surfacemgr" long-name="Surface Manager" introduced="tb92" purpose="optional">
-            <unit bldFile="/sf/os\graphics\graphicshwdrivers\surfacemgr\group" mrp="/sf/os\graphics\graphicshwdrivers\surfacemgr\group\graphics_surfacemanager.mrp"/>
-        </component>
-    </collection>
-
-
-    <collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
-        <component name="graphicsresource" long-name="Graphics Resource" introduced="tb92" purpose="optional">
-            <unit bldFile="/sf/os\graphics\graphicsresourceservices\graphicsresource\group" mrp="/sf/os\graphics\graphicsresourceservices\graphicsresource\group\graphics_graphicsresource.mrp"/>
-        </component>
-        <component name="graphicsresourceadaptation" long-name="Graphics Resource Adaptation" introduced="tb92" purpose="optional">
-            <unit bldFile="/sf/os\graphics\graphicsresourceservices\graphicsresourceadaptation\group" mrp="/sf/os\graphics\graphicsresourceservices\graphicsresourceadaptation\group\graphics_graphicsresourceadapter.mrp"/>
-        </component>
-    </collection>
-
-    <!-- from textandloc -->
-    <component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC">
-        <unit bldFile="/sf/os\graphics\graphicstools\bitmapfonttools\group" mrp="/sf/os\graphics\graphicstools\bitmapfonttools\group\graphics_gdtran.mrp"/>
-    </component>
-
-
-    <!-- from S60 model -->
-    <collection name="s60_graphics">
-        <component name="abs.graphics.plat">
-            <unit unitID="abs.graphics.m3gcoreapi" mrp="" bldFile="sf/os/graphics/group/../graphics_plat/m3g_core_api/group" name="graphics_m3g_api"/>
-        </component>
-    </collection>
-
-
-    
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file

--- a/NewGraphicsArchitecture/os/graphics/sources.csv	Fri Jan 08 15:50:34 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/graphics/,/sf/os/graphics,branch,NewGraphicsArchitecture,layers.sysdef.xml