Merge ETEL removal changes
authorTom Pritchard <tomp@symbian.org>
Wed, 27 Oct 2010 15:24:40 +0100
changeset 91 303d3e345b01
parent 90 62156f66dbad (current diff)
parent 78 7271390ae2c2 (diff)
child 92 458d62869c00
Merge ETEL removal changes
group/bld.inf
syborg_stem/rom_content.csv
syborg_stem/static_dependencies.txt
--- a/group/bld.inf	Wed Oct 27 15:05:33 2010 +0100
+++ b/group/bld.inf	Wed Oct 27 15:24:40 2010 +0100
@@ -40,6 +40,11 @@
 // Rebuild the "original" TimeZone localisation resources as they're eclipsed by something else in the PDK
 /sf/mw/appsupport/tzservices/tzlocrscfactory/group/TzLocalizationRscFactory.mmp
 
+// VFP performance improvement for OpenVG SW reference implementation
+../perfopts/sfopenvg.mmp
+../perfopts/openvg.mmp
+../perfopts/openvgu.mmp
+
 // based on /sf/mw/drm
 ../breakdeps/DRMEngine/ROAPHandler.mmp
 ../breakdeps/DRMEngine/RightsServer.mmp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/perfopts/openvg.cpp	Wed Oct 27 15:24:40 2010 +0100
@@ -0,0 +1,456 @@
+/*
+* Copyright (c) 2009 Symbian Foundation Ltd
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Symbian Foundation Ltd - initial contribution.
+* 
+* Contributors:
+*
+* Description:
+* Implementation of OpenVG interface
+*/
+#include <openvg.h>
+#include "openvginternal.h"
+
+extern "C" {
+
+EXPORT_C VGErrorCode   vgGetError(void) __SOFTFP
+   {
+   return do_vgGetError();
+   }
+
+EXPORT_C void   vgFlush(void) __SOFTFP
+   {
+   return do_vgFlush();
+   }
+
+EXPORT_C void   vgFinish(void) __SOFTFP
+   {
+   return do_vgFinish();
+   }
+
+EXPORT_C  void  vgSetf (VGParamType type, VGfloat value) __SOFTFP
+   {
+   return do_vgSetf(type,value);
+   }
+
+EXPORT_C void   vgSeti (VGParamType type, VGint value) __SOFTFP
+   {
+   return do_vgSeti(type,value);
+   }
+
+EXPORT_C  void  vgSetfv(VGParamType type, VGint count ,const VGfloat* values) __SOFTFP
+   {
+   return do_vgSetfv(type,count,values);
+   }
+
+EXPORT_C void   vgSetiv(VGParamType type, VGint count ,const VGint* values) __SOFTFP
+   {
+   return do_vgSetiv(type,count,values);
+   }
+
+EXPORT_C  VGfloat   vgGetf(VGParamType type) __SOFTFP
+   {
+   return do_vgGetf(type);
+   }
+
+EXPORT_C VGint     vgGeti(VGParamType type) __SOFTFP
+   {
+   return do_vgGeti(type);
+   }
+
+EXPORT_C VGint     vgGetVectorSize(VGParamType type) __SOFTFP
+   {
+   return do_vgGetVectorSize(type);
+   }
+
+EXPORT_C  void      vgGetfv(VGParamType type, VGint count ,VGfloat* values) __SOFTFP
+   {
+   return do_vgGetfv(type,count,values);
+   }
+
+EXPORT_C void      vgGetiv(VGParamType type, VGint count ,VGint* values) __SOFTFP
+   {
+   return do_vgGetiv(type,count,values);
+   }
+
+EXPORT_C  void   vgSetParameterf(VGHandle object ,VGint paramType ,VGfloat value) __SOFTFP
+   {
+   return do_vgSetParameterf(object,paramType,value);
+   }
+
+EXPORT_C void   vgSetParameteri(VGHandle object ,VGint paramType ,VGint value) __SOFTFP
+   {
+   return do_vgSetParameteri(object,paramType,value);
+   }
+
+EXPORT_C  void   vgSetParameterfv(VGHandle object ,VGint paramType ,VGint count ,const VGfloat* values) __SOFTFP
+   {
+   return do_vgSetParameterfv(object,paramType,count,values);
+   }
+
+EXPORT_C void   vgSetParameteriv(VGHandle object ,VGint paramType ,VGint count ,const VGint* values) __SOFTFP
+   {
+   return do_vgSetParameteriv(object,paramType,count,values);
+   }
+
+EXPORT_C  VGfloat   vgGetParameterf(VGHandle object ,VGint paramType) __SOFTFP
+   {
+   return do_vgGetParameterf(object,paramType);
+   }
+
+EXPORT_C VGint   vgGetParameteri(VGHandle object ,VGint paramType) __SOFTFP
+   {
+   return do_vgGetParameteri(object,paramType);
+   }
+
+EXPORT_C VGint   vgGetParameterVectorSize(VGHandle object ,VGint paramType) __SOFTFP
+   {
+   return do_vgGetParameterVectorSize(object,paramType);
+   }
+
+EXPORT_C  void   vgGetParameterfv(VGHandle object ,VGint paramType ,VGint count ,VGfloat* values) __SOFTFP
+   {
+   return do_vgGetParameterfv(object,paramType,count,values);
+   }
+
+EXPORT_C void   vgGetParameteriv(VGHandle object ,VGint paramType ,VGint count ,VGint* values) __SOFTFP
+   {
+   return do_vgGetParameteriv(object,paramType,count,values);
+   }
+
+EXPORT_C void   vgLoadIdentity(void) __SOFTFP
+   {
+   return do_vgLoadIdentity();
+   }
+
+EXPORT_C  void   vgLoadMatrix(const VGfloat* m) __SOFTFP
+   {
+   return do_vgLoadMatrix(m);
+   }
+
+EXPORT_C  void   vgGetMatrix(VGfloat* m) __SOFTFP
+   {
+   return do_vgGetMatrix(m);
+   }
+
+EXPORT_C  void   vgMultMatrix(const  VGfloat* m) __SOFTFP
+   {
+   return do_vgMultMatrix(m);
+   }
+
+EXPORT_C  void   vgTranslate(VGfloat tx, VGfloat ty) __SOFTFP
+   {
+   return do_vgTranslate(tx,ty);
+   }
+
+EXPORT_C  void   vgScale(VGfloat sx, VGfloat sy) __SOFTFP
+   {
+   return do_vgScale(sx,sy);
+   }
+
+EXPORT_C  void   vgShear(VGfloat shx, VGfloat shy) __SOFTFP
+   {
+   return do_vgShear(shx,shy);
+   }
+
+EXPORT_C  void   vgRotate(VGfloat angle) __SOFTFP
+   {
+   return do_vgRotate(angle);
+   }
+
+EXPORT_C void   vgMask(VGHandle mask, VGMaskOperation operation ,VGint x, VGint y ,VGint width, VGint height) __SOFTFP
+   {
+   return do_vgMask(mask,operation,x,y,width,height);
+   }
+
+EXPORT_C void   vgRenderToMask(VGPath path ,VGbitfield paintModes ,VGMaskOperation operation) __SOFTFP
+   {
+   return do_vgRenderToMask(path,paintModes,operation);
+   }
+
+EXPORT_C VGMaskLayer   vgCreateMaskLayer(VGint width, VGint height) __SOFTFP
+   {
+   return do_vgCreateMaskLayer(width,height);
+   }
+
+EXPORT_C void   vgDestroyMaskLayer(VGMaskLayer maskLayer) __SOFTFP
+   {
+   return do_vgDestroyMaskLayer(maskLayer);
+   }
+
+EXPORT_C  void   vgFillMaskLayer(VGMaskLayer maskLayer ,VGint x, VGint y ,VGint width, VGint height ,VGfloat value) __SOFTFP
+   {
+   return do_vgFillMaskLayer(maskLayer,x,y,width,height,value);
+   }
+
+EXPORT_C void   vgCopyMask(VGMaskLayer maskLayer ,VGint sx, VGint sy ,VGint dx, VGint dy ,VGint width, VGint height) __SOFTFP
+   {
+   return do_vgCopyMask(maskLayer,sx,sy,dx,dy,width,height);
+   }
+
+EXPORT_C void   vgClear(VGint x, VGint y ,VGint width, VGint height) __SOFTFP
+   {
+   return do_vgClear(x,y,width,height);
+   }
+
+EXPORT_C  VGPath   vgCreatePath(VGint pathFormat ,VGPathDatatype datatype ,VGfloat scale, VGfloat bias ,VGint segmentCapacityHint ,VGint coordCapacityHint ,VGbitfield capabilities) __SOFTFP
+   {
+   return do_vgCreatePath(pathFormat,datatype,scale,bias,segmentCapacityHint,coordCapacityHint,capabilities);
+   }
+
+EXPORT_C void   vgClearPath(VGPath path, VGbitfield capabilities) __SOFTFP
+   {
+   return do_vgClearPath(path,capabilities);
+   }
+
+EXPORT_C void   vgDestroyPath(VGPath path) __SOFTFP
+   {
+   return do_vgDestroyPath(path);
+   }
+
+EXPORT_C void   vgRemovePathCapabilities(VGPath path ,VGbitfield capabilities) __SOFTFP
+   {
+   return do_vgRemovePathCapabilities(path,capabilities);
+   }
+
+EXPORT_C VGbitfield   vgGetPathCapabilities(VGPath path) __SOFTFP
+   {
+   return do_vgGetPathCapabilities(path);
+   }
+
+EXPORT_C void   vgAppendPath(VGPath dstPath, VGPath srcPath) __SOFTFP
+   {
+   return do_vgAppendPath(dstPath,srcPath);
+   }
+
+EXPORT_C void   vgAppendPathData(VGPath dstPath ,VGint numSegments ,const  VGubyte* pathSegments ,const  void* pathData) __SOFTFP
+   {
+   return do_vgAppendPathData(dstPath,numSegments,pathSegments,pathData);
+   }
+
+EXPORT_C void   vgModifyPathCoords(VGPath dstPath ,VGint startIndex ,VGint numSegments ,const void* pathData) __SOFTFP
+   {
+   return do_vgModifyPathCoords(dstPath,startIndex,numSegments,pathData);
+   }
+
+EXPORT_C void   vgTransformPath(VGPath dstPath, VGPath srcPath) __SOFTFP
+   {
+   return do_vgTransformPath(dstPath,srcPath);
+   }
+
+EXPORT_C  VGboolean   vgInterpolatePath(VGPath dstPath ,VGPath startPath ,VGPath endPath ,VGfloat amount) __SOFTFP
+   {
+   return do_vgInterpolatePath(dstPath,startPath,endPath,amount);
+   }
+
+EXPORT_C  VGfloat   vgPathLength(VGPath path ,VGint startSegment ,VGint numSegments) __SOFTFP
+   {
+   return do_vgPathLength(path,startSegment,numSegments);
+   }
+
+EXPORT_C  void   vgPointAlongPath(VGPath path ,VGint startSegment ,VGint numSegments ,VGfloat distance ,VGfloat* x, VGfloat* y ,VGfloat* tangentX ,VGfloat* tangentY) __SOFTFP
+   {
+   return do_vgPointAlongPath(path,startSegment,numSegments,distance,x,y,tangentX,tangentY);
+   }
+
+EXPORT_C  void   vgPathBounds(VGPath path ,VGfloat* minX ,VGfloat* minY ,VGfloat* width ,VGfloat* height) __SOFTFP
+   {
+   return do_vgPathBounds(path,minX,minY,width,height);
+   }
+
+EXPORT_C  void   vgPathTransformedBounds(VGPath path ,VGfloat* minX ,VGfloat* minY ,VGfloat* width ,VGfloat* height) __SOFTFP
+   {
+   return do_vgPathTransformedBounds(path,minX,minY,width,height);
+   }
+
+EXPORT_C void   vgDrawPath(VGPath path, VGbitfield paintModes) __SOFTFP
+   {
+   return do_vgDrawPath(path,paintModes);
+   }
+
+EXPORT_C VGPaint   vgCreatePaint(void) __SOFTFP
+   {
+   return do_vgCreatePaint();
+   }
+
+EXPORT_C void   vgDestroyPaint(VGPaint paint) __SOFTFP
+   {
+   return do_vgDestroyPaint(paint);
+   }
+
+EXPORT_C void   vgSetPaint(VGPaint paint, VGbitfield paintModes) __SOFTFP
+   {
+   return do_vgSetPaint(paint,paintModes);
+   }
+
+EXPORT_C VGPaint   vgGetPaint(VGPaintMode paintMode) __SOFTFP
+   {
+   return do_vgGetPaint(paintMode);
+   }
+
+EXPORT_C void   vgSetColor(VGPaint paint, VGuint rgba) __SOFTFP
+   {
+   return do_vgSetColor(paint,rgba);
+   }
+
+EXPORT_C VGuint   vgGetColor(VGPaint paint) __SOFTFP
+   {
+   return do_vgGetColor(paint);
+   }
+
+EXPORT_C void   vgPaintPattern(VGPaint paint, VGImage pattern) __SOFTFP
+   {
+   return do_vgPaintPattern(paint,pattern);
+   }
+
+EXPORT_C VGImage   vgCreateImage(VGImageFormat format ,VGint width, VGint height ,VGbitfield allowedQuality) __SOFTFP
+   {
+   return do_vgCreateImage(format,width,height,allowedQuality);
+   }
+
+EXPORT_C void   vgDestroyImage(VGImage image) __SOFTFP
+   {
+   return do_vgDestroyImage(image);
+   }
+
+EXPORT_C void   vgClearImage(VGImage image ,VGint x, VGint y ,VGint width, VGint height) __SOFTFP
+   {
+   return do_vgClearImage(image,x,y,width,height);
+   }
+
+EXPORT_C void   vgImageSubData(VGImage image ,const void* data ,VGint dataStride ,VGImageFormat dataFormat ,VGint x, VGint y ,VGint width, VGint height) __SOFTFP
+   {
+   return do_vgImageSubData(image,data,dataStride,dataFormat,x,y,width,height);
+   }
+
+EXPORT_C void   vgGetImageSubData(VGImage image ,void* data ,VGint dataStride ,VGImageFormat dataFormat ,VGint x, VGint y ,VGint width, VGint height) __SOFTFP
+   {
+   return do_vgGetImageSubData(image,data,dataStride,dataFormat,x,y,width,height);
+   }
+
+EXPORT_C VGImage   vgChildImage(VGImage parent ,VGint x, VGint y ,VGint width, VGint height) __SOFTFP
+   {
+   return do_vgChildImage(parent,x,y,width,height);
+   }
+
+EXPORT_C VGImage   vgGetParent(VGImage image) __SOFTFP
+   {
+   return do_vgGetParent(image);
+   }
+
+EXPORT_C void   vgCopyImage(VGImage dst, VGint dx, VGint dy ,VGImage src, VGint sx, VGint sy ,VGint width, VGint height ,VGboolean dither) __SOFTFP
+   {
+   return do_vgCopyImage(dst,dx,dy,src,sx,sy,width,height,dither);
+   }
+
+EXPORT_C void   vgDrawImage(VGImage image) __SOFTFP
+   {
+   return do_vgDrawImage(image);
+   }
+
+EXPORT_C void   vgSetPixels(VGint dx, VGint dy ,VGImage src, VGint sx, VGint sy ,VGint width, VGint height) __SOFTFP
+   {
+   return do_vgSetPixels(dx,dy,src,sx,sy,width,height);
+   }
+
+EXPORT_C void   vgWritePixels(const void* data, VGint dataStride ,VGImageFormat dataFormat ,VGint dx, VGint dy ,VGint width, VGint height) __SOFTFP
+   {
+   return do_vgWritePixels(data,dataStride,dataFormat,dx,dy,width,height);
+   }
+
+EXPORT_C void   vgGetPixels(VGImage dst, VGint dx, VGint dy ,VGint sx, VGint sy ,VGint width, VGint height) __SOFTFP
+   {
+   return do_vgGetPixels(dst,dx,dy,sx,sy,width,height);
+   }
+
+EXPORT_C void   vgReadPixels(void* data, VGint dataStride ,VGImageFormat dataFormat ,VGint sx, VGint sy ,VGint width, VGint height) __SOFTFP
+   {
+   return do_vgReadPixels(data,dataStride,dataFormat,sx,sy,width,height);
+   }
+
+EXPORT_C void   vgCopyPixels(VGint dx, VGint dy ,VGint sx, VGint sy ,VGint width, VGint height) __SOFTFP
+   {
+   return do_vgCopyPixels(dx,dy,sx,sy,width,height);
+   }
+
+EXPORT_C VGFont   vgCreateFont(VGint glyphCapacityHint) __SOFTFP
+   {
+   return do_vgCreateFont(glyphCapacityHint);
+   }
+
+EXPORT_C void   vgDestroyFont(VGFont font) __SOFTFP
+   {
+   return do_vgDestroyFont(font);
+   }
+
+EXPORT_C  void   vgSetGlyphToPath(VGFont font ,VGuint glyphIndex ,VGPath path ,VGboolean isHinted ,const VGfloat glyphOrigin [2] ,const VGfloat escapement[2]) __SOFTFP
+   {
+   return do_vgSetGlyphToPath(font,glyphIndex,path,isHinted,glyphOrigin,escapement);
+   }
+
+EXPORT_C  void   vgSetGlyphToImage(VGFont font ,VGuint glyphIndex ,VGImage image ,const VGfloat glyphOrigin [2] ,const VGfloat escapement[2]) __SOFTFP
+   {
+   return do_vgSetGlyphToImage(font,glyphIndex,image,glyphOrigin,escapement);
+   }
+
+EXPORT_C void   vgClearGlyph(VGFont font ,VGuint glyphIndex) __SOFTFP
+   {
+   return do_vgClearGlyph(font,glyphIndex);
+   }
+
+EXPORT_C void   vgDrawGlyph(VGFont font ,VGuint glyphIndex ,VGbitfield paintModes ,VGboolean allowAutoHinting) __SOFTFP
+   {
+   return do_vgDrawGlyph(font,glyphIndex,paintModes,allowAutoHinting);
+   }
+
+EXPORT_C  void   vgDrawGlyphs(VGFont font ,VGint glyphCount ,const VGuint* glyphIndices ,const VGfloat* adjustments_x ,const VGfloat* adjustments_y ,VGbitfield paintModes ,VGboolean allowAutoHinting) __SOFTFP
+   {
+   return do_vgDrawGlyphs(font,glyphCount,glyphIndices,adjustments_x,adjustments_y,paintModes,allowAutoHinting);
+   }
+
+EXPORT_C  void   vgColorMatrix(VGImage dst, VGImage src ,const VGfloat* matrix) __SOFTFP
+   {
+   return do_vgColorMatrix(dst,src,matrix);
+   }
+
+EXPORT_C  void   vgConvolve(VGImage dst, VGImage src ,VGint kernelWidth, VGint kernelHeight ,VGint shiftX, VGint shiftY ,const VGshort* kernel ,VGfloat scale ,VGfloat bias ,VGTilingMode tilingMode) __SOFTFP
+   {
+   return do_vgConvolve(dst,src,kernelWidth,kernelHeight,shiftX,shiftY,kernel,scale,bias,tilingMode);
+   }
+
+EXPORT_C  void   vgSeparableConvolve(VGImage dst, VGImage src ,VGint kernelWidth ,VGint kernelHeight ,VGint shiftX, VGint shiftY ,const VGshort* kernelX ,const VGshort* kernelY ,VGfloat scale ,VGfloat bias ,VGTilingMode tilingMode) __SOFTFP
+   {
+   return do_vgSeparableConvolve(dst,src,kernelWidth,kernelHeight,shiftX,shiftY,kernelX,kernelY,scale,bias,tilingMode);
+   }
+
+EXPORT_C  void   vgGaussianBlur(VGImage dst, VGImage src ,VGfloat stdDeviationX ,VGfloat stdDeviationY ,VGTilingMode tilingMode) __SOFTFP
+   {
+   return do_vgGaussianBlur(dst,src,stdDeviationX,stdDeviationY,tilingMode);
+   }
+
+EXPORT_C void   vgLookup(VGImage dst, VGImage src ,const VGubyte* redLUT ,const VGubyte* greenLUT ,const VGubyte* blueLUT ,const VGubyte* alphaLUT ,VGboolean outputLinear ,VGboolean outputPremultiplied) __SOFTFP
+   {
+   return do_vgLookup(dst,src,redLUT,greenLUT,blueLUT,alphaLUT,outputLinear,outputPremultiplied);
+   }
+
+EXPORT_C void   vgLookupSingle(VGImage dst, VGImage src ,const VGuint* lookupTable ,VGImageChannel sourceChannel ,VGboolean outputLinear ,VGboolean outputPremultiplied) __SOFTFP
+   {
+   return do_vgLookupSingle(dst,src,lookupTable,sourceChannel,outputLinear,outputPremultiplied);
+   }
+
+EXPORT_C VGHardwareQueryResult   vgHardwareQuery        (VGHardwareQueryType key ,VGint setting) __SOFTFP
+   {
+   return do_vgHardwareQuery(key,setting);
+   }
+
+EXPORT_C const VGubyte *   vgGetString(VGStringID name) __SOFTFP
+   {
+   return do_vgGetString(name);
+   }
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/perfopts/openvg.mmp	Wed Oct 27 15:24:40 2010 +0100
@@ -0,0 +1,55 @@
+/*
+* Copyright (c) 2009 Symbian Foundation Ltd
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Symbian Foundation Ltd - initial contribution.
+* 
+* Contributors:
+*
+* Description:
+* openvg mmp file
+*/
+// Modified to build from /sf/incubator/stemkit to enable VFP optimisation
+// builds against /sf/os/graphics/openvg/openvgrefimplementation/sfopenvg
+
+#include <vg\openvguids.hrh> // For uids
+
+target          stem_libopenvg_sw.dll		// Destination filename
+
+targettype      dll				// Binary build type
+uid             KUidSharedDllUidValue KUidOpenVGDllUidValue		// File uids
+CAPABILITY      ALL -tcb
+vendorid        0x70000001
+
+noexportlibrary
+
+armfpu vfpv2
+
+MACRO       __OPENVGHEADERS_USE_VG_1_1
+
+userinclude     /sf/os/graphics/openvg/openvgrefimplementation/sfopenvg/sfopenvg/include //for internal openvg functions e.g. do_vgXXX
+
+OS_LAYER_SYSTEMINCLUDE
+OS_LAYER_LIBC_SYSTEMINCLUDE
+SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(vg) // EGL include files
+
+
+sourcepath      .		// Relative path to source files
+
+source openvg.cpp
+
+library         euser.lib     		// Mandatory
+library			sflibopenvgrefimpl.lib
+
+#ifdef WINS
+DEFFILE         \epoc32\include\def\win32\libopenvg11.def	// WINS/WINSCW def file
+#else
+DEFFILE         \epoc32\include\def\eabi\libopenvg11.def	// ARM def file
+#endif // WINS
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/perfopts/openvgu.mmp	Wed Oct 27 15:24:40 2010 +0100
@@ -0,0 +1,49 @@
+/*
+* Copyright (c) 2009 Symbian Foundation Ltd
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Symbian Foundation Ltd - initial contribution.
+* 
+* Contributors:
+*
+* Description:
+* openvgu mmp file
+*/
+// Modified to build from /sf/incubator/stemkit to enable VFP optimisation
+// builds against /sf/os/graphics/openvg/openvgrefimplementation/sfopenvg
+
+#include <vg\openvguids.hrh> // For uids
+
+target          stem_libopenvgu_sw.dll		// Destination filename
+targettype      dll				// Binary build type
+uid             KUidSharedDllUidValue KUidVGUDllUidValue		// File uids
+CAPABILITY      CAP_GENERAL_DLL
+vendorid        0x70000001
+noexportlibrary
+
+armfpu vfpv2
+
+userinclude     /sf/os/graphics/openvg/openvgrefimplementation/sfopenvg/sfopenvg/include //for internal egl functions e.g. do_eglXXX
+
+OS_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(vg) // EGL include files
+
+macro __OPENVGHEADERS_USE_VG_1_1
+
+sourcepath      .		// Relative path to source files
+
+source          vgu.cpp
+
+library         euser.lib     		// Mandatory
+library			sflibopenvgrefimpl.lib
+
+#ifdef WINS
+DEFFILE         \epoc32\include\def\win32\libopenvgu11.def	// WINS/WINSCW def file
+#else
+DEFFILE         \epoc32\include\def\eabi\libopenvgu11.def	// ARM def file
+#endif // WINS
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/perfopts/sfopenvg.mmp	Wed Oct 27 15:24:40 2010 +0100
@@ -0,0 +1,93 @@
+/*
+* Copyright (c) 2009 Symbian Foundation Ltd
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Symbian Foundation Ltd - initial contribution.
+* 
+* Contributors:
+*
+* Description:
+* sfopenvg mmp file
+*/
+// Modified to build from /sf/incubator/stemkit to enable VFP optimisation
+// builds against /sf/os/graphics/openvg/openvgrefimplementation/sfopenvg
+
+#include <vg\openvguids.hrh> // For uids
+
+target          stem_sflibopenvgrefimpl.dll		// Destination filename
+
+targettype      dll				// Binary build type
+uid             KUidSharedDllUidValue 0x10281CA6		// File uids
+CAPABILITY      ALL -tcb
+vendorid        0x70000001
+noexportlibrary
+
+armfpu vfpv2
+
+MACRO       __OPENVGHEADERS_USE_VG_1_1
+
+MACRO 			USE_NEW_ELEAVE //swictch on to use new(ELeave) rather new in alloc's
+					 		   //useful to trap OOM failures
+MACRO  		BUILD_WITH_PRIVATE_EGL //enable this to compile this dll exporting the private form of the EGL functions.
+								   //These are the ones starting do_XX (e.g. do_eglInitialize).
+								   //This should be enabled when you wish to have a separate EGL library (e.g. libegl.dll)
+								   //which will export the ELG APIs.
+								   //If this macro is supressed then this dll will export the true EGL APIs
+								   //see riMiniEgl.cpp
+MACRO 		BUILD_WITH_PRIVATE_VGU //same meaning as macro BUILD_WITH_PRIVATE_EGL except applies to the VGU API.
+								   //see riVGU.cpp
+
+MACRO 		BUILD_WITH_PRIVATE_OPENVG //same meaning as macro BUILD_WITH_PRIVATE_EGL except applies to the OpenVG API.
+								   //see riAPI.cpp
+								   
+userinclude     /sf/os/graphics/openvg/openvgrefimplementation/sfopenvg/sfopenvg			// Local include files
+userinclude     /sf/os/graphics/openvg/openvgrefimplementation/sfopenvg/sfopenvg/include	// Local include files
+
+OS_LAYER_SYSTEMINCLUDE
+OS_LAYER_LIBC_SYSTEMINCLUDE
+OS_LAYER_STDCPP_SYSTEMINCLUDE
+
+SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(vg) // OpenGL ES include files
+SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(egl) // EGL include files
+
+
+
+sourcepath      /sf/os/graphics/openvg/openvgrefimplementation/sfopenvg/sfopenvg		// Relative path to source files
+
+source riApi.cpp
+source riContext.cpp
+source riFont.cpp
+source riImage.cpp
+source riMath.cpp
+source riMiniEGL.cpp
+source riPath.cpp
+source riPixelPipe.cpp
+source riRasterizer.cpp
+source riVGU.cpp
+source riUtils.cpp
+// source sfEGLInterface.cpp is skipped because this contains adaptation to
+// use Nokia Platsim interfaces to provide EGL services
+
+//for EGL
+SOURCEPATH /sf/os/graphics/openvg/openvgrefimplementation/sfopenvg/sfopenvg/symbian
+SOURCE riEGLOS.cpp
+
+DEFFILE		/sf/os/graphics/openvg/openvgrefimplementation/sfopenvg/~/sflibopenvgrefimpl.def
+
+library			libopenvg_sw.lib
+library         euser.lib     		// Mandatory
+library         fbscli.lib    		// For CFbsBitmap, etc
+library         bitgdi.lib    		// For CFbsBitmapDevice, CFbsBitGc, etc
+library         ws32.lib      		// For RWindow, Direct Screen Access, etc
+library         libstdcpp.lib      		// standard lib
+library         libc.lib      		// standard lib
+library         libm.lib      		// standard lib
+
+
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/perfopts/vgu.cpp	Wed Oct 27 15:24:40 2010 +0100
@@ -0,0 +1,125 @@
+/*
+* Copyright (c) 2009 Symbian Foundation Ltd
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Symbian Foundation Ltd - initial contribution.
+* 
+* Contributors:
+*
+* Description:
+* Implementation of VGU interface
+*/
+
+#include <e32base.h>
+#include <vgu.h>
+
+#include "vguinternal.h" //contains do_vguXX fucntion declarations
+
+extern "C" {
+
+EXPORT_C VGUErrorCode vguLine(VGPath path, VGfloat x0, VGfloat y0, VGfloat x1, VGfloat y1) __SOFTFP
+{
+return do_vguLine(path, x0, y0, x1, y1);
+}
+
+/*-------------------------------------------------------------------*//*!
+* \brief	
+* \param	
+* \return	
+* \note		
+*//*-------------------------------------------------------------------*/
+
+EXPORT_C VGUErrorCode vguPolygon(VGPath path, const VGfloat * points, VGint count, VGboolean closed) __SOFTFP
+{
+return do_vguPolygon(path, points, count, closed);
+}
+
+/*-------------------------------------------------------------------*//*!
+* \brief	
+* \param	
+* \return	
+* \note		
+*//*-------------------------------------------------------------------*/
+
+EXPORT_C VGUErrorCode vguRect(VGPath path, VGfloat x, VGfloat y, VGfloat width, VGfloat height) __SOFTFP
+{
+return do_vguRect(path, x, y, width, height);
+}
+
+/*-------------------------------------------------------------------*//*!
+* \brief	
+* \param	
+* \return	
+* \note		
+*//*-------------------------------------------------------------------*/
+
+EXPORT_C VGUErrorCode vguRoundRect(VGPath path, VGfloat x, VGfloat y, VGfloat width, VGfloat height, VGfloat arcWidth, VGfloat arcHeight) __SOFTFP
+{
+return do_vguRoundRect(path, x, y, width, height, arcWidth, arcHeight);
+}
+
+/*-------------------------------------------------------------------*//*!
+* \brief	
+* \param	
+* \return	
+* \note		
+*//*-------------------------------------------------------------------*/
+
+EXPORT_C VGUErrorCode vguEllipse(VGPath path, VGfloat cx, VGfloat cy, VGfloat width, VGfloat height) __SOFTFP
+{
+return do_vguEllipse(path, cx, cy, width, height);
+}
+
+/*-------------------------------------------------------------------*//*!
+* \brief	
+* \param	
+* \return	
+* \note		
+*//*-------------------------------------------------------------------*/
+
+EXPORT_C VGUErrorCode vguArc(VGPath path, VGfloat x, VGfloat y, VGfloat width, VGfloat height, VGfloat startAngle, VGfloat angleExtent, VGUArcType arcType) __SOFTFP
+{
+return do_vguArc(path, x, y, width, height, startAngle, angleExtent, arcType);
+}
+
+/*-------------------------------------------------------------------*//*!
+* \brief	
+* \param	
+* \return	
+* \note		
+*//*-------------------------------------------------------------------*/
+
+EXPORT_C VGUErrorCode vguComputeWarpQuadToSquare(VGfloat sx0, VGfloat sy0, VGfloat sx1, VGfloat sy1, VGfloat sx2, VGfloat sy2, VGfloat sx3, VGfloat sy3, VGfloat * matrix) __SOFTFP
+{
+return do_vguComputeWarpQuadToSquare(sx0, sy0, sx1, sy1, sx2, sy2, sx3, sy3, matrix);
+}
+
+/*-------------------------------------------------------------------*//*!
+* \brief	
+* \param	
+* \return	
+* \note		
+*//*-------------------------------------------------------------------*/
+
+EXPORT_C VGUErrorCode vguComputeWarpSquareToQuad(VGfloat dx0, VGfloat dy0, VGfloat dx1, VGfloat dy1, VGfloat dx2, VGfloat dy2, VGfloat dx3, VGfloat dy3, VGfloat * matrix) __SOFTFP
+{
+return do_vguComputeWarpSquareToQuad(dx0, dy0, dx1, dy1, dx2, dy2, dx3, dy3, matrix);
+}
+
+/*-------------------------------------------------------------------*//*!
+* \brief	
+* \param	
+* \return	
+* \note		
+*//*-------------------------------------------------------------------*/
+
+EXPORT_C VGUErrorCode vguComputeWarpQuadToQuad(VGfloat dx0, VGfloat dy0, VGfloat dx1, VGfloat dy1, VGfloat dx2, VGfloat dy2, VGfloat dx3, VGfloat dy3, VGfloat sx0, VGfloat sy0, VGfloat sx1, VGfloat sy1, VGfloat sx2, VGfloat sy2, VGfloat sx3, VGfloat sy3, VGfloat * matrix) __SOFTFP
+{
+return do_vguComputeWarpQuadToQuad(dx0, dy0, dx1, dy1, dx2, dy2, dx3, dy3, sx0, sy0, sx1, sy1, sx2, sy2, sx3, sy3, matrix);
+}
+
+}
--- a/syborg_stem/rom_content.csv	Wed Oct 27 15:05:33 2010 +0100
+++ b/syborg_stem/rom_content.csv	Wed Oct 27 15:24:40 2010 +0100
@@ -2610,7 +2610,7 @@
 sys\bin\btracex.ldd,/epoc32/release/armv5/urel/_syborg_btracex.ldd,base_syborg_ui.iby,adaptation/qemu,,,
 sys\bin\EStart.exe,/epoc32/release/armv5/urel/_syborg_e32strt.exe,base.iby,adaptation/qemu,,,
 sys\bin\EKData.dll,/epoc32/release/armv5/urel/_syborg_ekdata.dll,base.iby,adaptation/qemu,,,
-sys\bin\ekern.exe,/epoc32/release/armv5/urel/_syborg_ekern.exe,base_syborg_ui.iby,adaptation/qemu,,,
+sys\bin\ekern.exe,/epoc32/release/armv5/urel/_syborg_ekern.exe,base_syborg_ui.iby,adaptation/qemu,In,WR,Just in case
 sys\bin\ekeyb.dll,/epoc32/release/armv5/urel/_syborg_ekeyb.dll,base_syborg_ui.iby,adaptation/qemu,,,
 sys\bin\epointer.dll,/epoc32/release/armv5/urel/_syborg_epointer_landscape.dll,base_syborg_ui.iby,adaptation/qemu,,,
 sys\bin\euart1.pdd,/epoc32/release/armv5/urel/_syborg_eserial.pdd,base_syborg_ui.iby,adaptation/qemu,,,
@@ -2635,7 +2635,7 @@
 sys\bin\AacDecoderConfigMsgHdlr.dll,/epoc32/release/armv5/urel/aacdecoderconfigmsghdlr.dll,core/os/MmfCustomInterfaces.iby,os/mm,,,
 sys\bin\AacDecoderConfigProxy.dll,/epoc32/release/armv5/urel/aacdecoderconfigproxy.dll,core/os/MmfCustomInterfaces.iby,os/mm,,,
 sys\bin\abclient.dll,/epoc32/release/armv5/urel/abclient.dll,connectivity_securebackupengine.iby,os/ossrv,,,
-sys\bin\ABOUT.exe,/epoc32/release/armv5/urel/about.exe,core/app/about.iby,app/utils,Out,WR,application
+sys\bin\ABOUT.exe,/epoc32/release/armv5/urel/about.exe,core/app/about.iby,app/utils,,WR,application
 Sys\Bin\aboutgsplugin.dll,/epoc32/release/armv5/urel/aboutgsplugin.dll,core/app/about.iby,app/utils,,,
 Sys\Bin\abstractmediamtpdataprovider.dll,/epoc32/release/armv5/urel/abstractmediamtpdataprovider.dll,core/mw/mmmtpdataprovider.iby,mw/mmappfw,,,
 sys\bin\abtestclient.EXE,/epoc32/release/armv5/urel/abtestclient.exe,ABTester.iby,mw/remoteconn,,,
@@ -2664,7 +2664,7 @@
 sys\bin\AddedDevSoundControlProxy.dll,/epoc32/release/armv5/urel/addeddevsoundcontrolproxy.dll,core/os/AddedDevSoundControl.iby,os/mm,,,
 sys\bin\addressbook.exe,/epoc32/release/armv5/urel/addressbook.exe,customervariant/app/qtdemoapps.iby,mw/qt,,WR,application
 sys\bin\addressinfo.prt,/epoc32/release/armv5/urel/addressinfo.prt,addressinfohook.iby,os/networkingsrv,,,
-sys\bin\adtupdater.exe,/epoc32/release/armv5/urel/adtupdater.exe,core/app/adtupdater.iby,app/organizer,Out,WR,application
+sys\bin\adtupdater.exe,/epoc32/release/armv5/urel/adtupdater.exe,core/app/adtupdater.iby,app/organizer,,WR,application
 Sys\Bin\AdvancedTspController.dll,/epoc32/release/armv5/urel/advancedtspcontroller.dll,core/mw/advancedtspcontroller.iby,mw/appsupport,,,
 sys\bin\agentdialog.dll,/epoc32/release/armv5/urel/agentdialog.dll,core/mw/agentdialog.iby,os/commsfw,,,
 Sys\Bin\agentpr.dll,/epoc32/release/armv5/urel/agentpr.dll,agentpr.iby,os/networkingsrv,,,
@@ -2741,7 +2741,7 @@
 sys\bin\akntouchgesturefw.dll,/epoc32/release/armv5/urel/akntouchgesturefw.dll,core/mw/akntouchgesturefw.iby,mw/classicui,,,
 sys\bin\akntransitionutils.dll,/epoc32/release/armv5/urel/akntransitionutils.dll,core/mw/akntransitionutils.iby,mw/classicui,,,
 sys\bin\alarmclient.dll,/epoc32/release/armv5/urel/alarmclient.dll,alarmserver.iby,mw/appsupport,,,
-sys\bin\alarmeditorapp.exe,/epoc32/release/armv5/urel/alarmeditorapp.exe,core/app/alarmeditorapp.iby,app/organizer,Out,WR,application
+sys\bin\alarmeditorapp.exe,/epoc32/release/armv5/urel/alarmeditorapp.exe,core/app/alarmeditorapp.iby,app/organizer,,WR,application
 sys\bin\alarmserver.exe,/epoc32/release/armv5/urel/alarmserver.exe,alarmserver.iby,mw/appsupport,,,
 sys\bin\alarmshared.dll,/epoc32/release/armv5/urel/alarmshared.dll,alarmserver.iby,mw/appsupport,,,
 Sys\Bin\alfappfwproxy.dll,/epoc32/release/armv5/urel/alfappfwproxy.dll,core/mw/alfred.iby,mw/uiaccelerator,,,
@@ -2855,7 +2855,7 @@
 sys\bin\AudioOutputRouting.dll,/epoc32/release/armv5/urel/audiooutputrouting.dll,core/os/AudioRouting.iby,os/mm,,,
 Sys\Bin\audiostream.dll,/epoc32/release/armv5/urel/audiostream.dll,refacladaptation.iby,os/mm,,,
 sys\bin\audioutils.dll,/epoc32/release/armv5/urel/audioutils.dll,mmf.iby,os/mm,,,
-sys\bin\Autolock.exe,/epoc32/release/armv5/urel/autolock.exe,core/mw/autolock.iby,mw/securitysrv,Out,WR,application
+sys\bin\Autolock.exe,/epoc32/release/armv5/urel/autolock.exe,core/mw/autolock.iby,mw/securitysrv,,WR,application
 sys\bin\autosend.exe,/epoc32/release/armv5/urel/autosend.exe,gtemailmtm.iby,app/messaging,,,
 sys\bin\autotest.dll,/epoc32/release/armv5/urel/autotest.dll,autotest.iby,os/buildtools,,,
 sys\bin\avc.dll,/epoc32/release/armv5/urel/avc.dll,bluetooth.iby,mw/btservices,,,
@@ -2920,7 +2920,7 @@
 sys\bin\BrowserDialogsProvider.dll,/epoc32/release/armv5/urel/browserdialogsprovider.dll,core/mw/BrowserDialogsProvider.iby,mw/web,,,
 sys\bin\BrowserEngine.dll,/epoc32/release/armv5/urel/browserengine.dll,core/mw/webkit.iby,mw/web,,,
 sys\bin\browserlauncher.dll,/epoc32/release/armv5/urel/browserlauncher.dll,core/app/BrowserLauncher.iby,app/webuis,,,
-sys\bin\BrowserNG.exe,/epoc32/release/armv5/urel/browserng.exe,core/app/BrowserUi.iby,app/webuis,Out,WR,application
+sys\bin\BrowserNG.exe,/epoc32/release/armv5/urel/browserng.exe,core/app/BrowserUi.iby,app/webuis,,WR,application
 Sys\Bin\BrowserRec.dll,/epoc32/release/armv5/urel/browserrec.dll,core/mw/BrowserRecognizers.iby,mw/web,,,
 sys\bin\BrowserTelService.dll,/epoc32/release/armv5/urel/browsertelservice.dll,core/mw/browsertelservice.iby,mw/web,,,
 sys\bin\bsclient.dll,/epoc32/release/armv5/urel/bsclient.dll,core/mw/brandingserver.iby,mw/imsrv,,,
@@ -2973,8 +2973,8 @@
 Sys\Bin\btsac.dll,/epoc32/release/armv5/urel/btsac.dll,core/mw/btsac.iby,mw/btservices,,,
 Sys\Bin\BTSap.dll,/epoc32/release/armv5/urel/btsap.dll,core/mw/btsap.iby,mw/btservices,,,
 sys\bin\btsmtm.dll,/epoc32/release/armv5/urel/btsmtm.dll,core/mw/obex.iby,app/messaging,,,
-sys\bin\bttoggle.exe,/epoc32/release/armv5/urel/bttoggle.exe,core/mw/bteng.iby,mw/btservices,Out,WR,application
-sys\bin\BtUi.exe,/epoc32/release/armv5/urel/btui.exe,core/mw/btui.iby,mw/btservices,Out,WR,application
+sys\bin\bttoggle.exe,/epoc32/release/armv5/urel/bttoggle.exe,core/mw/bteng.iby,mw/btservices,,WR,application
+sys\bin\BtUi.exe,/epoc32/release/armv5/urel/btui.exe,core/mw/btui.iby,mw/btservices,,WR,application
 Sys\Bin\BtuiPlugin.dll,/epoc32/release/armv5/urel/btuiplugin.dll,core/mw/btui.iby,mw/btservices,,,
 sys\bin\Bubble.pgn,/epoc32/release/armv5/urel/bubble.pgn,core/app/ImageEditorBubblePlugin.iby,app/imgeditor,,,
 sys\bin\BubbleManager.dll,/epoc32/release/armv5/urel/bubblemanager.dll,core/app/bubblemanager.iby,app/phone,,,
@@ -3027,7 +3027,7 @@
 sys\bin\CAMC3GPSINK.DLL,/epoc32/release/armv5/urel/camc3gpsink.dll,core/mw/CamcorderMMFPlugin.iby,mw/camerasrv,,,
 Sys\Bin\CAMCCONTROLLER.DLL,/epoc32/release/armv5/urel/camccontroller.dll,core/mw/CamcorderMMFPlugin.iby,mw/camerasrv,,,
 sys\bin\CAMCMEDIARECORDER.DLL,/epoc32/release/armv5/urel/camcmediarecorder.dll,core/mw/CamcorderMMFPlugin.iby,mw/camerasrv,,,
-sys\bin\cameraapp.exe,/epoc32/release/armv5/urel/cameraapp.exe,core/app/cameraapp.iby,app/camera,Out,WR,application
+sys\bin\cameraapp.exe,/epoc32/release/armv5/urel/cameraapp.exe,core/app/cameraapp.iby,app/camera,,WR,application
 sys\bin\CameraUiConfigManager.dll,/epoc32/release/armv5/urel/camerauiconfigmanager.dll,core/app/cameraapp.iby,app/camera,,,
 sys\bin\cameseutility.dll,/epoc32/release/armv5/urel/cameseutility.dll,core/mw/wmdrmpd_dist.iby,adaptation/stubs,,,
 sys\bin\Cartoonize.pgn,/epoc32/release/armv5/urel/cartoonize.pgn,core/app/ImageEditorCartoonizePlugin.iby,app/imgeditor,,,
@@ -3062,7 +3062,7 @@
 sys\bin\cdlserver.exe,/epoc32/release/armv5/urel/cdlserver.exe,core/mw/Cdl.iby,mw/uiresources,,,
 sys\bin\ced.exe,/epoc32/release/armv5/urel/ced.exe,ced.iby,os/commsfw,,,
 sys\bin\ceddump.exe,/epoc32/release/armv5/urel/ceddump.exe,ceddump.iby,os/commsfw,,,
-sys\bin\cenrepdatabase.dll,/epoc32/release/armv5/urel/cenrepdatabase.dll,core/mw/cenrepdatabase.iby,mw/phonesrv,,,
+sys\bin\cenrepdatabase.dll,/epoc32/release/armv5/urel/cenrepdatabase.dll,core/mw/cenrepdatabase.iby,mw/phonesrv,Out,WR,Utility for phone server?
 sys\bin\CENREPNOTIFHANDLER.DLL,/epoc32/release/armv5/urel/cenrepnotifhandler.dll,cenrepnotifierhandler.iby,os/persistentdata,,,
 Sys\Bin\cenrepsourceplugin.dll,/epoc32/release/armv5/urel/cenrepsourceplugin.dll,core/mw/CenRepSourcePlugIn.iby,mw/appsupport,,,
 sys\bin\centralrepository.dll,/epoc32/release/armv5/urel/centralrepository.dll,centralrepository.iby,os/persistentdata,,,
@@ -3071,7 +3071,7 @@
 sys\bin\CentRepToolServer.exe,/epoc32/release/armv5/urel/centreptoolserver.exe,core/mw/policyengine.iby,mw/remotemgmt,,,
 Sys\Bin\CertManUi.dll,/epoc32/release/armv5/urel/certmanui.dll,core/mw/certmanui.iby,mw/securitysrv,,,
 Sys\Bin\CertRFSPlugin.dll,/epoc32/release/armv5/urel/certrfsplugin.dll,core/mw/RFSPlugins.iby,mw/appsupport,,,
-sys\bin\CERTSAVER.exe,/epoc32/release/armv5/urel/certsaver.exe,core/mw/CertSaver.iby,mw/securitysrv,Out,WR,application
+sys\bin\CERTSAVER.exe,/epoc32/release/armv5/urel/certsaver.exe,core/mw/CertSaver.iby,mw/securitysrv,,WR,application
 sys\bin\CertStore.dll,/epoc32/release/armv5/urel/certstore.dll,certman.iby,os/security,,,
 sys\bin\CFActivatorEngine.dll,/epoc32/release/armv5/urel/cfactivatorengine.dll,core/mw/ContextFramework.iby,mw/appsupport,,,
 sys\bin\CFClient.dll,/epoc32/release/armv5/urel/cfclient.dll,core/mw/ContextFramework.iby,mw/appsupport,,,
@@ -3172,7 +3172,7 @@
 Sys\Bin\connectiondialogswrapper.DLL,/epoc32/release/armv5/urel/connectiondialogswrapper.dll,core/mw/ConnectionDialogs.iby,mw/ipconnmgmt,,,
 sys\bin\ConnectionManager.dll,/epoc32/release/armv5/urel/connectionmanager.dll,core/mw/ConnectionManager.iby,mw/web,,,
 Sys\Bin\connectionmonitorplugin.dll,/epoc32/release/armv5/urel/connectionmonitorplugin.dll,core/mw/connectionmonitorplugin.iby,mw/ipconnmgmt,,,
-sys\bin\ConnectionMonitorUi.exe,/epoc32/release/armv5/urel/connectionmonitorui.exe,core/mw/ConnectionMonitorUi.iby,mw/ipconnmgmt,Out,WR,application
+sys\bin\ConnectionMonitorUi.exe,/epoc32/release/armv5/urel/connectionmonitorui.exe,core/mw/ConnectionMonitorUi.iby,mw/ipconnmgmt,,WR,application
 sys\bin\connectionmux.dll,/epoc32/release/armv5/urel/connectionmux.dll,core/mw/natfw.iby,mw/ipappsrv,,,
 sys\bin\ConnectionUiUtilities.dll,/epoc32/release/armv5/urel/connectionuiutilities.dll,core/mw/ConnectionUiUtilities.iby,mw/ipconnmgmt,,,
 Sys\Bin\ConnectUtil.dll,/epoc32/release/armv5/urel/connectutil.dll,core/app/connectutil.iby,app/phone,,,
@@ -3226,13 +3226,13 @@
 sys\bin\cpswrapper.dll,/epoc32/release/armv5/urel/cpswrapper.dll,core/app/ai3xmluirendering.iby,app/homescreen,,,
 sys\bin\cputils.dll,/epoc32/release/armv5/urel/cputils.dll,core/mw/contentpublishingservice.iby,mw/homescreensrv,,,
 sys\bin\crber.dll,/epoc32/release/armv5/urel/crber.dll,core/mw/pkcs12.iby,mw/securitysrv,,,
-sys\bin\Creator.exe,/epoc32/release/armv5/urel/creator.exe,core/tools/creator.iby,app/rndtools,Out,WR,application
+sys\bin\Creator.exe,/epoc32/release/armv5/urel/creator.exe,core/tools/creator.iby,app/rndtools,,WR,application
 sys\bin\Crop.pgn,/epoc32/release/armv5/urel/crop.pgn,core/app/ImageEditorCropPlugin.iby,app/imgeditor,,,
 sys\bin\crpkcs12.dll,/epoc32/release/armv5/urel/crpkcs12.dll,core/mw/pkcs12.iby,mw/securitysrv,,,
 sys\bin\crypto.dll,/epoc32/release/armv5/urel/crypto.dll,certman.iby,os/security,,,
 sys\bin\cryptospi.dll,/epoc32/release/armv5/urel/cryptospi.dll,crypto.iby,os/security,,,
 sys\bin\cryptospisetup.exe,/epoc32/release/armv5/urel/cryptospisetup.exe,crypto.iby,os/security,,,
-sys\bin\CSC.exe,/epoc32/release/armv5/urel/csc.exe,core/app/csc.iby,app/iptelephony,Out,WR,application
+sys\bin\CSC.exe,/epoc32/release/armv5/urel/csc.exe,core/app/csc.iby,app/iptelephony,,WR,application
 sys\bin\cscallctrl.dll,/epoc32/release/armv5/urel/cscallctrl.dll,core/app/videoteleng.iby,app/videotelephony,,,
 sys\bin\cscengine.dll,/epoc32/release/armv5/urel/cscengine.dll,core/app/csc.iby,app/iptelephony,,,
 Sys\Bin\cscgsplugin.dll,/epoc32/release/armv5/urel/cscgsplugin.dll,core/app/csc.iby,app/iptelephony,,,
@@ -3241,7 +3241,7 @@
 sys\bin\Csd.agt,/epoc32/release/armv5/urel/csd.agt,CSD.IBY,os/cellularsrv,,,
 sys\bin\CseSchedulerClient.dll,/epoc32/release/armv5/urel/cseschedulerclient.dll,core/mw/videoschedulerclient.iby,mw/videoutils,,,
 sys\bin\CseSchedulerServer.exe,/epoc32/release/armv5/urel/cseschedulerserver.exe,core/mw/videoschedulerserver.iby,mw/videoutils,,,
-sys\bin\cshelp.exe,/epoc32/release/armv5/urel/cshelp.exe,core/app/Cshelp.iby,app/helps,Out,WR,application
+sys\bin\cshelp.exe,/epoc32/release/armv5/urel/cshelp.exe,core/app/Cshelp.iby,app/helps,,WR,application
 Sys\Bin\csplugin.dll,/epoc32/release/armv5/urel/csplugin.dll,core/mw/csplugin.iby,mw/phonesrv,,,
 sys\bin\ctfinder.dll,/epoc32/release/armv5/urel/ctfinder.dll,certman.iby,os/security,,,
 sys\bin\ctframework.dll,/epoc32/release/armv5/urel/ctframework.dll,certman.iby,os/security,,,
@@ -3269,7 +3269,7 @@
 sys\bin\dcmoclient.dll,/epoc32/release/armv5/urel/dcmoclient.dll,core/mw/dcmofw.iby,mw/remotemgmt,,,
 Sys\Bin\ddc_access.dll,/epoc32/release/armv5/urel/ddc_access.dll,../../../rom/config/sf_refhw/bigrom.oby,adaptation/stubs,,,
 Sys\Bin\DdRecog.dll,/epoc32/release/armv5/urel/ddrecog.dll,core/mw/CodHandler.iby,mw/web,,,
-sys\bin\DdViewer.exe,/epoc32/release/armv5/urel/ddviewer.exe,core/mw/CodHandler.iby,mw/web,Out,WR,application
+sys\bin\DdViewer.exe,/epoc32/release/armv5/urel/ddviewer.exe,core/mw/CodHandler.iby,mw/web,,WR,application
 sys\bin\DebugLog.dll,/epoc32/release/armv5/urel/debuglog.dll,core/app/emailstore.iby,app/commonemail,,,
 sys\bin\defaultappclient.dll,/epoc32/release/armv5/urel/defaultappclient.dll,core/app/defaultapplicationsettings.iby,app/settingsuis,,,
 sys\bin\DefaultAppServer.exe,/epoc32/release/armv5/urel/defaultappserver.exe,core/app/defaultapplicationsettings.iby,app/settingsuis,,WR,application
@@ -3477,7 +3477,7 @@
 Sys\Bin\emailclientapi.dll,/epoc32/release/armv5/urel/emailclientapi.dll,core/app/emailclientapi.iby,app/commonemail,,,
 Sys\Bin\EmailNotificationHandler.dll,/epoc32/release/armv5/urel/emailnotificationhandler.dll,core/app/EmailNotificationHandler.iby,app/messaging,,,
 sys\bin\emailservermonitor.exe,/epoc32/release/armv5/urel/emailservermonitor.exe,core/app/emailservermonitor.iby,app/commonemail,,,
-sys\bin\emailwidgetsettings.exe,/epoc32/release/armv5/urel/emailwidgetsettings.exe,core/app/emailwidgetsettings.iby,app/commonemail,Out,WR,application
+sys\bin\emailwidgetsettings.exe,/epoc32/release/armv5/urel/emailwidgetsettings.exe,core/app/emailwidgetsettings.iby,app/commonemail,,WR,application
 Sys\Bin\EmbeddedLinkAdapter.dll,/epoc32/release/armv5/urel/embeddedlinkadapter.dll,core/app/embeddedlinkadapter.iby,app/devicecontrol,,,
 Sys\Bin\emn1_0stringdict00.dll,/epoc32/release/armv5/urel/emn1_0stringdict00.dll,wbxmlparser.iby,os/xmlsrv,,,
 sys\bin\ENGINEINFO.DLL,/epoc32/release/armv5/urel/engineinfo.dll,core/app/phonengengine.iby,app/phone,,,
@@ -3586,7 +3586,7 @@
 sys\bin\FavouritesEngine.dll,/epoc32/release/armv5/urel/favouritesengine.dll,core/mw/FavouritesEngine.iby,mw/web,,,
 Sys\Bin\FavouritesRFSPlugin.dll,/epoc32/release/armv5/urel/favouritesrfsplugin.dll,core/mw/RFSPlugins.iby,mw/appsupport,,,
 sys\bin\FavouritesSrv.exe,/epoc32/release/armv5/urel/favouritessrv.exe,core/mw/FavouritesEngine.iby,mw/web,,,
-sys\bin\fbscli.dll,/epoc32/release/armv5/urel/fbscli.dll,fbserv.iby,os/graphics,,,
+sys\bin\fbscli.dll,/epoc32/release/armv5/urel/fbscli.dll,fbserv.iby,os/graphics,In,WR,Font bitmap server
 sys\bin\fbserv.exe,/epoc32/release/armv5/urel/fbserv.exe,fbserv.iby,os/graphics,,,
 sys\bin\fbsrasterizer.dll,/epoc32/release/armv5/urel/fbsrasterizer_stub.dll,fbsrasterizer_stub.iby,os/graphics,,,
 sys\bin\fcpluginengine.dll,/epoc32/release/armv5/urel/fcpluginengine.dll,core/mw/multimediacommsengine.iby,mw/ipappsrv,,,
@@ -3645,7 +3645,7 @@
 sys\bin\FLogSvr.exe,/epoc32/release/armv5/urel/flogsvr.exe,flogger.iby,os/persistentdata,,,
 sys\bin\fluidlauncher.exe,/epoc32/release/armv5/urel/fluidlauncher.exe,customervariant/app/qtdemoapps.iby,mw/qt,,WR,application
 sys\bin\fmPresetUtility.dll,/epoc32/release/armv5/urel/fmpresetutility.dll,core/mw/FmPresetUtility.iby,mw/mmmw,,,
-sys\bin\fmradio.exe,/epoc32/release/armv5/urel/fmradio.exe,core/app/fmradio.iby,app/radio,Out,WR,application
+sys\bin\fmradio.exe,/epoc32/release/armv5/urel/fmradio.exe,core/app/fmradio.iby,app/radio,,WR,application
 Sys\Bin\fmradioactionhandler.dll,/epoc32/release/armv5/urel/fmradioactionhandler.dll,core/app/fmradio.iby,app/radio,,,
 sys\bin\fmradioactiveidleengine200.dll,/epoc32/release/armv5/urel/fmradioactiveidleengine200.dll,core/app/fmradio.iby,app/radio,,,
 sys\bin\fmradioengine.dll,/epoc32/release/armv5/urel/fmradioengine.dll,core/app/fmradioengine.iby,app/radio,,,
@@ -3663,10 +3663,10 @@
 Sys\Bin\fotadiskstorage.dll,/epoc32/release/armv5/urel/fotadiskstorage.dll,core/mw/fotaserver.iby,mw/remotemgmt,,,
 sys\bin\fotaengine.dll,/epoc32/release/armv5/urel/fotaengine.dll,core/mw/fotaserver.iby,mw/remotemgmt,,,
 sys\bin\fotaschedulehandler.exe,/epoc32/release/armv5/urel/fotaschedulehandler.exe,core/mw/fotaserver.iby,mw/remotemgmt,,,
-sys\bin\fotaserver.exe,/epoc32/release/armv5/urel/fotaserver.exe,core/mw/fotaserver.iby,mw/remotemgmt,Out,WR,application
+sys\bin\fotaserver.exe,/epoc32/release/armv5/urel/fotaserver.exe,core/mw/fotaserver.iby,mw/remotemgmt,,WR,application
 sys\bin\Frame.pgn,/epoc32/release/armv5/urel/frame.pgn,core/app/ImageEditorFramePlugin.iby,app/imgeditor,,,
 sys\bin\FrameTable.dll,/epoc32/release/armv5/urel/frametable.dll,core/os/FrameTable.iby,os/mm,,,
-sys\bin\FreestyleEmailUi.exe,/epoc32/release/armv5/urel/freestyleemailui.exe,core/app/freestyleemailui.iby,app/commonemail,Out,WR,application
+sys\bin\FreestyleEmailUi.exe,/epoc32/release/armv5/urel/freestyleemailui.exe,core/app/freestyleemailui.iby,app/commonemail,,WR,application
 Sys\Bin\freetype.dll,/epoc32/release/armv5/urel/freetype.dll,freetype.iby,os/textandloc,,,
 sys\bin\fridgemagnets.exe,/epoc32/release/armv5/urel/fridgemagnets.exe,customervariant/app/qtdemoapps.iby,mw/qt,,WR,application
 sys\bin\fs_generic.dll,/epoc32/release/armv5/urel/fs_generic.dll,core/app/fs_generic.iby,app/commonemail,,,
@@ -3679,7 +3679,7 @@
 Sys\Bin\fscsendplugin.dll,/epoc32/release/armv5/urel/fscsendplugin.dll,core/app/fsccontactactionservice.iby,app/commonemail,,,
 sys\bin\FSFWCommonLib.dll,/epoc32/release/armv5/urel/fsfwcommonlib.dll,core/app/FSEmailFramework.iby,app/commonemail,,,
 sys\bin\FSMailFramework.dll,/epoc32/release/armv5/urel/fsmailframework.dll,core/app/FSEmailFramework.iby,app/commonemail,,,
-sys\bin\fsmailserver.exe,/epoc32/release/armv5/urel/fsmailserver.exe,core/app/fsmailserver.iby,app/commonemail,Out,WR,application
+sys\bin\fsmailserver.exe,/epoc32/release/armv5/urel/fsmailserver.exe,core/app/fsmailserver.iby,app/commonemail,,WR,application
 Sys\Bin\fsscrollbarplugin.dll,/epoc32/release/armv5/urel/fsscrollbarplugin.dll,core/app/fs_generic.iby,app/commonemail,,,
 sys\bin\fssendashelper.dll,/epoc32/release/armv5/urel/fssendashelper.dll,core/app/fssendasmtm.iby,app/commonemail,,,
 sys\bin\fsservermtm.dll,/epoc32/release/armv5/urel/fsservermtm.dll,core/app/fssendasmtm.iby,app/commonemail,,,
@@ -3737,7 +3737,7 @@
 sys\bin\glibbackend.dll,/epoc32/release/armv5/urel/glibbackend.dll,core/os/glib.iby,os/ossrv,,,
 sys\bin\GlobalAudioSettings.dll,/epoc32/release/armv5/urel/globalaudiosettings.dll,core/os/GlobalAudioSettings.iby,os/mm,,,
 Sys\Bin\globalwlanadapter.dll,/epoc32/release/armv5/urel/globalwlanadapter.dll,core/mw/NSmlDMSync.iby,app/devicecontrol,,,
-sys\bin\glx.exe,/epoc32/release/armv5/urel/glx.exe,core/app/glxgallery.iby,app/photos,Out,WR,application
+sys\bin\glx.exe,/epoc32/release/armv5/urel/glx.exe,core/app/glxgallery.iby,app/photos,,WR,application
 sys\bin\glxcloudview.dll,/epoc32/release/armv5/urel/glxcloudview.dll,core/app/glxcloudview.iby,app/photos,,,
 sys\bin\glxcollectionmanager.dll,/epoc32/release/armv5/urel/glxcollectionmanager.dll,core/app/glxgallery.iby,app/photos,,,
 Sys\Bin\glxcollectionpluginalbums.dll,/epoc32/release/armv5/urel/glxcollectionpluginalbums.dll,core/app/glxgallery.iby,app/photos,,,
@@ -3763,7 +3763,7 @@
 Sys\Bin\glxgridviewplugin.dll,/epoc32/release/armv5/urel/glxgridviewplugin.dll,core/app/glxgallery.iby,app/photos,,,
 sys\bin\glxgridviewpluginbase.dll,/epoc32/release/armv5/urel/glxgridviewpluginbase.dll,core/app/glxgallery.iby,app/photos,,,
 sys\bin\glximageviewermanager.dll,/epoc32/release/armv5/urel/glximageviewermanager.dll,core/app/glxgallery.iby,app/photos,,,
-sys\bin\glxivwr.exe,/epoc32/release/armv5/urel/glxivwr.exe,core/app/glxgallery.iby,app/photos,Out,WR,application
+sys\bin\glxivwr.exe,/epoc32/release/armv5/urel/glxivwr.exe,core/app/glxgallery.iby,app/photos,,WR,application
 sys\bin\glxlayouts.dll,/epoc32/release/armv5/urel/glxlayouts.dll,core/app/glxgallery.iby,app/photos,,,
 sys\bin\glxlistview.dll,/epoc32/release/armv5/urel/glxlistview.dll,core/app/glxgallery.iby,app/photos,,,
 Sys\Bin\glxlistviewplugin.dll,/epoc32/release/armv5/urel/glxlistviewplugin.dll,core/app/glxgallery.iby,app/photos,,,
@@ -3879,7 +3879,7 @@
 sys\bin\homescreen.exe,/epoc32/release/armv5/urel/homescreen.exe,core/mw/idlefw.iby,mw/homescreensrv,,WR,application
 sys\bin\hotspotclient.dll,/epoc32/release/armv5/urel/hotspotclient.dll,core/mw/hotspot.iby,mw/wirelessacc,,,
 sys\bin\HotSpotServer.exe,/epoc32/release/armv5/urel/hotspotserver.exe,core/mw/hotspot.iby,mw/wirelessacc,,,
-sys\bin\HsBrowser.exe,/epoc32/release/armv5/urel/hsbrowser.exe,core/mw/hotspot.iby,mw/wirelessacc,Out,WR,application
+sys\bin\HsBrowser.exe,/epoc32/release/armv5/urel/hsbrowser.exe,core/mw/hotspot.iby,mw/wirelessacc,,WR,application
 sys\bin\hsccapiclient.dll,/epoc32/release/armv5/urel/hsccapiclient.dll,core/mw/ccsrv.iby,mw/homescreensrv,,,
 sys\bin\hsccproviderclient.dll,/epoc32/release/armv5/urel/hsccproviderclient.dll,core/mw/ccsrv.iby,mw/homescreensrv,,,
 sys\bin\hscontentcontrol.dll,/epoc32/release/armv5/urel/hscontentcontrol.dll,core/app/ai3xmluirendering.iby,app/homescreen,,,
@@ -3944,13 +3944,13 @@
 sys\bin\HWRMVibraClient.dll,/epoc32/release/armv5/urel/hwrmvibraclient.dll,hwresourcemanager.iby,os/devicesrv,,,
 Sys\Bin\hz.dll,/epoc32/release/armv5/urel/hz.dll,charconv_chinese_simplfied.iby,os/textandloc,,,
 sys\bin\iacp.dll,/epoc32/release/armv5/urel/iacp.dll,bioparsers.iby,mw/messagingmw,,,
-sys\bin\iaupdate.exe,/epoc32/release/armv5/urel/iaupdate.exe,core/mw/iaupdate.iby,mw/appinstall,Out,WR,application
+sys\bin\iaupdate.exe,/epoc32/release/armv5/urel/iaupdate.exe,core/mw/iaupdate.iby,mw/appinstall,,WR,application
 sys\bin\iaupdateapi.dll,/epoc32/release/armv5/urel/iaupdateapi.dll,core/mw/iaupdate.iby,mw/appinstall,,,
 sys\bin\iaupdatebg.exe,/epoc32/release/armv5/urel/iaupdatebg.exe,core/mw/iaupdate.iby,mw/appinstall,,,
 sys\bin\iaupdateengine.dll,/epoc32/release/armv5/urel/iaupdateengine.dll,core/mw/iaupdate.iby,mw/appinstall,,,
 sys\bin\iaupdatefwupdate.dll,/epoc32/release/armv5/urel/iaupdatefwupdate.dll,core/mw/iaupdate.iby,mw/appinstall,,,
-sys\bin\iaupdatelauncher.exe,/epoc32/release/armv5/urel/iaupdatelauncher.exe,core/mw/iaupdate.iby,mw/appinstall,Out,WR,application
-sys\bin\iaupdater.exe,/epoc32/release/armv5/urel/iaupdater.exe,core/mw/iaupdate.iby,mw/appinstall,Out,WR,application
+sys\bin\iaupdatelauncher.exe,/epoc32/release/armv5/urel/iaupdatelauncher.exe,core/mw/iaupdate.iby,mw/appinstall,,WR,application
+sys\bin\iaupdater.exe,/epoc32/release/armv5/urel/iaupdater.exe,core/mw/iaupdate.iby,mw/appinstall,,WR,application
 sys\bin\iaupdaterfiles.dll,/epoc32/release/armv5/urel/iaupdaterfiles.dll,core/mw/iaupdate.iby,mw/appinstall,,,
 sys\bin\iaupdatetools.dll,/epoc32/release/armv5/urel/iaupdatetools.dll,core/mw/iaupdate.iby,mw/appinstall,,,
 Sys\Bin\icecandidatehandler.dll,/epoc32/release/armv5/urel/icecandidatehandler.dll,core/mw/natfw.iby,mw/ipappsrv,,,
@@ -3977,7 +3977,7 @@
 sys\bin\ImageEditorUi.dll,/epoc32/release/armv5/urel/imageeditorui.dll,core/app/ImageEditorUI.iby,app/imgeditor,,,
 sys\bin\ImageEditorUtils.dll,/epoc32/release/armv5/urel/imageeditorutils.dll,core/mw/ImageEditorUtils.iby,app/imgeditor,,,
 sys\bin\imagegestures.exe,/epoc32/release/armv5/urel/imagegestures.exe,customervariant/app/qtdemoapps.iby,mw/qt,,WR,application
-sys\bin\imageprintapp.exe,/epoc32/release/armv5/urel/imageprintapp.exe,core/app/desw_imageprintui.iby,app/printing,Out,WR,application
+sys\bin\imageprintapp.exe,/epoc32/release/armv5/urel/imageprintapp.exe,core/app/desw_imageprintui.iby,app/printing,,WR,application
 sys\bin\imageprintclient.dll,/epoc32/release/armv5/urel/imageprintclient.dll,core/app/imageprintserver.iby,app/printing,,,
 sys\bin\imageprintengine.dll,/epoc32/release/armv5/urel/imageprintengine.dll,core/app/desw_imageprintui.iby,app/printing,,,
 sys\bin\imageprintserver.exe,/epoc32/release/armv5/urel/imageprintserver.exe,core/app/imageprintserver.iby,app/printing,,,
@@ -3997,7 +3997,7 @@
 Sys\Bin\imcmslauncherplugin.dll,/epoc32/release/armv5/urel/imcmslauncherplugin.dll,core/app/imconversationview.iby,app/conversations,,,
 sys\bin\imcvengine.dll,/epoc32/release/armv5/urel/imcvengine.dll,core/app/imconversationview.iby,app/conversations,,,
 sys\bin\imcvlauncher.dll,/epoc32/release/armv5/urel/imcvlauncher.dll,core/app/imconversationview.iby,app/conversations,,,
-sys\bin\imcvuiapp.exe,/epoc32/release/armv5/urel/imcvuiapp.exe,core/app/imconversationview.iby,app/conversations,Out,WR,application
+sys\bin\imcvuiapp.exe,/epoc32/release/armv5/urel/imcvuiapp.exe,core/app/imconversationview.iby,app/conversations,,WR,application
 sys\bin\imdatamodel.dll,/epoc32/release/armv5/urel/imdatamodel.dll,core/mw/imfeatureplugin.iby,mw/imsrv,,,
 Sys\Bin\imdatamodelhook.dll,/epoc32/release/armv5/urel/imdatamodelhook.dll,core/mw/imfeatureplugin.iby,mw/imsrv,,,
 Sys\Bin\imecomhook.dll,/epoc32/release/armv5/urel/imecomhook.dll,core/mw/imfeatureplugin.iby,mw/imsrv,,,
@@ -4046,7 +4046,7 @@
 Sys\Bin\iptransportmanagement.dll,/epoc32/release/armv5/urel/iptransportmanagement.dll,iptransport.iby,os/networkingsrv,,,
 sys\bin\IptvClientApi.dll,/epoc32/release/armv5/urel/iptvclientapi.dll,core/app/videoiptvclientapi.iby,app/videoplayer,,,
 Sys\Bin\IptvOmaProvisioningAdapter.dll,/epoc32/release/armv5/urel/iptvomaprovisioningadapter.dll,core/app/videoomaprovisioning.iby,app/videoplayer,,,
-sys\bin\IptvProvisioningApp.exe,/epoc32/release/armv5/urel/iptvprovisioningapp.exe,core/app/videoprovisioningapppui.iby,app/videoplayer,Out,WR,application
+sys\bin\IptvProvisioningApp.exe,/epoc32/release/armv5/urel/iptvprovisioningapp.exe,core/app/videoprovisioningapppui.iby,app/videoplayer,,WR,application
 sys\bin\IptvProvisioningProcessor.dll,/epoc32/release/armv5/urel/iptvprovisioningprocessor.dll,core/app/videoprovisioningprocessor.iby,app/videoplayer,,,
 Sys\Bin\IptvProvRec.DLL,/epoc32/release/armv5/urel/iptvprovrec.dll,core/app/videoprovisioningrecognizer.iby,app/videoplayer,,,
 Sys\Bin\IptvRssPlugin.DLL,/epoc32/release/armv5/urel/iptvrssplugin.dll,core/app/videorssplugin.iby,app/videoplayer,,,
@@ -4274,8 +4274,8 @@
 sys\bin\libgthread.dll,/epoc32/release/armv5/urel/libgthread.dll,core/os/glib.iby,os/ossrv,,,
 sys\bin\LibLogger.dll,/epoc32/release/armv5/urel/liblogger.dll,openenv.iby,os/ossrv,,,
 sys\bin\libm.dll,/epoc32/release/armv5/urel/libm.dll,openenv.iby,os/ossrv,,,
-Sys\Bin\libopenvg_sw.dll,/epoc32/release/armv5/urel/libopenvg_sw.dll,../../../rom/config/sf_refhw/bigrom.oby,os/graphics,,,
-Sys\Bin\libopenvgu_sw.dll,/epoc32/release/armv5/urel/libopenvgu_sw.dll,../../../rom/config/sf_refhw/bigrom.oby,os/graphics,,,
+Sys\Bin\libopenvg_sw.dll,/epoc32/release/armv5/urel/libopenvg_sw.dll,../../../rom/config/sf_refhw/bigrom.oby,os/graphics,Stem,MW,Performance optimisation
+Sys\Bin\libopenvgu_sw.dll,/epoc32/release/armv5/urel/libopenvgu_sw.dll,../../../rom/config/sf_refhw/bigrom.oby,os/graphics,Stem,MW,Performance optimisation
 sys\bin\libpthread.dll,/epoc32/release/armv5/urel/libpthread.dll,openenv.iby,os/ossrv,,,
 sys\bin\librt.dll,/epoc32/release/armv5/urel/librt.dll,oelibrt.iby,os/ossrv,,,
 sys\bin\libssl.dll,/epoc32/release/armv5/urel/libssl.dll,core/os/ssl.iby,os/ossrv,,,
@@ -4302,7 +4302,7 @@
 sys\bin\Liwservicehandler.dll,/epoc32/release/armv5/urel/liwservicehandler.dll,core/mw/serviceapi.iby,mw/serviceapifw,,,
 sys\bin\LmkCommonUi.dll,/epoc32/release/armv5/urel/lmkcommonui.dll,core/app/LocationLandmarksUi.iby,app/location,,,
 sys\bin\LmkEng.dll,/epoc32/release/armv5/urel/lmkeng.dll,core/app/LocationLandmarksUi.iby,app/location,,,
-sys\bin\LmkMsgViewer.exe,/epoc32/release/armv5/urel/lmkmsgviewer.exe,core/app/LocationLandmarksUi.iby,app/location,Out,WR,application
+sys\bin\LmkMsgViewer.exe,/epoc32/release/armv5/urel/lmkmsgviewer.exe,core/app/LocationLandmarksUi.iby,app/location,,WR,application
 sys\bin\LmkUi.dll,/epoc32/release/armv5/urel/lmkui.dll,core/app/LocationLandmarksUi.iby,app/location,,,
 sys\bin\loadamastart.dll,/epoc32/release/armv5/urel/loadamastart.dll,amastart.iby,mw/appsupport,,,
 sys\bin\LoadGen.exe,/epoc32/release/armv5/urel/loadgen.exe,core/tools/loadgen.iby,app/rndtools,,WR,application
@@ -4320,7 +4320,7 @@
 sys\bin\locationtrail.dll,/epoc32/release/armv5/urel/locationtrail.dll,core/mw/mds.iby,mw/mds,,,
 Sys\Bin\locbtnotifier.dll,/epoc32/release/armv5/urel/locbtnotifier.dll,core/mw/locbtnotifier.iby,mw/locationsrv,,,
 Sys\Bin\locgpsindicatorplugin.dll,/epoc32/release/armv5/urel/locgpsindicatorplugin.dll,core/mw/locgpsindicatorplugin.iby,mw/locationsrv,,,
-sys\bin\lockapp.exe,/epoc32/release/armv5/urel/lockapp.exe,core/mw/lockapp.iby,mw/securitysrv,Out,WR,application
+sys\bin\lockapp.exe,/epoc32/release/armv5/urel/lockapp.exe,core/mw/lockapp.iby,mw/securitysrv,,WR,application
 Sys\Bin\locnotifierwrapper.dll,/epoc32/release/armv5/urel/locnotifierwrapper.dll,core/mw/locverifierdlg.iby,mw/locationsrv,,,
 Sys\Bin\locnotprefplugin.dll,/epoc32/release/armv5/urel/locnotprefplugin.dll,core/mw/locnotprefplugin.iby,mw/locationsrv,,,
 sys\bin\locod.exe,/epoc32/release/armv5/urel/locod.exe,core/mw/locod.iby,mw/shortlinkconn,,,
@@ -4359,7 +4359,7 @@
 sys\bin\LoudnessProxy.dll,/epoc32/release/armv5/urel/loudnessproxy.dll,core/os/Effects.iby,os/mm,,,
 Sys\Bin\ltcellidmovdet.dll,/epoc32/release/armv5/urel/ltcellidmovdet.dll,core/mw/locationtriggering.iby,mw/locationsrv,,,
 sys\bin\ltmvmtdetapi.dll,/epoc32/release/armv5/urel/ltmvmtdetapi.dll,core/mw/locationtriggering.iby,mw/locationsrv,,,
-sys\bin\lwplayer.exe,/epoc32/release/armv5/urel/lwplayer.exe,core/app/lwplayer.iby,app/videoplayer,Out,WR,application
+sys\bin\lwplayer.exe,/epoc32/release/armv5/urel/lwplayer.exe,core/app/lwplayer.iby,app/videoplayer,,WR,application
 sys\bin\m3gcore.dll,/epoc32/release/armv5/urel/m3gcore.dll,core/os/m3gcore.iby,os/graphics,,,
 sys\bin\Mailinit.exe,/epoc32/release/armv5/urel/mailinit.exe,core/app/Mailinit.iby,app/messaging,,,
 Sys\Bin\MailPlainView.dll,/epoc32/release/armv5/urel/mailplainview.dll,core/app/MailEditorViewer.iby,app/messaging,,,
@@ -4515,7 +4515,7 @@
 sys\bin\mmssrv.dll,/epoc32/release/armv5/urel/mmssrv.dll,core/app/MmsEngine.iby,app/messaging,,,
 sys\bin\mmstransport.dll,/epoc32/release/armv5/urel/mmstransport.dll,core/app/MmsEngine.iby,app/messaging,,,
 sys\bin\MmsUi.dll,/epoc32/release/armv5/urel/mmsui.dll,core/app/MmsUi.iby,app/messaging,,,
-sys\bin\mmsviewer.exe,/epoc32/release/armv5/urel/mmsviewer.exe,core/app/MmsUi.iby,app/messaging,Out,WR,application
+sys\bin\mmsviewer.exe,/epoc32/release/armv5/urel/mmsviewer.exe,core/app/MmsUi.iby,app/messaging,,WR,application
 Sys\Bin\mmswatcher.dll,/epoc32/release/armv5/urel/mmswatcher.dll,core/app/MmsEngine.iby,app/messaging,,,
 sys\bin\mmwidgets.dll,/epoc32/release/armv5/urel/mmwidgets.dll,core/app/mmwidgets.iby,app/homescreen,,,
 Sys\Bin\mnaiwprovider.dll,/epoc32/release/armv5/urel/mnaiwprovider.dll,core/mw/locationmnfw.iby,mw/locationsrv,,,
@@ -4536,7 +4536,7 @@
 sys\bin\mpsettbase.dll,/epoc32/release/armv5/urel/mpsettbase.dll,core/app/mediasettingsbase.iby,app/videoplayer,,,
 sys\bin\MPSettEngine.dll,/epoc32/release/armv5/urel/mpsettengine.dll,core/mw/mpsetteng.iby,mw/mmappfw,,,
 Sys\Bin\mpsettropmodel.dll,/epoc32/release/armv5/urel/mpsettropmodel.dll,core/app/mpsettropmodel.iby,app/videoplayer,,,
-sys\bin\mpx.exe,/epoc32/release/armv5/urel/mpx.exe,core/app/mpxmusicplayerapp.iby,app/musicplayer,Out,WR,application
+sys\bin\mpx.exe,/epoc32/release/armv5/urel/mpx.exe,core/app/mpxmusicplayerapp.iby,app/musicplayer,,WR,application
 sys\bin\mpxaddtracksdialog.dll,/epoc32/release/armv5/urel/mpxaddtracksdialog.dll,core/app/mpxaddtracksdialog.iby,app/musicplayer,,,
 Sys\Bin\mpxaddtracksdialogplugin.dll,/epoc32/release/armv5/urel/mpxaddtracksdialogplugin.dll,core/app/mpxaddtracksdialogplugin.iby,app/musicplayer,,,
 sys\bin\mpxalbumarteditordialog.dll,/epoc32/release/armv5/urel/mpxalbumarteditordialog.dll,core/app/mpxalbumarteditordialog.iby,app/musicplayer,,,
@@ -4628,9 +4628,9 @@
 sys\bin\MsgEditorView.dll,/epoc32/release/armv5/urel/msgeditorview.dll,core/app/MsgEditor.iby,app/messaging,,,
 Sys\Bin\MsgErrorWatcher.dll,/epoc32/release/armv5/urel/msgerrorwatcher.dll,core/app/msgerrorwatcher.iby,app/messaging,,,
 Sys\Bin\MsgIndicatorPlugin.dll,/epoc32/release/armv5/urel/msgindicatorplugin.dll,core/app/msgindicatorplugin.iby,app/messaging,,,
-sys\bin\MsgMailEditor.exe,/epoc32/release/armv5/urel/msgmaileditor.exe,core/app/MailEditorViewer.iby,app/messaging,Out,WR,application
+sys\bin\MsgMailEditor.exe,/epoc32/release/armv5/urel/msgmaileditor.exe,core/app/MailEditorViewer.iby,app/messaging,,WR,application
 sys\bin\MsgMailUtils.dll,/epoc32/release/armv5/urel/msgmailutils.dll,core/app/MailEditorViewer.iby,app/messaging,,,
-sys\bin\MsgMailViewer.exe,/epoc32/release/armv5/urel/msgmailviewer.exe,core/app/MailEditorViewer.iby,app/messaging,Out,WR,application
+sys\bin\MsgMailViewer.exe,/epoc32/release/armv5/urel/msgmailviewer.exe,core/app/MailEditorViewer.iby,app/messaging,,WR,application
 sys\bin\MsgMedia.dll,/epoc32/release/armv5/urel/msgmedia.dll,core/app/MsgMedia.iby,app/messaging,,,
 sys\bin\MsgNotifiers.dll,/epoc32/release/armv5/urel/msgnotifiers.dll,core/app/MsgNotifiers.iby,app/messaging,,,
 Sys\Bin\MsgNotifiersWrapper.dll,/epoc32/release/armv5/urel/msgnotifierswrapper.dll,core/app/MsgNotifiers.iby,app/messaging,,,
@@ -4674,7 +4674,7 @@
 sys\bin\musmanagerclient.dll,/epoc32/release/armv5/urel/musmanagerclient.dll,core/app/multimediasharing.iby,app/mmsharinguis,,,
 sys\bin\musmanagerserver.exe,/epoc32/release/armv5/urel/musmanagerserver.exe,core/app/multimediasharing.iby,app/mmsharinguis,,,
 Sys\Bin\mussettingsui.dll,/epoc32/release/armv5/urel/mussettingsui.dll,core/app/multimediasharing.iby,app/mmsharinguis,,,
-sys\bin\musui.exe,/epoc32/release/armv5/urel/musui.exe,core/app/multimediasharing.iby,app/mmsharinguis,Out,WR,application
+sys\bin\musui.exe,/epoc32/release/armv5/urel/musui.exe,core/app/multimediasharing.iby,app/mmsharinguis,,WR,application
 Sys\Bin\muswpadapter.dll,/epoc32/release/armv5/urel/muswpadapter.dll,core/app/multimediasharing.iby,app/mmsharinguis,,,
 Sys\Bin\myvideosindicatorplugin.dll,/epoc32/release/armv5/urel/myvideosindicatorplugin.dll,core/app/myvideosindicatorplugin.iby,app/videoplayer,,,
 sys\bin\napt.prt,/epoc32/release/armv5/urel/napt.prt,napt.iby,os/networkingsrv,,,
@@ -4706,7 +4706,7 @@
 sys\bin\NetSubscribe.dll,/epoc32/release/armv5/urel/netsubscribe.dll,NETSubscribe.iby,os/commsfw,,,
 sys\bin\netups.dll,/epoc32/release/armv5/urel/netups.dll,netups.iby,os/networkingsrv,,,
 sys\bin\NETWORKHANDLING.DLL,/epoc32/release/armv5/urel/networkhandling.dll,core/mw/networkhandling.iby,mw/phonesrv,,,
-sys\bin\NewContactLauncher.exe,/epoc32/release/armv5/urel/newcontactlauncher.exe,core/app/Phonebook2.iby,app/contacts,Out,WR,application
+sys\bin\NewContactLauncher.exe,/epoc32/release/armv5/urel/newcontactlauncher.exe,core/app/Phonebook2.iby,app/contacts,,WR,application
 sys\bin\NewService.DLL,/epoc32/release/armv5/urel/newservice.dll,core/app/Voicerecorder.iby,app/voicerec,,,
 Sys\Bin\NGAPostProcHwDevice.dll,/epoc32/release/armv5/urel/ngapostprochwdevice.dll,core/os/NGA_MDF_Postprocessor.iby,os/mm,,,
 sys\bin\NHwrParser.dll,/epoc32/release/armv5/urel/nhwrparser.dll,core/app/pnp.iby,app/devicecontrol,,,
@@ -4715,13 +4715,13 @@
 Sys\Bin\nlanpppsy.dll,/epoc32/release/armv5/urel/nlanpppsy.dll,core/mw/nla_npppsy.iby,mw/locationsrv,,,
 Sys\Bin\nlasuplpsy.dll,/epoc32/release/armv5/urel/nlasuplpsy.dll,core/mw/nla_suplpsy.iby,mw/locationsrv,,,
 sys\bin\nodemessages.dll,/epoc32/release/armv5/urel/nodemessages.dll,nodemessages.iby,os/commsfw,,,
-sys\bin\Notepad.exe,/epoc32/release/armv5/urel/notepad.exe,core/app/notepad.iby,app/organizer,Out,WR,application
+sys\bin\Notepad.exe,/epoc32/release/armv5/urel/notepad.exe,core/app/notepad.iby,app/organizer,,WR,application
 Sys\Bin\notessearchplugin.dll,/epoc32/release/armv5/urel/notessearchplugin.dll,core/app/notessearchplugin.iby,app/organizer,,,
 sys\bin\NotUi.dll,/epoc32/release/armv5/urel/notui.dll,core/app/MmsUi.iby,app/messaging,,,
-sys\bin\notviewer.exe,/epoc32/release/armv5/urel/notviewer.exe,core/app/MmsUi.iby,app/messaging,Out,WR,application
+sys\bin\notviewer.exe,/epoc32/release/armv5/urel/notviewer.exe,core/app/MmsUi.iby,app/messaging,,WR,application
 Sys\Bin\npbrowseraudiovideoplugin.dll,/epoc32/release/armv5/urel/npbrowseraudiovideoplugin.dll,core/app/BrowserAudioVideoPlugin.iby,app/webuis,,,
 sys\bin\NpdLib.dll,/epoc32/release/armv5/urel/npdlib.dll,core/app/npdlib.iby,app/organizer,,,
-sys\bin\NpdViewer.exe,/epoc32/release/armv5/urel/npdviewer.exe,core/app/npdviewer.iby,app/organizer,Out,WR,application
+sys\bin\NpdViewer.exe,/epoc32/release/armv5/urel/npdviewer.exe,core/app/npdviewer.iby,app/organizer,,WR,application
 sys\bin\npscript.dll,/epoc32/release/armv5/urel/npscript.dll,core/mw/webkit.iby,mw/web,,,
 Sys\Bin\npsvgtplugin.dll,/epoc32/release/armv5/urel/npsvgtplugin.dll,core/mw/SvgtPluginEcom.iby,mw/svgt,,,
 Sys\Bin\npSystemInfoPlugin.dll,/epoc32/release/armv5/urel/npsysteminfoplugin.dll,core/app/BrowserSystemInfoPlugin.iby,app/webuis,,,
@@ -4852,7 +4852,7 @@
 sys\bin\omxilgenericilif.dll,/epoc32/release/armv5/urel/omxilgenericilif.dll,milif.iby,os/mm,,,
 Sys\Bin\omxilpcmrenderer.dll,/epoc32/release/armv5/urel/omxilpcmrenderer.dll,omxilcompref.iby,os/mm,,,
 Sys\Bin\omxilsymbianloader.dll,/epoc32/release/armv5/urel/omxilsymbianloader.dll,omxilcore.iby,os/mm,,,
-sys\bin\OnlineSupport.exe,/epoc32/release/armv5/urel/onlinesupport.exe,core/app/onlinesupport.iby,app/devicecontrol,Out,WR,application
+sys\bin\OnlineSupport.exe,/epoc32/release/armv5/urel/onlinesupport.exe,core/app/onlinesupport.iby,app/devicecontrol,,WR,application
 sys\bin\oodmonitor.dll,/epoc32/release/armv5/urel/oodmonitor.dll,core/mw/oodmonitor.iby,mw/appsupport,,,
 sys\bin\oommonitor.dll,/epoc32/release/armv5/urel/oommonitor.dll,core/mw/oommonitor.iby,mw/appsupport,,,
 Sys\Bin\OpenChannelCmd.dll,/epoc32/release/armv5/urel/openchannelcmd.dll,core/mw/satserver.iby,mw/phonesrv,,,
@@ -4951,7 +4951,7 @@
 sys\bin\PhoneServer.exe,/epoc32/release/armv5/urel/phoneserver.exe,core/mw/PhoneServer.iby,mw/phonesrv,,,
 sys\bin\phonesettings.dll,/epoc32/release/armv5/urel/phonesettings.dll,core/app/PhoneSettings.iby,mw/phonesrv,,,
 Sys\Bin\PHONETSY.TSY,/epoc32/release/armv5/urel/phonetsy.tsy,ctsy.iby,os/cellularsrv,,,
-sys\bin\phoneui.exe,/epoc32/release/armv5/urel/phoneui.exe,core/app/phoneui.iby,app/phone,Out,WR,application
+sys\bin\phoneui.exe,/epoc32/release/armv5/urel/phoneui.exe,core/app/phoneui.iby,app/phone,,WR,application
 sys\bin\phoneuicontrol.dll,/epoc32/release/armv5/urel/phoneuicontrol.dll,core/app/phoneui.iby,app/phone,,,
 sys\bin\phoneuistates.dll,/epoc32/release/armv5/urel/phoneuistates.dll,core/app/phoneui.iby,app/phone,,,
 sys\bin\phoneuiutils.dll,/epoc32/release/armv5/urel/phoneuiutils.dll,core/app/phoneui.iby,app/phone,,,
@@ -5075,7 +5075,7 @@
 sys\bin\PushMtmUtil.dll,/epoc32/release/armv5/urel/pushmtmutil.dll,core/app/PushMtm.iby,app/webuis,,,
 Sys\Bin\PushMtmWhiteListAdapter.dll,/epoc32/release/armv5/urel/pushmtmwhitelistadapter.dll,core/app/PushMtm.iby,app/webuis,,,
 Sys\Bin\pushsecurity.dll,/epoc32/release/armv5/urel/pushsecurity.dll,core/app/wappush.iby,mw/messagingmw,,,
-sys\bin\PushViewer.exe,/epoc32/release/armv5/urel/pushviewer.exe,core/app/PushMtm.iby,app/webuis,Out,WR,application
+sys\bin\PushViewer.exe,/epoc32/release/armv5/urel/pushviewer.exe,core/app/PushMtm.iby,app/webuis,,WR,application
 Sys\Bin\pushwatcher.dll,/epoc32/release/armv5/urel/pushwatcher.dll,core/app/wappush.iby,mw/messagingmw,,,
 sys\bin\qcncodecs.dll,/epoc32/release/armv5/urel/qcncodecs.dll,core/mw/qt.iby,mw/qt,,,
 sys\bin\qdp_base.dll,/epoc32/release/armv5/urel/qdp_base.dll,hci_framework.iby,os/bt,,,
@@ -5373,7 +5373,7 @@
 Sys\Bin\SetUpEventListCmd.dll,/epoc32/release/armv5/urel/setupeventlistcmd.dll,core/mw/satserver.iby,mw/phonesrv,,,
 Sys\Bin\SetUpIdleModeTextCmd.dll,/epoc32/release/armv5/urel/setupidlemodetextcmd.dll,core/mw/satserver.iby,mw/phonesrv,,,
 Sys\Bin\SetUpMenuCmd.dll,/epoc32/release/armv5/urel/setupmenucmd.dll,core/mw/satserver.iby,mw/phonesrv,,,
-sys\bin\sflibopenvgrefimpl.dll,/epoc32/release/armv5/urel/sflibopenvgrefimpl.dll,../../../rom/config/sf_refhw/bigrom.oby,os/graphics,,,
+sys\bin\sflibopenvgrefimpl.dll,/epoc32/release/armv5/urel/sflibopenvgrefimpl.dll,../../../rom/config/sf_refhw/bigrom.oby,os/graphics,Stem,MW,Performance optimisation
 sys\bin\Sharpness.pgn,/epoc32/release/armv5/urel/sharpness.pgn,core/app/ImageEditorSharpnessPlugin.iby,app/imgeditor,,,
 sys\bin\shiftjis_docomo_shared.dll,/epoc32/release/armv5/urel/shiftjis_docomo_shared.dll,charconv_japanese_docomo.iby,os/textandloc,,,
 Sys\Bin\shiftjis_ntt_docomo.dll,/epoc32/release/armv5/urel/shiftjis_ntt_docomo.dll,charconv_japanese_docomo.iby,os/textandloc,,,
@@ -5452,7 +5452,7 @@
 sys\bin\smss.dll,/epoc32/release/armv5/urel/smss.dll,gtsmsmtm.iby,app/messaging,,,
 Sys\Bin\SmsStrict.DLL,/epoc32/release/armv5/urel/smsstrict.dll,core/app/SmsStrict.iby,app/messaging,,,
 sys\bin\SmsU.dll,/epoc32/release/armv5/urel/smsu.dll,smsstack.iby,os/cellularsrv,,,
-sys\bin\SmsViewer.exe,/epoc32/release/armv5/urel/smsviewer.exe,core/app/SmsViewer.iby,app/messaging,Out,WR,application
+sys\bin\SmsViewer.exe,/epoc32/release/armv5/urel/smsviewer.exe,core/app/SmsViewer.iby,app/messaging,,WR,application
 sys\bin\smts.dll,/epoc32/release/armv5/urel/smts.dll,gtemailmtm.iby,app/messaging,,,
 sys\bin\smum.dll,/epoc32/release/armv5/urel/smum.dll,core/app/Smum.iby,app/messaging,,,
 sys\bin\snapapp.exe,/epoc32/release/armv5/urel/snapapp.exe,base_syborg_ui.iby,adaptation/qemu,,,
@@ -5479,7 +5479,7 @@
 sys\bin\SpeechRecognitionUtility.dll,/epoc32/release/armv5/urel/speechrecognitionutility.dll,ASR.iby,os/mm,,,
 sys\bin\speechsynthesis.dll,/epoc32/release/armv5/urel/speechsynthesis.dll,core/app/srsf.iby,app/speechsrv,,,
 sys\bin\speechsynthesisserver.exe,/epoc32/release/armv5/urel/speechsynthesisserver.exe,core/app/srsf.iby,app/speechsrv,,,
-sys\bin\Speeddial.exe,/epoc32/release/armv5/urel/speeddial.exe,core/app/Speeddial.iby,app/contacts,Out,WR,application
+sys\bin\Speeddial.exe,/epoc32/release/armv5/urel/speeddial.exe,core/app/Speeddial.iby,app/contacts,,WR,application
 Sys\Bin\speeddialgsplugin.dll,/epoc32/release/armv5/urel/speeddialgsplugin.dll,core/app/Speeddial.iby,app/contacts,,,
 sys\bin\SplashScreen.exe,/epoc32/release/armv5/urel/splashscreen.exe,core/mw/splashscreen.iby,mw/appsupport,,,
 sys\bin\spsbackuphelper.exe,/epoc32/release/armv5/urel/spsbackuphelper.exe,core/mw/spsettings.iby,mw/phonesrv,,,
@@ -5487,7 +5487,7 @@
 sys\bin\sqlite3.dll,/epoc32/release/armv5/urel/sqlite3.dll,core/mw/sqlite3.iby,os/persistentdata,,,
 sys\bin\sqlsrv.exe,/epoc32/release/armv5/urel/sqlsrv.exe,sql.iby,os/persistentdata,,,
 Sys\Bin\srchaiwprovider.dll,/epoc32/release/armv5/urel/srchaiwprovider.dll,core/app/searchapp.iby,app/organizer,,,
-sys\bin\srchuiapp.exe,/epoc32/release/armv5/urel/srchuiapp.exe,core/app/searchapp.iby,app/organizer,Out,WR,application
+sys\bin\srchuiapp.exe,/epoc32/release/armv5/urel/srchuiapp.exe,core/app/searchapp.iby,app/organizer,,WR,application
 sys\bin\srchuicommon.dll,/epoc32/release/armv5/urel/srchuicommon.dll,core/app/searchapp.iby,app/organizer,,,
 sys\bin\srchuigenui.dll,/epoc32/release/armv5/urel/srchuigenui.dll,core/app/searchapp.iby,app/organizer,,,
 Sys\Bin\srchuiindeviceserviceplugin.dll,/epoc32/release/armv5/urel/srchuiindeviceserviceplugin.dll,core/app/searchapp.iby,app/organizer,,,
@@ -5566,7 +5566,7 @@
 sys\bin\SVGTFileViewDetails.dll,/epoc32/release/armv5/urel/svgtfileviewdetails.dll,core/app/svgtfileviewdetails.iby,app/graphicsuis,,,
 Sys\Bin\SVGTScreenSaverPlugin.dll,/epoc32/release/armv5/urel/svgtscreensaverplugin.dll,core/app/svgscreensaverplugin.iby,app/graphicsuis,,,
 sys\bin\SVGTUIControl.dll,/epoc32/release/armv5/urel/svgtuicontrol.dll,core/app/svgtuicontrol.iby,app/graphicsuis,,,
-sys\bin\SVGTViewerApp.exe,/epoc32/release/armv5/urel/svgtviewerapp.exe,core/app/svgtviewerapp.iby,app/graphicsuis,Out,WR,application
+sys\bin\SVGTViewerApp.exe,/epoc32/release/armv5/urel/svgtviewerapp.exe,core/app/svgtviewerapp.iby,app/graphicsuis,,WR,application
 sys\bin\svgviewer.exe,/epoc32/release/armv5/urel/svgviewer.exe,customervariant/app/qtdemoapps.iby,mw/qt,,WR,application
 Sys\Bin\svp.dll,/epoc32/release/armv5/urel/svp.dll,core/app/svp.iby,app/iptelephony,,,
 sys\bin\svphostfs.exe,/epoc32/release/armv5/urel/svphostfs.exe,base_syborg_ui.iby,adaptation/qemu,,,
@@ -5635,7 +5635,7 @@
 sys\bin\taskswitcher.exe,/epoc32/release/armv5/urel/taskswitcher.exe,core/mw/taskswitcher.iby,app/homescreen,,WR,application
 Sys\Bin\tcadapter.dll,/epoc32/release/armv5/urel/tcadapter.dll,core/mw/tcadapter.iby,mw/remotemgmt,,,
 sys\bin\tckrunner.dll,/epoc32/release/armv5/urel/tckrunner.dll,core/tools/javatest.iby,app/jrt,,,
-sys\bin\tckrunner.exe,/epoc32/release/armv5/urel/tckrunner.exe,core/tools/javatest.iby,app/jrt,Out,WR,application
+sys\bin\tckrunner.exe,/epoc32/release/armv5/urel/tckrunner.exe,core/tools/javatest.iby,app/jrt,,WR,application
 sys\bin\tcpip6.prt,/epoc32/release/armv5/urel/tcpip6.prt,tcpip6.iby,os/networkingsrv,,,
 sys\bin\TEFCleanup.exe,/epoc32/release/armv5/urel/tefcleanup.exe,tefcleanup.iby,(unknown),,,
 Sys\bin\TEFUtilityServer.exe,/epoc32/release/armv5/urel/tefutilityserver.exe,tefutilityserver.iby,(unknown),,,
@@ -5684,7 +5684,7 @@
 sys\bin\tonedata.dll,/epoc32/release/armv5/urel/tonedata.dll,acf.iby,os/mm,,,
 Sys\Bin\tonehwdevice.dll,/epoc32/release/armv5/urel/tonehwdevice.dll,refacladaptation.iby,os/mm,,,
 sys\bin\touchfeedback.dll,/epoc32/release/armv5/urel/touchfeedback.dll,core/mw/tactilefeedback.iby,mw/hapticsservices,,,
-sys\bin\TouchScreenCalib.exe,/epoc32/release/armv5/urel/touchscreencalib.exe,core/app/touchscreencalib.iby,app/settingsuis,Out,WR,application
+sys\bin\TouchScreenCalib.exe,/epoc32/release/armv5/urel/touchscreencalib.exe,core/app/touchscreencalib.iby,app/settingsuis,,WR,application
 sys\bin\TransferRateMonitor.dll,/epoc32/release/armv5/urel/transferratemonitor.dll,core/mw/EnhancedMediaClient.iby,mw/mmmw,,,
 sys\bin\transporthandler.dll,/epoc32/release/armv5/urel/transporthandler.dll,gtemailmtm.iby,app/messaging,,,
 sys\bin\trkdummyapp.exe,/epoc32/release/armv5/urel/trkdummyapp.exe,base.iby,os/kernelhwsrv,,,
@@ -5727,7 +5727,7 @@
 sys\bin\umtsif.dll,/epoc32/release/armv5/urel/umtsif.dll,umtsif.iby,os/cellularsrv,,,
 sys\bin\Undo.dll,/epoc32/release/armv5/urel/undo.dll,Form.iby,os/textandloc,,,
 sys\bin\UniDataModel.dll,/epoc32/release/armv5/urel/unidatamodel.dll,core/app/UniEditor.iby,app/messaging,,,
-sys\bin\UniEditor.exe,/epoc32/release/armv5/urel/unieditor.exe,core/app/UniEditor.iby,app/messaging,Out,WR,application
+sys\bin\UniEditor.exe,/epoc32/release/armv5/urel/unieditor.exe,core/app/UniEditor.iby,app/messaging,,WR,application
 Sys\Bin\UniMmsPlugin.dll,/epoc32/release/armv5/urel/unimmsplugin.dll,core/app/UniEditor.iby,app/messaging,,,
 sys\bin\UniMtms.dll,/epoc32/release/armv5/urel/unimtms.dll,core/app/UniEditor.iby,app/messaging,,,
 sys\bin\UniPluginApi.dll,/epoc32/release/armv5/urel/unipluginapi.dll,core/app/UniEditor.iby,app/messaging,,,
@@ -5787,10 +5787,10 @@
 Sys\Bin\vccperformer.dll,/epoc32/release/armv5/urel/vccperformer.dll,core/app/vcc.iby,app/iptelephony,,,
 sys\bin\vccuipropertyhandler.dll,/epoc32/release/armv5/urel/vccuipropertyhandler.dll,core/app/vcc.iby,app/iptelephony,,,
 sys\bin\vccutils.dll,/epoc32/release/armv5/urel/vccutils.dll,core/app/vcc.iby,app/iptelephony,,,
-sys\bin\vcexecutorapp.exe,/epoc32/release/armv5/urel/vcexecutorapp.exe,core/app/srsf.iby,app/speechsrv,Out,WR,application
-sys\bin\vcommand.exe,/epoc32/release/armv5/urel/vcommand.exe,core/app/vcommand.iby,app/speechsrv,Out,WR,application
+sys\bin\vcexecutorapp.exe,/epoc32/release/armv5/urel/vcexecutorapp.exe,core/app/srsf.iby,app/speechsrv,,WR,application
+sys\bin\vcommand.exe,/epoc32/release/armv5/urel/vcommand.exe,core/app/vcommand.iby,app/speechsrv,,WR,application
 sys\bin\vcommandhandler.dll,/epoc32/release/armv5/urel/vcommandhandler.dll,core/app/srsf.iby,app/speechsrv,,,
-sys\bin\vcommandmanager.exe,/epoc32/release/armv5/urel/vcommandmanager.exe,core/app/srsf.iby,app/speechsrv,Out,WR,application
+sys\bin\vcommandmanager.exe,/epoc32/release/armv5/urel/vcommandmanager.exe,core/app/srsf.iby,app/speechsrv,,WR,application
 sys\bin\vcxconnectionutility.dll,/epoc32/release/armv5/urel/vcxconnectionutility.dll,core/mw/videoconnutility.iby,mw/videoutils,,,
 sys\bin\vcxconnutilpsworker.exe,/epoc32/release/armv5/urel/vcxconnutilpsworker.exe,core/mw/videoconnutilpsworker.iby,mw/videoutils,,,
 sys\bin\vcxhgmyvideos.dll,/epoc32/release/armv5/urel/vcxhgmyvideos.dll,core/app/hgmyvideos.iby,app/videoplayer,,,
@@ -5812,11 +5812,11 @@
 sys\bin\VideoConversionApi.dll,/epoc32/release/armv5/urel/videoconversionapi.dll,core/app/UniEditor.iby,app/messaging,,,
 sys\bin\videoplaylistutility.dll,/epoc32/release/armv5/urel/videoplaylistutility.dll,core/mw/videolaylistutility.iby,mw/mmappfw,,,
 sys\bin\videorenderer.dll,/epoc32/release/armv5/urel/videorenderer.dll,videorenderer.iby,os/mm,,,
-sys\bin\VideoServices.exe,/epoc32/release/armv5/urel/videoservices.exe,core/app/VideoServices.iby,app/webuis,Out,WR,application
+sys\bin\VideoServices.exe,/epoc32/release/armv5/urel/videoservices.exe,core/app/VideoServices.iby,app/webuis,,WR,application
 sys\bin\VideoSource.dll,/epoc32/release/armv5/urel/videosource.dll,core/app/videosource.iby,app/videotelephony,,,
 sys\bin\Videoteleng.dll,/epoc32/release/armv5/urel/videoteleng.dll,core/app/videoteleng.iby,app/videotelephony,,,
 sys\bin\videotelproto.dll,/epoc32/release/armv5/urel/videotelproto.dll,core/app/videoteleng.iby,app/videotelephony,,,
-sys\bin\videotelui.exe,/epoc32/release/armv5/urel/videotelui.exe,core/app/videotelui.iby,app/videotelephony,Out,WR,application
+sys\bin\videotelui.exe,/epoc32/release/armv5/urel/videotelui.exe,core/app/videotelui.iby,app/videotelephony,,WR,application
 sys\bin\viewcli.dll,/epoc32/release/armv5/urel/viewcli.dll,uikon.iby,mw/appsupport,,,
 sys\bin\viewsrv.dll,/epoc32/release/armv5/urel/viewsrv.dll,uikon.iby,mw/appsupport,,,
 sys\bin\vimpstcmdprocess.dll,/epoc32/release/armv5/urel/vimpstcmdprocess.dll,core/app/imuiservicetab.iby,app/conversations,,,
@@ -5830,7 +5830,7 @@
 sys\bin\vjcomp.dll,/epoc32/release/armv5/urel/vjcomp.dll,ppp.iby,os/networkingsrv,,,
 sys\bin\Vm.exe,/epoc32/release/armv5/urel/vm.exe,core/app/vmbx.iby,app/phone,,,
 sys\bin\vmbx.dll,/epoc32/release/armv5/urel/vmbx.dll,core/mw/vmbxengine.iby,mw/phonesrv,,,
-sys\bin\Voicerecorder.exe,/epoc32/release/armv5/urel/voicerecorder.exe,core/app/Voicerecorder.iby,app/voicerec,Out,WR,application
+sys\bin\Voicerecorder.exe,/epoc32/release/armv5/urel/voicerecorder.exe,core/app/Voicerecorder.iby,app/voicerec,,WR,application
 sys\bin\VoicerecorderRecview.DLL,/epoc32/release/armv5/urel/voicerecorderrecview.dll,core/app/Voicerecorder.iby,app/voicerec,,,
 sys\bin\VoicerecorderUtils.DLL,/epoc32/release/armv5/urel/voicerecorderutils.dll,core/app/Voicerecorder.iby,app/voicerec,,,
 sys\bin\voiceUiRecognition.dll,/epoc32/release/armv5/urel/voiceuirecognition.dll,core/app/voiceui.iby,app/speechsrv,,,
@@ -6167,4 +6167,4 @@
 Private\2000cd0f\dummy.txt,/epoc32/winscw/c/zsh/dummy.txt,zsh.iby,mw/appsupport,,,
 private\10003a3f\import\apps\weatherinfo_reg.rsc,/epoc32/data/z/private/10003a3f/import/apps/weatherinfo_reg.rsc,weatherinfo.iby,mw/qt,,,
 resource\apps\weatherinfo.rsc,/epoc32/data/z/resource/apps/weatherinfo.rsc,weatherinfo.iby,mw/qt,,,
-sys\bin\weatherinfo.exe,/epoc32/release/armv5/urel/weatherinfo.exe,weatherinfo.iby,mw/qt,,WR,Stem kit use case
+sys\bin\weatherinfo.exe,/epoc32/release/armv5/urel/weatherinfo.exe,weatherinfo.iby,mw/qt,In,WR,Stem kit use case
--- a/syborg_stem/static_dependencies.txt	Wed Oct 27 15:05:33 2010 +0100
+++ b/syborg_stem/static_dependencies.txt	Wed Oct 27 15:24:40 2010 +0100
@@ -1212,7 +1212,6 @@
 private\10003a3f\import\apps\tckrunner_reg.rsc	/epoc32/data/z/private/10003a3f/apps/tckrunner_reg.rsc	sys\bin\tckrunner.exe
 private\10003a3f\import\apps\videotelui_reg.rsc	/epoc32/data/z/private/10003a3f/apps/videotelui_reg.rsc	sys\bin\videotelui.exe
 private\10003a3f\import\apps\vm_reg.rsc	/epoc32/data/z/private/10003a3f/apps/vm_reg.rsc	sys\bin\vm.exe
-private\10003a3f\import\apps\weatherinfo_reg.rsc	/epoc32/data/z/private/10003a3f/import/apps/weatherinfo_reg.rsc	sys\bin\weatherinfo.exe
 private\10003a3f\import\apps\wiggly_reg.rsc	/epoc32/data/z/private/10003a3f/import/apps/wiggly_reg.rsc	sys\bin\wiggly.exe
 private\10003a3f\import\apps\wmdrmdlaapp_reg.rsc	/epoc32/data/z/private/10003a3f/apps/wmdrmdlaapp_reg.rsc	sys\bin\wmdrmdlaapp.exe
 private\2000D75B\fail\failcmdlist.rsc	/epoc32/data/z/private/2000d75b/fail/failcmdlist.rsc	sys\bin\SysAp.exe:sys\bin\cmncustomcmds.dll:sys\bin\customcmds.dll:sys\bin\syserrcmd.dll
@@ -1673,7 +1672,6 @@
 resource\apps\vimpstui.mif	/epoc32/data/z/resource/apps/vimpstui.mif	Sys\Bin\vimpstui.dll
 resource\apps\vuivoicerecognition.rsc	/epoc32/data/z/resource/apps/vuivoicerecognition.rsc	sys\bin\vuivoicerecognition.exe
 resource\apps\vuivoicerecognition_aif.mif	/epoc32/data/z/resource/apps/vuivoicerecognition_aif.mif	sys\bin\vuivoicerecognition.exe
-resource\apps\weatherinfo.rsc	/epoc32/data/z/resource/apps/weatherinfo.rsc	sys\bin\weatherinfo.exe
 resource\apps\widgetmanager.mif	/epoc32/data/z/resource/apps/widgetmanager.mif	Sys\Bin\widgetmanager.dll
 resource\apps\wiggly.rsc	/epoc32/data/z/resource/apps/wiggly.rsc	sys\bin\wiggly.exe
 resource\apps\wlanplugin.mif	/epoc32/data/z/resource/apps/wlanplugin.mif	Sys\Bin\wlanplugin.DLL
@@ -1851,7 +1849,7 @@
 sys\bin\CommonDSY.DLL	/epoc32/release/armv5/urel/commondsy.dll	sid=101fb441:dossrv[10205051].dll:drtaeabi.dll:efsrv[100039e4].dll:euser[100039e5].dll:scppnwdl.dll
 sys\bin\ComposerPluginInterface.dll	/epoc32/release/armv5/urel/composerplugininterface.dll	sid=2000717e:drtaeabi.dll:ecom[10009d8e].dll:euser[100039e5].dll:scppnwdl.dll
 sys\bin\ConArc.dll	/epoc32/release/armv5/urel/conarc.dll	sid=10003a2f:apmime[10003a1a].dll:bafl[10003a0f].dll:drtaeabi.dll:ecom[10009d8e].dll:efsrv[100039e4].dll:estor[10003b0d].dll:euser[100039e5].dll:scppnwdl.dll
-sys\bin\Cone.dll	/epoc32/release/armv5/urel/stem_cone.dll	sid=10003a41:bafl[10003a0f].dll:centralrepository[101fbc70].dll:drtaeabi.dll:ecom[10009d8e].dll:efsrv[100039e4].dll:egul[100048a2].dll:estor[10003b0d].dll:euser[100039e5].dll:gdi[10003b15].dll:hal[100039e8].dll:scppnwdl.dll:viewcli[10003f33].dll:ws32[10003b21].dll
+sys\bin\Cone.dll	/epoc32/release/armv5/urel/cone.dll	sid=10003a41:bafl[10003a0f].dll:centralrepository[101fbc70].dll:drtaeabi.dll:ecom[10009d8e].dll:efsrv[100039e4].dll:egul[100048a2].dll:estor[10003b0d].dll:euser[100039e5].dll:gdi[10003b15].dll:hal[100039e8].dll:mediaclientaudio[10003992].dll:mediaclient[10003942].dll:scppnwdl.dll:viewcli[10003f33].dll:ws32[10003b21].dll
 sys\bin\ConfigurationComponentsFactory.dll	/epoc32/release/armv5/urel/configurationcomponentsfactory.dll	sid=10207b99:AudioOutputControlUtilityProxy[10207ba3].dll:RestrictedAudioOutputProxy[10207b98].dll:drtaeabi.dll:euser[100039e5].dll:scppnwdl.dll
 sys\bin\ConnTest.exe	/epoc32/release/armv5/urel/conntest.exe	sid=101f6d2b:AKNSKINS[10005a26].dll:AknNotify[010f9a43].dll:apgrfx[10003a3c].dll:apparc[10003a3d].dll:avkon[100056c6].dll:bafl[10003a0f].dll:cmmanager[10207376].dll:commdb[10004e1c].dll:cone[10003a41].dll:dfpaeabi.dll:drtaeabi.dll:drtrvct2_2.dll:ecom[10009d8e].dll:efsrv[100039e4].dll:egul[100048a2].dll:eikcoctl[1000489e].dll:eikcore[10004892].dll:eikctl[1000489c].dll:esock_api_ext[102822fe].dll:esock[10003d3f].dll:estor[10003b0d].dll:etext[10003a1c].dll:euser[100039e5].dll:extendedconnpref[20027034].dll:gdi[10003b15].dll:hal[100039e8].dll:http[1000a441].dll:inetprotutil[100041d1].dll:insock[10003d44].dll:netmeta[1020430b].dll:scppnwdl.dll:sendui[100058f0].dll:ws32[10003b21].dll
 sys\bin\ConnUiUtilsNotif.DLL	/epoc32/release/armv5/urel/connuiutilsnotif.dll	sid=101fd668:AKNSKINS[10005a26].dll:AknIcon[1020735a].dll:AknNotify[010f9a43].dll:CdlEngine[101f8243].DLL:CommonEngine[100058fe].dll:akncapserverclient[10207244].dll:avkon[100056c6].dll:bafl[10003a0f].dll:centralrepository[101fbc70].dll:charconv[10003b11].dll:cmmanager[10207376].dll:cone[10003a41].dll:drtaeabi.dll:ecom[10009d8e].dll:egul[100048a2].dll:eikcoctl[1000489e].dll:eikcore[10004892].dll:eikdlg[10004898].dll:eiksrvui[100053d0].dll:eiksrv[10003a4a].dll:euser[100039e5].dll:featmgr[10005a2b].dll:scppnwdl.dll
@@ -2363,7 +2361,7 @@
 sys\bin\SERVICEREQUEST.DLL	/epoc32/release/armv5/urel/servicerequest.dll	sid=10005a3d:AknNotify[010f9a43].dll:CommonEngine[100058fe].dll:avkon[100056c6].dll:cone[10003a41].dll:drtaeabi.dll:euser[100039e5].dll:scppnwdl.dll
 sys\bin\SIGCOMP.DLL	/epoc32/release/armv5/urel/sigcomp.dll	sid=101f9582:drtaeabi.dll:ecom[10009d8e].dll:efsrv[100039e4].dll:euser[100039e5].dll:hash[10005e11].dll:scppnwdl.dll
 sys\bin\SIPDummyPRT.PRT	/epoc32/release/armv5/urel/sipdummyprt.prt	sid=10274cab:drtaeabi.dll:esocksvr[101f7482].dll:euser[100039e5].dll:scppnwdl.dll
-sys\bin\SVGEngine.dll	/epoc32/release/armv5/urel/stem_svgengine.dll	sid=101f856e:VGRenderer[0152d27e].dll:XMLInterface[101f9750].dll:avkon[100056c6].dll:bafl[10003a0f].dll:bitgdi[10003b18].dll:caf.dll:charconv[10003b11].dll:dfpaeabi.dll:drtaeabi.dll:efsrv[100039e4].dll:estor[10003b0d].dll:euser[100039e5].dll:ezlib[10005706].dll:fbscli[10003a15].dll:gdi[10003b15].dll:hal[100039e8].dll:imageconversion[101f45ad].dll:imut[10004837].dll:scppnwdl.dll
+sys\bin\SVGEngine.dll	/epoc32/release/armv5/urel/svgengine.dll	sid=101f856e:VGRenderer[0152d27e].dll:XMLInterface[101f9750].dll:avkon[100056c6].dll:bafl[10003a0f].dll:bitgdi[10003b18].dll:caf.dll:charconv[10003b11].dll:dfpaeabi.dll:drtaeabi.dll:efsrv[100039e4].dll:estor[10003b0d].dll:euser[100039e5].dll:ezlib[10005706].dll:fbscli[10003a15].dll:gdi[10003b15].dll:hal[100039e8].dll:imageconversion[101f45ad].dll:imut[10004837].dll:mediaclientaudio[10003992].dll:scppnwdl.dll
 sys\bin\SVGEngineJI.dll	/epoc32/release/armv5/urel/svgengineji.dll	sid=101f8821:SVGEngine[101f856e].dll:dfpaeabi.dll:drtaeabi.dll:euser[100039e5].dll:fbscli[10003a15].dll:hal[100039e8].dll:scppnwdl.dll
 sys\bin\SVGTAppObserverUtil.dll	/epoc32/release/armv5/urel/svgtappobserverutil.dll	sid=102071e5:APEngine[10008d3a].dll:AknNotify[010f9a43].dll:BrowserLauncher[101f8559].dll:CommonDialogs[101f4688].dll:CommonEngine[100058fe].dll:CommonUI[100058fd].dll:DownloadMgrUiLib.dll:DownloadMgr[10008d5f].dll:SVGTUIControl[101f8749].dll:ServiceHandler[101f865a].dll:apmime[10003a1a].dll:avkon[100056c6].dll:bafl[10003a0f].dll:centralrepository[101fbc70].dll:commdb[10004e1c].dll:cone[10003a41].dll:drtaeabi.dll:efsrv[100039e4].dll:eikcore[10004892].dll:eikctl[1000489c].dll:euser[100039e5].dll:imut[10004837].dll:inetprotutil[100041d1].dll:scppnwdl.dll:sysutil[10005943].dll
 sys\bin\SVGTFileViewDetails.dll	/epoc32/release/armv5/urel/svgtfileviewdetails.dll	sid=10004420:CommonEngine[100058fe].dll:DRMHelper[101f8647].dll:avkon[100056c6].dll:bafl[10003a0f].dll:caf.dll:cone[10003a41].dll:dfpaeabi.dll:drtaeabi.dll:drtrvct2_2.dll:efsrv[100039e4].dll:eikcoctl[1000489e].dll:euser[100039e5].dll:scppnwdl.dll:tzclient[1020383d].dll
@@ -2666,7 +2664,7 @@
 sys\bin\avcontentdirectory.dll	/epoc32/release/armv5/urel/avcontentdirectory.dll	sid=10204159:avmediaserverclient[101f977d].dll:bafl[10003a0f].dll:bitmaptransforms[101f45ec].dll:cafutils.dll:caf.dll:centralrepository[101fbc70].dll:dlnawebserver[10204165].dll:drtaeabi.dll:drtrvct2_2.dll:ecom[10009d8e].dll:edbms[10003b0e].dll:efsrv[100039e4].dll:esock[10003d3f].dll:estor[10003b0d].dll:euser[100039e5].dll:fbscli[10003a15].dll:httptransfer[20009ca0].dll:imageconversion[101f45ad].dll:inetprotutil[100041d1].dll:insock[10003d44].dll:platformenv[101f857f].dll:scppnwdl.dll:sysutil[10005943].dll:upnpavobjects[10208a13].dll:upnpipserversutils[2001b2b9].dll:upnpserviceframework[2001b2b8].dll:xmlenginedom[101f9781].dll
 sys\bin\avcontrolframework.dll	/epoc32/release/armv5/urel/avcontrolframework.dll	sid=10204164:bafl[10003a0f].dll:drtaeabi.dll:euser[100039e5].dll:scppnwdl.dll:upnpcontrolpointbase[2001b2ba].dll:upnpserviceframework[2001b2b8].dll
 sys\bin\avctpservices.dll	/epoc32/release/armv5/urel/avctpservices.dll	sid=10208dd5:bluetoothav.dll:bluetooth.dll:drtaeabi.dll:drtrvct2_2.dll:esock[10003d3f].dll:euser[100039e5].dll:scppnwdl.dll
-sys\bin\avkon.dll	/epoc32/release/armv5/urel/stem_avkon.dll	sid=100056c6:AKNSKINS[10005a26].dll:AknIcon[1020735a].dll:AknLayout2Scalable[102040d7].dll:AknNotify[010f9a43].dll:AknPictograph[10207364].dll:CdlEngine[101f8243].dll:CommonEngine[100058fe].dll:FontProvider[1020509c].dll:FontUtils[1020509d].dll:NumberGrouping[10003fd3].dll:PtiEngine[101f8610].dll:ServiceHandler[101f865a].dll:aiwdialdata[102828ab].dll:akncapserverclient[10207244].dll:aknlayout2[10158c94].dll:aknlistloadertfx.dll:aknphysics[20021194].dll:akntransitionutils.dll:apgrfx[10003a3c].dll:apmime[10003a1a].dll:apparc[10003a3d].dll:bafl[10003a0f].dll:bitgdi[10003b18].dll:bmpanim[100048f2].dll:cenrepnotifhandler[10200c8a].dll:centralrepository[101fbc70].dll:cone[10003a41].dll:dfpaeabi.dll:drtaeabi.dll:drtrvct2_2.dll:ecom[10009d8e].dll:efsrv[100039e4].dll:egul[100048a2].dll:eikcoctl[1000489e].dll:eikcore[10004892].dll:eikctl[1000489c].dll:eikdlg[10004898].dll:eiksrvc[100053b1].dll:estor[10003b0d].dll:etext[10003a1c].dll:euser[100039e5].dll:fbscli[10003a15].dll:featmgr[10005a2b].dll:fepbase[10003b14].dll:findutil[10005a19].dll:form[10003b27].dll:gdi[10003b15].dll:gfxtrans[102822a4].dll:hlplch[101f423b].dll:hwrmlightclient[10205029].dll:insock[10003d44].dll:linebreak[101f747f].dll:numberconversion[101f7800].dll:oommonitor[10282dbf].dll:scppnwdl.dll:tacticon[2001fe4e].dll:touchfeedback[2000b491].dll:ws32[10003b21].dll
+sys\bin\avkon.dll	/epoc32/release/armv5/urel/avkon.dll	sid=100056c6:AKNSKINS[10005a26].dll:AknIcon[1020735a].dll:AknLayout2Scalable[102040d7].dll:AknNotify[010f9a43].dll:AknPictograph[10207364].dll:CdlEngine[101f8243].dll:CommonEngine[100058fe].dll:FontProvider[1020509c].dll:FontUtils[1020509d].dll:NumberGrouping[10003fd3].dll:PtiEngine[101f8610].dll:ServiceHandler[101f865a].dll:aiwdialdata[102828ab].dll:akncapserverclient[10207244].dll:aknlayout2[10158c94].dll:aknlistloadertfx.dll:aknphysics[20021194].dll:akntransitionutils.dll:apgrfx[10003a3c].dll:apmime[10003a1a].dll:apparc[10003a3d].dll:bafl[10003a0f].dll:bitgdi[10003b18].dll:bmpanim[100048f2].dll:cenrepnotifhandler[10200c8a].dll:centralrepository[101fbc70].dll:cone[10003a41].dll:dfpaeabi.dll:drtaeabi.dll:drtrvct2_2.dll:ecom[10009d8e].dll:efsrv[100039e4].dll:egul[100048a2].dll:eikcoctl[1000489e].dll:eikcore[10004892].dll:eikctl[1000489c].dll:eikdlg[10004898].dll:eiksrvc[100053b1].dll:estor[10003b0d].dll:etext[10003a1c].dll:euser[100039e5].dll:fbscli[10003a15].dll:featmgr[10005a2b].dll:fepbase[10003b14].dll:findutil[10005a19].dll:form[10003b27].dll:gdi[10003b15].dll:gfxtrans[102822a4].dll:hlplch[101f423b].dll:hwrmlightclient[10205029].dll:insock[10003d44].dll:linebreak[101f747f].dll:numberconversion[101f7800].dll:oommonitor[10282dbf].dll:phoneclient[1000084f].dll:scppnwdl.dll:tacticon[2001fe4e].dll:touchfeedback[2000b491].dll:ws32[10003b21].dll
 sys\bin\avmediaserver.exe	/epoc32/release/armv5/urel/avmediaserver.exe	sid=101f977c:avconnectionmanager[1020415a].dll:avcontentdirectory[10204159].dll:avmediaserverclient[101f977d].dll:drtaeabi.dll:efsrv[100039e4].dll:estor[10003b0d].dll:euser[100039e5].dll:insock[10003d44].dll:scppnwdl.dll:sysutil[10005943].dll:upnpavobjects[10208a13].dll:upnpconnectionmanagersession[2001b2bc].dll:upnpipserversutils[2001b2b9].dll:upnpserviceframework[2001b2b8].dll
 sys\bin\avmediaserverclient.dll	/epoc32/release/armv5/urel/avmediaserverclient.dll	sid=101f977d:centralrepository[101fbc70].dll:drtaeabi.dll:ecom[10009d8e].dll:estor[10003b0d].dll:euser[100039e5].dll:scppnwdl.dll:upnpavobjects[10208a13].dll:upnpipserversutils[2001b2b9].dll:upnpserviceframework[2001b2b8].dll
 sys\bin\avrcpipc.dll	/epoc32/release/armv5/urel/avrcpipc.dll	sid=101f9067:drtaeabi.dll:drtrvct2_2.dll:estor[10003b0d].dll:euser[100039e5].dll:scppnwdl.dll
@@ -2905,7 +2903,7 @@
 sys\bin\eikctl.dll	/epoc32/release/armv5/urel/eikctl.dll	sid=1000489c:AKNSKINS[10005a26].dll:AknIcon[1020735a].dll:AknLayout2Scalable[102040d7].dll:AknPictograph[10207364].dll:CdlEngine[101f8243].dll:CommonEngine[100058fe].dll:aknlayout2[10158c94].dll:aknlistloadertfx.dll:aknphysics[20021194].dll:akntransitionutils.dll:apgrfx[10003a3c].dll:apparc[10003a3d].dll:avkon[100056c6].dll:bafl[10003a0f].dll:bitgdi[10003b18].dll:cenrepnotifhandler[10200c8a].dll:centralrepository[101fbc70].dll:cone[10003a41].dll:dfpaeabi.dll:drtaeabi.dll:drtrvct2_2.dll:egul[100048a2].dll:eikcoctl[1000489e].dll:eikcore[10004892].dll:estor[10003b0d].dll:etext[10003a1c].dll:euser[100039e5].dll:fbscli[10003a15].dll:fepbase[10003b14].dll:form[10003b27].dll:gdi[10003b15].dll:insock[10003d44].dll:lbs[101f97b1].dll:numberconversion[101f7800].dll:scppnwdl.dll:touchfeedback[2000b491].dll:ws32[10003b21].dll
 sys\bin\eikdlg.dll	/epoc32/release/armv5/urel/eikdlg.dll	sid=10004898:AKNSKINS[10005a26].dll:AknIcon[1020735a].dll:AknLayout2Scalable[102040d7].dll:CdlEngine[101f8243].dll:aknphysics[20021194].dll:akntransitionutils.dll:avkon[100056c6].dll:bafl[10003a0f].dll:cone[10003a41].dll:dfpaeabi.dll:drtaeabi.dll:egul[100048a2].dll:eikcoctl[1000489e].dll:eikcore[10004892].dll:eikctl[1000489c].dll:estor[10003b0d].dll:euser[100039e5].dll:fbscli[10003a15].dll:fepbase[10003b14].dll:form[10003b27].dll:gdi[10003b15].dll:gfxtrans[102822a4].dll:mediatorclient[10207448].dll:scppnwdl.dll:touchfeedback[2000b491].dll:ws32[10003b21].dll
 sys\bin\eikshtsrv.dll	/epoc32/release/armv5/urel/eikshtsrv.dll	sid=10004905:drtaeabi.dll:euser[100039e5].dll:scppnwdl.dll:shutdownsrv[10004903].dll:uiklaf[1000411f].dll
-sys\bin\eiksrvui.dll	/epoc32/release/armv5/urel/stem_eiksrvui.dll	sid=100053d0:AKNSKINS[10005a26].dll:AknIcon[1020735a].dll:AknLayout2Scalable[102040d7].dll:AknNotifyPlugin[010f9a40].dll:CdlEngine[101f8243].dll:Eikalert[100056df].dll:akncapserverclient[10207244].dll:aknlayout2[10158c94].dll:aknnotifierwrapper[101f882a].dll:alarmclient[101f5028].dll:apgrfx[10003a3c].dll:apparc[10003a3d].dll:apserv[10003a3e].dll:avkon[100056c6].dll:bafl[10003a0f].dll:c32[10003d33].dll:cenrepnotifhandler[10200c8a].dll:centralrepository[101fbc70].dll:cone[10003a41].dll:drtaeabi.dll:drtrvct2_2.dll:efsrv[100039e4].dll:eikcoctl[1000489e].dll:eikcore[10004892].dll:eikdlg[10004898].dll:eiksrv[10003a4a].dll:estor[10003b0d].dll:euser[100039e5].dll:featmgr[10005a2b].dll:gdi[10003b15].dll:oodmonitor[102828dc].dll:scppnwdl.dll:uiklaf[1000411f].dll:viewcli[10003f33].dll:ws32[10003b21].dll
+sys\bin\eiksrvui.dll	/epoc32/release/armv5/urel/eiksrvui.dll	sid=100053d0:AKNSKINS[10005a26].dll:AknIcon[1020735a].dll:AknLayout2Scalable[102040d7].dll:AknNotifyPlugin[010f9a40].dll:CdlEngine[101f8243].dll:Eikalert[100056df].dll:akncapserverclient[10207244].dll:aknlayout2[10158c94].dll:aknnotifierwrapper[101f882a].dll:alarmclient[101f5028].dll:apgrfx[10003a3c].dll:apparc[10003a3d].dll:apserv[10003a3e].dll:avkon[100056c6].dll:bafl[10003a0f].dll:c32[10003d33].dll:cenrepnotifhandler[10200c8a].dll:centralrepository[101fbc70].dll:cone[10003a41].dll:drtaeabi.dll:drtrvct2_2.dll:efsrv[100039e4].dll:eikcoctl[1000489e].dll:eikcore[10004892].dll:eikdlg[10004898].dll:eiksrv[10003a4a].dll:estor[10003b0d].dll:euser[100039e5].dll:featmgr[10005a2b].dll:gdi[10003b15].dll:mediaclientaudio[10003992].dll:oodmonitor[102828dc].dll:scppnwdl.dll:uiklaf[1000411f].dll:viewcli[10003f33].dll:ws32[10003b21].dll
 sys\bin\eirclient.dll	/epoc32/release/armv5/urel/eirclient.dll	sid=102835a5:drtaeabi.dll:euser[100039e5].dll:scppnwdl.dll
 sys\bin\ekern.exe	/epoc32/release/armv5/urel/_syborg_ekern.exe	sid=100041af
 sys\bin\ekeyb.dll	/epoc32/release/armv5/urel/_syborg_ekeyb.dll	sid=100000db:ekern[100041af].exe:kasyborg[100039e8].dll
@@ -4037,7 +4035,6 @@
 sys\bin\wapp.dll	/epoc32/release/armv5/urel/wapp.dll	sid=1000526c:bafl[10003a0f].dll:biut[1000127a].dll:bookmarkdb.dll:charconv[10003b11].dll:commsdat[10204ddb].dll:drtaeabi.dll:ecom[10009d8e].dll:efsrv[100039e4].dll:euser[100039e5].dll:msgs[10004e66].dll:scppnwdl.dll
 sys\bin\wappushutils.dll	/epoc32/release/armv5/urel/wappushutils.dll	sid=10009147:drtaeabi.dll:ecom[10009d8e].dll:euser[100039e5].dll:inetprotutil[100041d1].dll:scppnwdl.dll
 sys\bin\watcher.exe	/epoc32/release/armv5/urel/watcher.exe	sid=1020d684:bafl[10003a0f].dll:domaincli.dll:drtaeabi.dll:ecom[10009d8e].dll:efsrv[100039e4].dll:euser[100039e5].dll:scppnwdl.dll
-sys\bin\weatherinfo.exe	/epoc32/release/armv5/urel/weatherinfo.exe	sid=a000cf77:QtCore[2001b2dc].dll:QtGui[2001b2dd].dll:QtNetwork[2001b2de].dll:QtSvg[2001b2e2].dll:commdb[10004e1c].dll:dfpaeabi.dll:drtaeabi.dll:esock[10003d3f].dll:euser[100039e5].dll:libc[10207369].dll:stdnew[20022178].dll
 sys\bin\webcamera.pdd	/epoc32/release/armv5/urel/_syborg_webcamera.pdd	sid=1020044d:ekern[100041af].exe:kasyborg[100039e8].dll
 sys\bin\webcamera_app.exe	/epoc32/release/armv5/urel/webcamera_app.exe	sid=00000000:drtaeabi.dll:euser[100039e5].dll
 sys\bin\wfcinterop.dll	/epoc32/release/armv5/urel/wfcinterop.dll	sid=10286fc5:drtaeabi.dll:euser[100039e5].dll:hal[100039e8].dll:scppnwdl.dll:surfacemanager[10286a9d].dll:surfaceupdateserver[10283036].dll
@@ -4105,3 +4102,13 @@
 sys\bin\xn3odt.dll	/epoc32/release/armv5/urel/xn3odt.dll	sid=00000000:drtaeabi.dll:estor[10003b0d].dll:euser[100039e5].dll:scppnwdl.dll:xn3domdocument[10207392].dll:xn3resource.dll
 sys\bin\xn3resource.dll	/epoc32/release/armv5/urel/xn3resource.dll	sid=00000000:apmime[10003a1a].dll:drtaeabi.dll:estor[10003b0d].dll:euser[100039e5].dll:scppnwdl.dll
 sys\bin\xn3utils.dll	/epoc32/release/armv5/urel/xn3utils.dll	sid=2001cb51:drtaeabi.dll:ecom[10009d8e].dll:euser[100039e5].dll:scppnwdl.dll
+sys\bin\Cone.dll	/epoc32/release/armv5/urel/stem_cone.dll	sid=10003a41:bafl[10003a0f].dll:centralrepository[101fbc70].dll:drtaeabi.dll:ecom[10009d8e].dll:efsrv[100039e4].dll:egul[100048a2].dll:estor[10003b0d].dll:euser[100039e5].dll:gdi[10003b15].dll:hal[100039e8].dll:scppnwdl.dll:viewcli[10003f33].dll:ws32[10003b21].dll
+sys\bin\SVGEngine.dll	/epoc32/release/armv5/urel/stem_svgengine.dll	sid=101f856e:VGRenderer[0152d27e].dll:XMLInterface[101f9750].dll:avkon[100056c6].dll:bafl[10003a0f].dll:bitgdi[10003b18].dll:caf.dll:charconv[10003b11].dll:dfpaeabi.dll:drtaeabi.dll:efsrv[100039e4].dll:estor[10003b0d].dll:euser[100039e5].dll:ezlib[10005706].dll:fbscli[10003a15].dll:gdi[10003b15].dll:hal[100039e8].dll:imageconversion[101f45ad].dll:imut[10004837].dll:scppnwdl.dll
+sys\bin\avkon.dll	/epoc32/release/armv5/urel/stem_avkon.dll	sid=100056c6:AKNSKINS[10005a26].dll:AknIcon[1020735a].dll:AknLayout2Scalable[102040d7].dll:AknNotify[010f9a43].dll:AknPictograph[10207364].dll:CdlEngine[101f8243].dll:CommonEngine[100058fe].dll:FontProvider[1020509c].dll:FontUtils[1020509d].dll:NumberGrouping[10003fd3].dll:PtiEngine[101f8610].dll:ServiceHandler[101f865a].dll:aiwdialdata[102828ab].dll:akncapserverclient[10207244].dll:aknlayout2[10158c94].dll:aknlistloadertfx.dll:aknphysics[20021194].dll:akntransitionutils.dll:apgrfx[10003a3c].dll:apmime[10003a1a].dll:apparc[10003a3d].dll:bafl[10003a0f].dll:bitgdi[10003b18].dll:bmpanim[100048f2].dll:cenrepnotifhandler[10200c8a].dll:centralrepository[101fbc70].dll:cone[10003a41].dll:dfpaeabi.dll:drtaeabi.dll:drtrvct2_2.dll:ecom[10009d8e].dll:efsrv[100039e4].dll:egul[100048a2].dll:eikcoctl[1000489e].dll:eikcore[10004892].dll:eikctl[1000489c].dll:eikdlg[10004898].dll:eiksrvc[100053b1].dll:estor[10003b0d].dll:etext[10003a1c].dll:euser[100039e5].dll:fbscli[10003a15].dll:featmgr[10005a2b].dll:fepbase[10003b14].dll:findutil[10005a19].dll:form[10003b27].dll:gdi[10003b15].dll:gfxtrans[102822a4].dll:hlplch[101f423b].dll:hwrmlightclient[10205029].dll:insock[10003d44].dll:linebreak[101f747f].dll:numberconversion[101f7800].dll:oommonitor[10282dbf].dll:scppnwdl.dll:tacticon[2001fe4e].dll:touchfeedback[2000b491].dll:ws32[10003b21].dll
+sys\bin\eiksrvui.dll	/epoc32/release/armv5/urel/stem_eiksrvui.dll	sid=100053d0:AKNSKINS[10005a26].dll:AknIcon[1020735a].dll:AknLayout2Scalable[102040d7].dll:AknNotifyPlugin[010f9a40].dll:CdlEngine[101f8243].dll:Eikalert[100056df].dll:akncapserverclient[10207244].dll:aknlayout2[10158c94].dll:aknnotifierwrapper[101f882a].dll:alarmclient[101f5028].dll:apgrfx[10003a3c].dll:apparc[10003a3d].dll:apserv[10003a3e].dll:avkon[100056c6].dll:bafl[10003a0f].dll:c32[10003d33].dll:cenrepnotifhandler[10200c8a].dll:centralrepository[101fbc70].dll:cone[10003a41].dll:drtaeabi.dll:drtrvct2_2.dll:efsrv[100039e4].dll:eikcoctl[1000489e].dll:eikcore[10004892].dll:eikdlg[10004898].dll:eiksrv[10003a4a].dll:estor[10003b0d].dll:euser[100039e5].dll:featmgr[10005a2b].dll:gdi[10003b15].dll:oodmonitor[102828dc].dll:scppnwdl.dll:uiklaf[1000411f].dll:viewcli[10003f33].dll:ws32[10003b21].dll
+private\10003a3f\import\apps\weatherinfo_reg.rsc	/epoc32/data/z/private/10003a3f/import/apps/weatherinfo_reg.rsc	sys\bin\weatherinfo.exe
+resource\apps\weatherinfo.rsc	/epoc32/data/z/resource/apps/weatherinfo.rsc	sys\bin\weatherinfo.exe
+sys\bin\weatherinfo.exe	/epoc32/release/armv5/urel/weatherinfo.exe	sid=a000cf77:QtCore[2001b2dc].dll:QtGui[2001b2dd].dll:QtNetwork[2001b2de].dll:QtSvg[2001b2e2].dll:commdb[10004e1c].dll:dfpaeabi.dll:drtaeabi.dll:esock[10003d3f].dll:euser[100039e5].dll:libc[10207369].dll:stdnew[20022178].dll
+Sys\Bin\libopenvg_sw.dll	/epoc32/release/armv5/urel/stem_libopenvg_sw.dll	sid=10281ab9:sflibopenvgrefimpl[10281ca6].dll
+Sys\Bin\libopenvgu_sw.dll	/epoc32/release/armv5/urel/stem_libopenvgu_sw.dll	sid=10281c47:sflibopenvgrefimpl[10281ca6].dll
+sys\bin\sflibopenvgrefimpl.dll	/epoc32/release/armv5/urel/stem_sflibopenvgrefimpl.dll	sid=10281ca6:drtaeabi.dll:euser[100039e5].dll:fbscli[10003a15].dll:libm[102750d2].dll:libopenvg_sw[10281ab9].dll:libstdcpp[10282872].dll
--- a/tools/filter_obyfile.pl	Wed Oct 27 15:05:33 2010 +0100
+++ b/tools/filter_obyfile.pl	Wed Oct 27 15:24:40 2010 +0100
@@ -40,12 +40,14 @@
 
 # read through the rom_content_csv looking for direct instructions
 my %stem_substitutions;
+my %rom_origins;
 my %deletions;
 my %must_have;
 foreach my $line (@rom_content)
 	{
 	my ($romfile,$hostfile,$ibyfile,$package,$cmd,@rest) = split /,/, $line;
 	
+	$rom_origins{$romfile} = "$ibyfile,$package";
 	next if ($cmd eq "");
 
 	$cmd = lc $cmd;
@@ -70,14 +72,15 @@
 		}
 	}
 
-printf STDERR "%d in (including % stem), %d out\n", 
+printf STDERR "%d in (including %d stem), %d out\n", 
 	scalar keys %must_have,
 	scalar keys %stem_substitutions, 
 	scalar keys %deletions; 
 
 # read static dependencies file
-my %exe_to_romfile;
-my %exe_dependencies;
+my %exe_to_romfile;     # exe -> original romfile
+my %exe_dependencies;   # exe -> list of romfile
+my %exe_prerequisites;  # exe -> list of exe
 my %lc_romfiles;
 
 my $line;
@@ -100,29 +103,38 @@
 
 	$lc_romfiles{lc $romfile} = $romfile;
 	
+	my $romexe = "";
 	if ($romfile =~ /^sys.bin.(.*)$/i)
 		{
-		my $exe = lc $1;
-		$exe_to_romfile{$exe} = $romfile;
+		$romexe = lc $1;
+		$exe_to_romfile{$romexe} = $romfile;
 		}
 
-	foreach my $dependent (split /:/,$stuff)
+	my @prerequisite_exes = ();
+	foreach my $prerequisite (split /:/,$stuff)
 		{
-		next if ($dependent =~ /^sid=/);
-		$dependent = lc $dependent;
-		
-		$dependent =~ s/^sys\\bin\\//;	# no directory => sys\bin anyway
-		$dependent =~ s/\[\S+\]//;	# ignore the UIDs for now
+		next if ($prerequisite =~ /^sid=/);	# not a real file
+		$prerequisite =~ s/^sys.bin.//;	# remove leading sys/bin, if present
+		if ($prerequisite !~ /\\/)
+			{
+			my $exe = lc $prerequisite;
+			$exe =~ s/\[\S+\]//;	# ignore the UIDs for now
 		
-		if (!defined $exe_dependencies{$dependent})
-			{
-			my @dependents = ($romfile);
-			$exe_dependencies{$dependent} = \@dependents;
+			push @prerequisite_exes, $exe;
+			if (!defined $exe_dependencies{$exe})
+				{
+				my @dependents = ($romfile);
+				$exe_dependencies{$exe} = \@dependents;
+				}
+			else
+				{
+				push @{$exe_dependencies{$exe}}, $romfile;
+				}
 			}
-		else
-			{
-			push @{$exe_dependencies{$dependent}}, $romfile;
-			}
+		}
+	if ($romexe ne "")
+		{
+		$exe_prerequisites{$romexe} = \@prerequisite_exes;
 		}
 	}
 close STATIC_DEPENDENCIES;
@@ -145,19 +157,33 @@
 		$newname =~ s/^\\sys/sys/;	# remove leading \, to match $romfile convention
 		$lc_romfiles{lc $newname} = $newname;
 		
+		$rom_origins{$newname} = "alias to $romfile";
 		if ($romfile =~ /^sys.bin.(\S+)$/i)
 			{
 			my $realexe = lc $1;
 			push @{$exe_dependencies{$realexe}}, $newname;		# the alias is a dependent of the real file
+			
+			if ($newname =~ /^sys.bin.(\S+)$/i)
+				{
+				my $newexe = lc $1;
+				$exe_to_romfile{$newexe} = $newname;
+				$rom_origins{$newname} = "alias " . $rom_origins{$romfile};
+				my @prerequisite_exes = ($realexe);
+				$exe_prerequisites{$newexe} = \@prerequisite_exes;
+				}
+
 			# print STDERR "added $newname as a dependent of $realexe\n"
 			}
 		}
 	}
 
-# foreach my $exe ("libopenvg.dll", "libopenvg_sw.dll")
-# 	{
-# 	printf STDERR "Dependents of %s = %s\n", $exe, join(", ", @{$exe_dependencies{$exe}});
-# 	}
+if (0)
+	{
+	foreach my $exe ("libopenvg.dll", "libopenvg_sw.dll", "backend.dll")
+		{
+		printf STDERR "Dependents of %s = %s\n", $exe, join(", ", @{$exe_dependencies{$exe}});
+		}
+	}
 
 # process the "out" commands to recursively expand the deletions
 
@@ -336,6 +362,83 @@
 
 print_detail("Applied $stem_count stem substitutions and deleted $deletion_count rom files");
 
+# Caculate what else could be removed
+
+my %must_have_exes;
+sub mark_prerequisites($);	# prototype for recursion
+sub mark_prerequisites($)
+	{
+	my ($exe) = @_;
+	return if (defined $must_have_exes{$exe});	# already marked
+
+	$must_have_exes{$exe} = 1;
+	if (!defined $exe_prerequisites{$exe})
+		{
+		# printf STDERR "$exe has no prerequisites to be marked!\n";
+		return;
+		}
+	foreach my $prerequisite (@{$exe_prerequisites{$exe}})
+		{
+		mark_prerequisites($prerequisite);
+		}
+	}
+
+foreach my $romfile (keys %must_have)
+	{
+	if ($romfile =~ /^sys.bin.(.*)$/i)
+		{
+		my $exe = lc $1;
+		mark_prerequisites($exe);
+		}
+	}
+printf STDERR "Minimum ROM now has %d exes\n", scalar keys %must_have_exes;
+
+sub count_dependents($$);	# prototype for recursion
+sub count_dependents($$)
+	{
+	my ($exe, $hashref) = @_;
+	return if (defined $deletions{$exe_to_romfile{$exe}});
+	return if (defined $$hashref{$exe});
+
+	$$hashref{$exe} = 1;
+	foreach my $dependent (@{$exe_dependencies{$exe}})
+		{
+		next if ($dependent =~ /^sid=/);
+		if ($dependent =~ /^sys.bin.(.*)$/i)
+			{
+			my $depexe = lc $1;
+			count_dependents($depexe, $hashref);
+			}
+		}
+	}
+
+my @deletion_roots;
+foreach my $exe (sort keys %exe_dependencies)
+	{
+	next if (defined $must_have_exes{$exe});
+	my %dependents;
+	my $deletion_root = "";
+	foreach my $prerequisite (@{$exe_prerequisites{$exe}})
+		{
+		next if (defined $must_have_exes{$prerequisite});
+		$deletion_root = $prerequisite;	# at least one prerequisite is not a must_have, so will delete this exe if removed
+		last;
+		}
+	if (defined $deletions{$exe_to_romfile{$exe}})
+		{
+		if ($deletion_root ne "")
+			{
+			#print STDERR "Explicit deletion of $exe is not efficient - $deletion_root would remove it\n";
+			}
+			next;	# no need to report this one
+		}
+	next if ($deletion_root ne "");
+	
+	count_dependents($exe, \%dependents);
+	my $count = scalar keys %dependents;
+	push @deletion_roots, sprintf "%-4d\t%s", scalar keys %dependents, $exe;
+	}
+
 my $deleted_lines_oby = "filtered.oby";
 my $deletion_details_file = "filter.log";
 
@@ -350,7 +453,7 @@
 	close FILE;
 	}
 
-if ($deletion_details_file && scalar @details)
+if ($deletion_details_file && scalar (@details, @problems, @deletion_roots))
 	{
 	print STDERR "Writing deletion details to $deletion_details_file\n";
 	open FILE, ">$deletion_details_file" or die("Unable to write to file $deletion_details_file: $!\n");
@@ -358,6 +461,14 @@
 		{
 		print FILE $line, "\n";
 		}
+		
+	print FILE "\n====\n";
+	foreach my $deletion_root (sort {$b <=> $a} @deletion_roots)
+		{
+		my ($count,$exe) = split /\s+/, $deletion_root;
+		printf FILE "Remove %d files by deleting %s (%s)\n", $count, $exe, $rom_origins{$exe_to_romfile{$exe}};
+		}	
+
 	print FILE "\n====\n";
 	foreach my $problem (sort @problems)
 		{
@@ -366,3 +477,4 @@
 		}
 	close FILE;
 	}
+