# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1269974521 -3600
# Node ID 351aac5b2f34215f031ade28fe34c02d42e012d9
# Parent  2ca1b6591d14ff810bb7b29f5ef5f0c55c22d72c# Parent  c484c7841bb0dc7d32995a515ab83f2b8b53ac13
Catchup merge

diff -r 2ca1b6591d14 -r 351aac5b2f34 Version/data/sw.txt
Binary file Version/data/sw.txt has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 layers.sysdef.xml
--- a/layers.sysdef.xml	Tue Mar 23 19:05:50 2010 +0000
+++ b/layers.sysdef.xml	Tue Mar 30 19:42:01 2010 +0100
@@ -12,7 +12,20 @@
       <module name="version">
         <unit unitID="platform.version" mrp="" bldFile="&layer_real_source_path;/Version/group" name="version" />
       </module>
+			<!-- from buildplatform -->
+			<module name="sf_common_tsy">
+				<component name="sf_common_tsy">
+					<unit unitID="symbian.common_tsy" name="sf_common_tsy" bldFile="sf/os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="" filter=""/>
+				</component>
+			</module>
+			<module name="sf_openvg11">
+				<component name="sf_openvg11">
+					<unit unitID="symbian.openvg11" name="sf_openvg11" bldFile="sf/os/graphics/openvg/openvginterface/group/openvg11" mrp="" filter="sf_build"/>
+				</component>
+			</module>
+			<!-- from buildplatform -->
     </layer>
+    
     <layer name="app_layer">
       <module name="locfiles">
 				<unit unitID="platform.locfiles" mrp="" bldFile="&layer_real_source_path;/locfiles/group" filter="" name="locfiles" />
@@ -36,6 +49,22 @@
       <module name="helps_loc2">
         <unit unitID="platform.helps_loc2" mrp="" bldFile="&layer_real_source_path;/helps_loc2/group" name="helps_loc2" />
       </module>
+		</layer>
+
+		<!-- from buildplatform -->
+	  <layer name="stubs_layer">
+			<module name="sf_licenseetsystub">
+				<component name="sf_licenseetsystub">
+					<unit unitID="symbian.licenseetsystub" name="sf_licenseetsystub" bldFile="sf/os/cellularsrv/telephonyserverplugins/licenseetsystub/group" mrp="" filter=""/>
+				</component>
+			</module>
+		</layer>
+
+    <layer name="bin_layer">
+			<module name="bin_layer_helix_ren">
+					<unit unitID="bin_layer_sf_mw_helix_helix_ren_src" name="src" bldFile="sf/mw/helix/helix_ren/src/group" mrp="" filter="!no_binonly"/>
+			</module>
     </layer>
+		<!-- from buildplatform -->
   </systemModel>
 </SystemDefinition>
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/01.zip
Binary file locfiles/data/01.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/02.zip
Binary file locfiles/data/02.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/03.zip
Binary file locfiles/data/03.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/04.zip
Binary file locfiles/data/04.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/05.zip
Binary file locfiles/data/05.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/06.zip
Binary file locfiles/data/06.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/07.zip
Binary file locfiles/data/07.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/08.zip
Binary file locfiles/data/08.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/09.zip
Binary file locfiles/data/09.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/10.zip
Binary file locfiles/data/10.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/102.zip
Binary file locfiles/data/102.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/103.zip
Binary file locfiles/data/103.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/129.zip
Binary file locfiles/data/129.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/13.zip
Binary file locfiles/data/13.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/14.zip
Binary file locfiles/data/14.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/14346.zip
Binary file locfiles/data/14346.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/14387.zip
Binary file locfiles/data/14387.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/14412.zip
Binary file locfiles/data/14412.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/14419.zip
Binary file locfiles/data/14419.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/15.zip
Binary file locfiles/data/15.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/157.zip
Binary file locfiles/data/157.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/158.zip
Binary file locfiles/data/158.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/159.zip
Binary file locfiles/data/159.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/16.zip
Binary file locfiles/data/16.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/160.zip
Binary file locfiles/data/160.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/161.zip
Binary file locfiles/data/161.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/17.zip
Binary file locfiles/data/17.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/18.zip
Binary file locfiles/data/18.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/230.zip
Binary file locfiles/data/230.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/25.zip
Binary file locfiles/data/25.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/26.zip
Binary file locfiles/data/26.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/27.zip
Binary file locfiles/data/27.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/28.zip
Binary file locfiles/data/28.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/29.zip
Binary file locfiles/data/29.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/30.zip
Binary file locfiles/data/30.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/31.zip
Binary file locfiles/data/31.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/32.zip
Binary file locfiles/data/32.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/326.zip
Binary file locfiles/data/326.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/327.zip
Binary file locfiles/data/327.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/33.zip
Binary file locfiles/data/33.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/37.zip
Binary file locfiles/data/37.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/39.zip
Binary file locfiles/data/39.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/42.zip
Binary file locfiles/data/42.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/44.zip
Binary file locfiles/data/44.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/45.zip
Binary file locfiles/data/45.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/49.zip
Binary file locfiles/data/49.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/50.zip
Binary file locfiles/data/50.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/51.zip
Binary file locfiles/data/51.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/54.zip
Binary file locfiles/data/54.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/57.zip
Binary file locfiles/data/57.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/58.zip
Binary file locfiles/data/58.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/59.zip
Binary file locfiles/data/59.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/65.zip
Binary file locfiles/data/65.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/67.zip
Binary file locfiles/data/67.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/68.zip
Binary file locfiles/data/68.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/70.zip
Binary file locfiles/data/70.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/76.zip
Binary file locfiles/data/76.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/78.zip
Binary file locfiles/data/78.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/79.zip
Binary file locfiles/data/79.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/83.zip
Binary file locfiles/data/83.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/93.zip
Binary file locfiles/data/93.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/94.zip
Binary file locfiles/data/94.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/data/96.zip
Binary file locfiles/data/96.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 locfiles/group/switch_loc.zip
Binary file locfiles/group/switch_loc.zip has changed
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_build/sf_prebuild/makefile
--- a/sf_build/sf_prebuild/makefile	Tue Mar 23 19:05:50 2010 +0000
+++ b/sf_build/sf_prebuild/makefile	Tue Mar 30 19:42:01 2010 +0100
@@ -7,8 +7,8 @@
 
 include /sf/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/makefile
 include /sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/makefile
-include /sf/tools/buildplatforms/build/makefile
-include /sf/mw/qt/group/cmaker/makefile
+include /sf/mw/qt/src/s60installs/deviceconfiguration/cmaker/makefile
+
 ifeq (S60,$(BUILD))
 include /sf/mw/uiresources/uigraphics/icons/makefile
 include /sf/mw/uiresources/uigraphics/bitmaps2/makefile
@@ -17,7 +17,7 @@
 endif
  
 # Place the first target as the default target which is executed from this level 
-s60_prebuild  :: commonengine_all platform_path_all common_platform_security_all buildpreparation_all export_template_files icons_all bitmaps_all dtdinstaller_all
-os_prebuild  :: commonengine_all platform_path_all common_platform_security_all buildpreparation_all 
+s60_prebuild  :: commonengine_all platform_path_all common_platform_security_all export_template_files icons_all bitmaps_all dtdinstaller_all
+os_prebuild  :: commonengine_all platform_path_all common_platform_security_all  
 
 # include include_template.mk 
\ No newline at end of file
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/F32/F32.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/F32/F32.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,103 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef __F32_IBY__
+#define __F32_IBY__
+
+#include <bldprivate.hrh>    // TODO //
+
+/*########################################################################*/
+/*#	                          File Server			                           #*/
+/*#					                                                             #*/
+/*########################################################################*/
+
+
+secondary=        ABI_DIR\DEBUG_DIR\efile.exe		        sys\bin\efile.exe  FIXED HEAPMAX(0x80000)
+file=			        ABI_DIR\DEBUG_DIR\efsrv.dll           sys\bin\efsrv.dll
+file=			        ABI_DIR\DEBUG_DIR\e32strt.exe	        sys\bin\estart.exe HEAPMAX(0x2000)	// Symbian Base Starter 
+data=			        \epoc32\rom\syborg\ESTART.TXT	        \sys\data\ESTART.TXT			          // Local Drives Definition File 
+extension[VARID]=	KERNEL_DIR\DEBUG_DIR\ELOCD.LDD	      \sys\bin\ELOCD.LDD			            // Local Media Drives Access Driver
+
+device[VARID]=KERNEL_DIR\DEBUG_DIR\d_ftrace.ldd             \sys\bin\d_ftrace.ldd   // FileSystem Trace Driver
+/* FAT System Filename conversion plugins */
+#include <fatcharsetconv.iby> 														
+
+
+/* File Systems Supported */
+
+#ifdef WITH_EXFAT
+file=ABI_DIR\DEBUG_DIR\exfat.fsy                            sys\bin\exfat.fsy
+#endif
+
+#ifdef WITH_AUTOMOUNTER
+file=ABI_DIR\DEBUG_DIR\automounter.fsy                      sys\bin\automounter.fsy
+#endif
+
+
+#ifndef CUSTOM_ELOCAL
+file=ABI_DIR\DEBUG_DIR\efat32.fsy			    \sys\bin\ELocal.fsy
+#endif
+
+// PREQ2540: Prepare "LFFS" NOR Flash File System TPIP for Symbian Foundation
+// This PREQ removes the LFFS File System component from the rlease codeline.
+// Only define WITH_ELLFS_FSY macro on development branches where the component
+// has been retained.
+#ifdef WITH_ELFFS_FSY
+file=ABI_DIR\DEBUG_DIR\elffs.fsy                            \sys\bin\ELffs.fsy
+#endif
+
+#ifdef WITH_NAND
+file=ABI_DIR\BUILD_DIR\nandftl.fxt                          \sys\bin\nandftl.fxt
+file=ABI_DIR\BUILD_DIR\ecomp.fsy                            \sys\bin\ecomp.fsy
+file=ABI_DIR\BUILD_DIR\erofs.fsy                            \sys\bin\erofs.fsy
+#endif
+
+#if defined(WITH_NAND2) || defined(WITH_ONENAND) || defined (WITH_INTERNAL_MMC)
+file=ABI_DIR\BUILD_DIR\ecomp.fsy                            \sys\bin\ecomp.fsy
+file=ABI_DIR\BUILD_DIR\erofs.fsy                            \sys\bin\erofs.fsy
+#endif
+
+#ifdef WITH_ISO9660
+file=ABI_DIR\DEBUG_DIR\iso9660.fsy                          \sys\bin\Iso9660.fsy
+#endif
+
+#ifdef WITH_NTFS
+file=ABI_DIR\DEBUG_DIR\ntfs.fsy                             \sys\bin\Ntfs.fsy
+#endif
+
+#if !(defined(INST_X86) || defined(INST_X86GCC))
+file=ABI_DIR\DEBUG_DIR\USBCSC_bil.dll                       \sys\bin\usbcsc_bil.dll
+#endif
+
+#ifdef WITH_MASS_STORAGE
+#ifdef USE_MSCDB
+file=ABI_DIR\DEBUG_DIR\msfs_db.fsy                          \sys\bin\msfs.fsy
+#else
+file=ABI_DIR\DEBUG_DIR\msfs.fsy                             \sys\bin\msfs.fsy
+#endif
+#endif
+
+/*########################################################################*/
+/*#	                          Symbian Domain Manager                     #*/
+/*#                                                                      #*/
+/*########################################################################*/
+
+/* Symbian Domain Manager */
+file=ABI_DIR\DEBUG_DIR\domainSrv.exe                     \sys\bin\domainSrv.exe
+file=ABI_DIR\DEBUG_DIR\domainCli.dll                     \sys\bin\domainCli.dll
+file=ABI_DIR\DEBUG_DIR\domainPolicy.dll                  \sys\bin\domainPolicy.dll										
+#endif /* __F32_IBY__ */
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/QT46/qt.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/QT46/qt.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,43 @@
+#ifndef __QT46_IBY__
+#define __QT46_IBY__
+ 
+file=\epoc32\release\armv5\udeb\phonon_mmf.dll 				\sys\bin\phonon_mmf.dll
+data=\epoc32\data\z\resource\apps\s60main.rsc 			\resource\apps\s60main.rsc
+data=\epoc32\data\z\resource\apps\phonon_mmf.qtplugin	 	\resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin
+file=\epoc32\release\armv5\udeb\QtCore.dll				\sys\bin\QtCore.dll
+file=\epoc32\release\armv5\udeb\QtXml.dll				\sys\bin\QtXml.dll
+file=\epoc32\release\armv5\udeb\QtGui.dll 				\sys\bin\QtGui.dll
+file=\epoc32\release\armv5\udeb\QtNetwork.dll 				\sys\bin\QtNetwork.dll
+file=\epoc32\release\armv5\udeb\QtTest.dll 				\sys\bin\QtTest.dll
+file=\epoc32\release\armv5\udeb\QtSql.dll				\sys\bin\QtSql.dll
+file=\epoc32\release\armv5\udeb\QtSvg.dll				\sys\bin\QtSvg.dll
+file=\epoc32\release\armv5\udeb\Phonon.dll 				\sys\bin\Phonon.dll
+file=\epoc32\release\armv5\udeb\QtScript.dll 				\sys\bin\QtScript.dll
+file=\epoc32\release\armv5\udeb\QtXmlPatterns.dll 			\sys\bin\QtXmlPatterns.dll
+file=\epoc32\release\armv5\udeb\QtWebKit.dll			 	\sys\bin\QtWebKit.dll
+file=\epoc32\release\armv5\udeb\qjpeg.dll				\sys\bin\qjpeg.dll
+data=\epoc32\data\z\resource\apps\qjpeg.qtplugin 			\resource\qt\plugins\imageformats\qjpeg.qtplugin
+file=\epoc32\release\armv5\udeb\qgif.dll 				\sys\bin\qgif.dll
+//data=\epoc32\data\z\resource\apps\qgif.qtplugin  			\resource\qt\plugins\imageformats\qgif.qtplugin
+file=\epoc32\release\armv5\udeb\qmng.dll 				\sys\bin\qmng.dll	
+//data=\epoc32\data\z\resource\apps\qmng.qtplugin 			\resource\qt\plugins\imageformats\qmng.qtplugin
+file=\epoc32\release\armv5\udeb\qtiff.dll				\sys\bin\qtiff.dll
+//data=\epoc32\data\z\resource\apps\qtiff.qtplugin			\resource\qt\plugins\imageformats\qtiff.qtplugin
+file=\epoc32\release\armv5\udeb\qico.dll					\sys\bin\qico.dll
+//data=\epoc32\data\z\resource\apps\qico.qtplugin 			\resource\qt\plugins\imageformats\qico.qtplugin
+file=\epoc32\release\armv5\udeb\qsvg.dll				        \sys\bin\qsvg.dll
+//data=\epoc32\data\z\resource\apps\qsvg.qtplugin			\resource\qt\plugins\imageformats\qsvg.qtplugin
+file=\epoc32\release\armv5\udeb\qcncodecs.dll				\sys\bin\qcncodecs.dll
+//data=\epoc32\data\z\resource\apps\qcncodecs.qtplugin 		\resource\qt\plugins\codecs\qcncodecs.qtplugin
+file=\epoc32\release\armv5\udeb\qjpcodecs.dll				\sys\bin\qjpcodecs.dll
+//data=\epoc32\data\z\resource\apps\qjpcodecs.qtplugin 		\resource\qt\plugins\codecs\qjpcodecs.qtplugin
+file=\epoc32\release\armv5\udeb\qtwcodecs.dll				\sys\bin\qtwcodecs.dll
+//data=\epoc32\data\z\resource\apps\qtwcodecs.qtplugin		\resource\qt\plugins\codecs\qtwcodecs.qtplugin
+file=\epoc32\release\armv5\udeb\qkrcodecs.dll				\sys\bin\qkrcodecs.dll
+//data=\epoc32\data\z\resource\apps\qkrcodecs.qtplugin 		\resource\qt\plugins\codecs\qkrcodecs.qtplugin
+file=\epoc32\release\armv5\udeb\qsvgicon.dll 				\sys\bin\qsvgicon.dll
+//data=\epoc32\data\z\resource\apps\qsvgicon.qtplugin		\resource\qt\plugins\iconengines\qsvgicon.qtplugin
+file=\epoc32\release\armv5\udeb\qts60plugin_5_0.dll 			\sys\bin\qts60plugin_5_0.dll
+file=\epoc32\release\armv5\udeb\sqlite3.dll 				\sys\bin\sqlite3.dll
+ 
+#endif
\ No newline at end of file
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/S60Macros.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/S60Macros.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,114 @@
+/*
+* ============================================================================
+*  Name     : S60Macros.iby
+*  Part of  : ROM Build Process
+*
+*  Description:
+*  Build ROM Information
+*
+*  Version:
+*
+*  Copyright (C) 2002 Nokia Corporation.
+*  This material, including documentation and any related 
+*  computer programs, is protected by copyright controlled by 
+*  Nokia Corporation. All rights are reserved. Copying, 
+*  including reproducing, storing,  adapting or translating, any 
+*  or all of this material requires the prior written consent of 
+*  Nokia Corporation. This material also contains confidential 
+*  information which may not be disclosed to others without the 
+*  prior written consent of Nokia Corporation.
+*
+* ============================================================================
+*/
+
+#ifndef __S60MACROS_IBY__
+#define __S60MACROS_IBY__
+
+// Scalable image
+#ifdef RD_SCALABLE_UI
+ #define SCALABLE_IMAGE(path,target,name) __SCALABLE_IMAGE(DATAZ_,path,target,name)
+#else
+ #define SCALABLE_IMAGE(path,target,name) AUTO-BITMAP=DATAZ_\ ## path ## \ ## name ## .mbm  target ## \ ## name ## .mbm
+#endif
+
+
+
+// App files
+#ifndef RD_APPS_TO_EXES
+ #define S60_APP_EXE(NAME) file=ABI_DIR\BUILD_DIR\ ## NAME ## .app                   System\Apps\ ## NAME ## \ ## NAME ## .app
+ #define S60_APP_EXE_UDEB(NAME) file=ABI_DIR\UDEB\ ## NAME ## .app                   System\Apps\ ## NAME ## \ ## NAME ## .app
+#else // RD_APPS_TO_EXES
+ #define S60_APP_EXE(NAME) file=ABI_DIR\BUILD_DIR\ ## NAME ## .exe                   PROGRAMS_DIR\ ## NAME ## .exe
+ #define S60_APP_EXE_UDEB(NAME) file=ABI_DIR\UDEB\ ## NAME ## .exe                   PROGRAMS_DIR\ ## NAME ## .exe
+#endif // RD_APPS_TO_EXES
+
+
+
+// App bitmap
+#ifdef RD_APPS_TO_EXES
+ #ifdef RD_SCALABLE_UI
+  #define S60_APP_BITMAP(NAME) __SCALABLE_IMAGE(DATAZ_,APP_BITMAP_DIR,APP_BITMAP_DIR, ## NAME ## )
+  #define S60_APP_BITMAP2(DIR,NAME) __SCALABLE_IMAGE(DATAZ_,APP_BITMAP_DIR,APP_BITMAP_DIR, ## NAME ## )
+ #else // RD_SCALABLE_UI
+  #define S60_APP_BITMAP(NAME) AUTO-BITMAP=DATAZ_\APP_BITMAP_DIR\ ## NAME ## .mbm APP_BITMAP_DIR\ ## NAME ## .mbm
+  #define S60_APP_BITMAP2(DIR,NAME) AUTO-BITMAP=DATAZ_\APP_BITMAP_DIR\ ## NAME ## .mbm APP_BITMAP_DIR\ ## NAME ## .mbm
+ #endif // RD_SCALABLE_UI
+#else // RD_APPS_TO_EXES
+ #ifdef RD_SCALABLE_UI
+  #define S60_APP_BITMAP(NAME) __SCALABLE_IMAGE(DATAZ_,System\Apps\ ## NAME ## ,System\Apps\ ## NAME ## , ## NAME ## )
+  #define S60_APP_BITMAP2(DIR,NAME) __SCALABLE_IMAGE(DATAZ_,System\Apps\ ## DIR ## ,System\Apps\ ## DIR ## , ## NAME ## )
+ #else // RD_SCALABLE_UI
+  #define S60_APP_BITMAP(NAME) AUTO-BITMAP=DATAZ_\System\Apps\ ## NAME ## \ ## NAME ## .mbm System\Apps\ ## NAME ## \ ## NAME ## .mbm
+  #define S60_APP_BITMAP2(DIR,NAME) AUTO-BITMAP=DATAZ_\System\Apps\ ## DIR ## \ ## NAME ## .mbm System\Apps\ ## DIR ## \ ## NAME ## .mbm
+ #endif // RD_SCALABLE_UI
+#endif // RD_APPS_TO_EXES
+
+
+
+// AIF icons/files
+#ifdef RD_SCALABLE_UI // New app framework used
+ #ifdef RD_APPS_TO_EXES
+  #ifdef __SCALABLE_ICONS
+   #define S60_APP_AIF_ICONS(NAME) data=DATAZ_\APP_BITMAP_DIR\ ## NAME ## _AIF.MIF    APP_BITMAP_DIR\ ## NAME ## _aif.mif
+  #else
+   #define S60_APP_AIF_ICONS(NAME) AUTO-BITMAP=DATAZ_\APP_BITMAP_DIR\ ## NAME ## _AIF.MBM       APP_BITMAP_DIR\ ## NAME ## _aif.mbm
+  #endif
+ #else // RD_APPS_TO_EXES
+  #ifdef __SCALABLE_ICONS
+   #define S60_APP_AIF_ICONS(NAME) data=ZSYSTEM\APPS\ ## NAME ## \ ## NAME ## _AIF.MIF       System\Apps\ ## NAME ## \ ## NAME ## _aif.mif
+  #else
+   #define S60_APP_AIF_ICONS(NAME) AUTO-BITMAP=ZSYSTEM\APPS\ ## NAME ## \ ## NAME ## _AIF.MBM       System\Apps\ ## NAME ## \ ## NAME ## _aif.mbm
+  #endif
+ #endif // RD_APPS_TO_EXES
+ #define S60_APP_AIF_RSC(NAME) data=DATAZ_\PRIVATE\10003A3F\APPS\ ## NAME ## _reg.rsc        Private\10003a3f\apps\ ## NAME ## _reg.rsc
+ #define S60_UPGRADABLE_APP_REG_RSC(NAME) data=DATAZ_\PRIVATE\10003A3F\APPS\ ## NAME ## _reg.rsc        Private\10003a3f\import\apps\ ## NAME ## _reg.rsc
+
+#else // RD_SCALABLE_UI Old app framework used
+ #define S60_APP_AIF_ICONS(NAME) AIF=ZSYSTEM\APPS\ ## NAME ## \ ## NAME ## .AIF            System\Apps\ ## NAME ## \ ## NAME ## .aif
+ #define S60_APP_AIF_RSC(NAME)
+ #define S60_UPGRADABLE_APP_REG_RSC(NAME)
+#endif
+
+
+
+//Resource file(s)
+#ifdef RD_APPS_TO_EXES
+ #define S60_APP_RESOURCE(NAME)  data=DATAZ_\APP_RESOURCE_DIR\ ## NAME ## .RSC   APP_RESOURCE_DIR\ ## NAME ## .rsc
+ #define S60_APP_RESOURCE2(APPNAME,RESNAME) data=DATAZ_\APP_RESOURCE_DIR\ ## RESNAME ## .RSC   APP_RESOURCE_DIR\ ## RESNAME ## .rsc
+ #ifndef RD_SCALABLE_UI // Old app framework used
+  #define S60_APP_CAPTION(NAME)  data=DATAZ_\APP_RESOURCE_DIR\ ## NAME ## _CAPTION.RSC   APP_RESOURCE_DIR\ ## NAME ## _caption.rsc
+ #else
+  #define S60_APP_CAPTION(NAME)
+ #endif // RD_SCALABLE_UI
+#else // RD_APPS_TO_EXES
+ #define S60_APP_RESOURCE(NAME)  data=ZSYSTEM\APPS\ ## NAME ## \ ## NAME ## .RSC    System\Apps\ ## NAME ## \ ## NAME ## .rsc
+ #define S60_APP_RESOURCE2(APPNAME,RESNAME) data=ZSYSTEM\APPS\ ## APPNAME ## \ ## RESNAME ## .RSC    System\Apps\ ## APPNAME ## \ ## RESNAME ## .rsc
+ #ifndef RD_SCALABLE_UI // Old app framework used
+  #define S60_APP_CAPTION(NAME)  data=ZSYSTEM\APPS\ ## NAME ## \ ## NAME ## _CAPTION.RSC   System\Apps\ ## NAME ## \ ## NAME ## _caption.rsc
+ #else
+  #define S60_APP_CAPTION(NAME)
+ #endif // RD_SCALABLE_UI
+#endif // RD_APPS_TO_EXES
+
+
+#endif //__S60MACROS_IBY__
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/baseport/Syborg_textshell.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/baseport/Syborg_textshell.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,52 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef __SYBORG_TEXTSHELL_IBY__
+#define __SYBORG_TEXTSHELL_IBY__
+
+REM ##########################################################################
+
+REM Syborg Specific Starter
+
+REM ##########################################################################
+
+// Host Filesystem
+extension[VARID]=	KERNEL_DIR\DEBUG_DIR\_PLATFORM_NAME_svphostfsdriver.ldd	\sys\bin\svphostfsdriver.ldd
+file=			KERNEL_DIR\DEBUG_DIR\svphostfsy.fsy			                        \sys\bin\svphostfsy.fsy
+file=			KERNEL_DIR\DEBUG_DIR\svphostfs.exe			                        \sys\bin\svphostfs.exe
+
+
+// Snap Driver
+extension[VARID]=	KERNEL_DIR\DEBUG_DIR\_PLATFORM_NAME_svpsnapdriver.ldd  	\sys\bin\svpsnapdriver.ldd
+file=			KERNEL_DIR\DEBUG_DIR\snapapp.exe			                          \sys\bin\snapapp.exe
+
+
+file=			KERNEL_DIR\DEBUG_DIR\svphostfsstart.exe			                     \sys\bin\sysstart.exe	 // Syborg Specific Starter	
+
+
+REM ##############################################################################
+
+REM Symbian TextShell and Symbian EKA2 Windows Server ( EWSRV )
+
+REM ##############################################################################
+
+file=	KERNEL_DIR\DEBUG_DIR\ECONS.DLL				                               \sys\bin\ECONS.DLL
+file=	KERNEL_DIR\DEBUG_DIR\EWSRV.EXE			                                 \sys\bin\EWSRV.EXE	FIXED HEAPMAX (0x40000)
+file=	ABI_DIR\DEBUG_DIR\eshell.exe				                                 \sys\bin\eshell.exe 	HEAPMAX(0x20000) capability tcb+diskadmin+allfiles+ProtServ
+
+
+#endif /* __SYBORG_TEXTSHELL_IBY__ */
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/baseport/compsupp.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/baseport/compsupp.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,69 @@
+// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "ARM EABI LICENCE.txt"
+// which accompanies this distribution, and is available
+// in kernel/eka/compsupp.
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file contains the compiler's run-time support libraries.
+// 
+//
+
+// Make the file acceptable to "e32/rombuild/rom.bat."
+#if defined(COMPSUPP_DIR) && defined(BUILD)
+#   define ABI_DIR      \Epoc32\Release\##COMPSUPP_DIR
+#   define DEBUG_DIR    BUILD
+#endif
+
+#if defined(RVCT2_1)
+#   error "RVCT 2.1 is not supported."
+#endif
+
+// Set a default run-time version. In the future, 3.1 or 4.X should be the default.
+#if !( defined(RVCT2_2) || defined(RVCT3_1) || defined(RVCT4_0) )
+#   define RVCT4_0
+#endif
+
+#if defined(VFPHELPERS) && !defined(NOVFPHELPERS)
+#   define FP_EXT _vfpv2.dll
+#else
+#   define FP_EXT .dll
+#endif
+
+file=ABI_DIR\##DEBUG_DIR\scppnwdl.dll               \sys\bin\scppnwdl.dll
+
+file=ABI_DIR\##DEBUG_DIR\drtaeabi.dll               \sys\bin\drtaeabi.dll
+file=ABI_DIR\##DEBUG_DIR\dfpaeabi##FP_EXT           \sys\bin\dfpaeabi.dll
+
+// Support for old binaries.
+//Emilio file=ABI_DIR\##DEBUG_DIR\dfprvct-thunk.dll			\sys\bin\dfprvct-thunk.dll
+//Emilio alias \sys\bin\dfprvct-thunk.dll					\sys\bin\dfprvct2_2-thunk.dll
+//Emilio alias \sys\bin\dfprvct-thunk.dll					\sys\bin\dfprvct2_1-thunk.dll
+
+#define RVCT2_2
+#if defined(RVCT2_2)
+REM RVCT 2.2 support
+    file=ABI_DIR\##DEBUG_DIR\drtrvct2_2##FP_EXT     \sys\bin\drtrvct2_2.dll
+    file=ABI_DIR\##DEBUG_DIR\dfprvct2_2##FP_EXT     \sys\bin\dfprvct2_2.dll
+    
+    // Support for old binaries.
+    alias \sys\bin\drtrvct2_2.dll                   \sys\bin\drtrvct2_1.dll
+    alias \sys\bin\dfprvct2_2.dll                   \sys\bin\dfprvct2_1.dll
+#elif defined(RVCT3_1) || defined(RVCT4_0)
+REM RVCT 4.0 support
+    file=ABI_DIR\##DEBUG_DIR\drtrvct3_1##FP_EXT     \sys\bin\drtrvct3_1.dll
+    file=ABI_DIR\##DEBUG_DIR\dfprvct3_1##FP_EXT     \sys\bin\dfprvct3_1.dll
+    
+    // Support for old binaries.
+    alias \sys\bin\drtrvct3_1.dll                   \sys\bin\drtrvct2_2.dll
+    alias \sys\bin\dfprvct3_1.dll                   \sys\bin\dfprvct2_2.dll
+    alias \sys\bin\drtrvct3_1.dll                   \sys\bin\drtrvct2_1.dll
+    alias \sys\bin\dfprvct3_1.dll                   \sys\bin\dfprvct2_1.dll
+#endif
+
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/baseport/syborg_baseport.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/baseport/syborg_baseport.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,156 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* 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:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Used by techview roms
+*
+*/
+
+#ifndef __SYBORG_BASEPORT__ 
+#define __SYBORG_BASEPORT__
+
+/*############################################*/
+/*#	ROM Definitions			                     #*/
+/*#					                                 #*/
+/*############################################*/
+
+
+define SYBORG_L1		0x0b0a0001
+define VARIANT			syborg
+define VARID			  SYBORG_L1
+define ASSP_DIR			EPOCROOT##epoc32\release\syborg
+//define ROMMEGS			15		/* !! HEX !! */
+define _PLATFORM_NAME_		_syborg_
+
+
+kerneltrace 0x80000002
+
+
+memmodel multiple 0x100000
+//memmodel flexible 0x100000 0x1000 -0x4000
+//dlldatatop 0x7f000000
+
+
+trace 0x10
+collapse arm gcc 0
+multikernel
+
+
+version=0.01
+bootbinary=\epoc32\release\armv5\_syborg_bootloader_bootrom.bin
+
+
+debugport 0
+romsize=0x8000000
+romlinearbase=0x80000000
+romalign=0x10
+kerneldataaddress=0xC8000000
+kernelheapmin=0x08000			// calculated at boot time
+kernelheapmax=0x00FFF000
+dataaddress=0x400000
+defaultstackreserve=0x200000
+romchecksum=0x12345678
+
+
+nowrapper				// no rom header
+
+
+#ifdef UNICODE
+unicode
+#endif
+
+#define HEAPMAX(x)
+
+
+/*#################################################################################*/
+/*#	                   KERNEL, Compiler Support and User Binaries	  	            #*/
+/*#					                                                                      #*/
+/*#################################################################################*/
+
+
+/* The Symbian Kernel and Kernel Things. */
+// Must align kernel to 16K boundary since exception vectors will be mapped at 0xFFFF0000
+primary[VARID]=		KERNEL_DIR\DEBUG_DIR\_PLATFORM_NAME_EKERN.EXE		          \sys\bin\EKERN.EXE	code-align 0x4000
+file=			        ABI_DIR\DEBUG_DIR\_PLATFORM_NAME_euser.dll		            \sys\bin\EUser.dll	// EUser Library
+
+
+extension[VARID]=	KERNEL_DIR\DEBUG_DIR\EXSTART.DLL			                    \sys\bin\EXSTART.DLL	// Symbian First Stage Starter
+file=			        ABI_DIR\DEBUG_DIR\RPIPE.DLL				                        \sys\bin\RPIPE.dll	// ?? To Find
+extension[VARID]=	KERNEL_DIR\DEBUG_DIR\EVFP.DLL				                      \sys\bin\EVFP.DLL	// IEEE-mode VFP support.
+file=			        ABI_DIR\DEBUG_DIR\ektran.dll				                      \sys\bin\EKTran.dll	// ?? To Find
+
+
+// Compiler and ABI support libraries
+#include <compsupp.iby>					
+
+
+/*#################################################################################*/
+/*#	                   HW Specific Binaries, Silicon HW Baseport       	  #*/
+/*#					                                          #*/
+/*#################################################################################*/
+
+
+/* Hardware Platform Registers and Funcionality ( HW Registers, HW Timers, Mailboxes, etcr ) */
+variant[VARID]=		KERNEL_DIR\DEBUG_DIR\_PLATFORM_NAME_KASYBORG.DLL	  \sys\bin\KASYBORG.DLL	// HW Resources 
+
+
+/* Display Controller, LCD HW Interface, */
+//extension[VARID]=	KERNEL_DIR\DEBUG_DIR\_PLATFORM_NAME_LCD.DLL		      \sys\bin\LCD.DLL 	// Frame Buffer for Syborg
+//file=			        KERNEL_DIR\DEBUG_DIR\EDISP.dll	                    \sys\bin\EDISP.DLL	// Display Driver for TexShell
+
+/* Display Driver */
+device[VARID]=    KERNEL_DIR\DEBUG_DIR\display.ldd	                    \sys\bin\display0.ldd	// Display Driver for Syborg LDD
+extension[VARID]=	KERNEL_DIR\DEBUG_DIR\_syborg_svpframebuffer.dll       \sys\bin\LCD.DLL 	       // Frame Buffer for Syborg PDD
+file=             ABI_DIR\DEBUG_DIR\_generic_scdv.dll                   \sys\bin\scdv.dll           // Generic Driver with GCE Support
+
+
+/* UART Serial Port HW Interfaces and Drivers */
+device[VARID]=		KERNEL_DIR\DEBUG_DIR\ECOMM.LDD				              \sys\bin\ECOMM.LDD	// Serial Port Drivers
+device[VARID]=		KERNEL_DIR\DEBUG_DIR\_PLATFORM_NAME_ESERIAL.PDD		  \sys\bin\ESERIAL.PDD	// Serial Port Drivers
+
+extension[VARID]=	KERNEL_DIR\DEBUG_DIR\_PLATFORM_NAME_EPOINTER.DLL	  \sys\bin\EPOINTER.DLL	// ???
+
+
+/* NAND/NOR/RAM Drive HW Interface and NAND/NOR/RAM Drive Drivers */
+extension[VARID]=	KERNEL_DIR\DEBUG_DIR\_PLATFORM_NAME_MEDINT.PDD	    \sys\bin\MEDINT.PDD	// Internal RAM Media Driver
+
+
+/* Keyboard Support */ 
+extension[VARID]=	KERNEL_DIR\DEBUG_DIR\_PLATFORM_NAME_EKEYB.DLL		    \sys\bin\EKEYB.DLL	// Keyboard Driver
+file[VARID]=		  KERNEL_DIR\DEBUG_DIR\_PLATFORM_NAME_EKDATA.DLL	    \sys\bin\EKDATA.DLL	// Keyboard map
+
+
+/* Syborg Hardware Abstraction Layer */ 
+file=ABI_DIR\DEBUG_DIR\_PLATFORM_NAME_hal.dll					                 \sys\bin\Hal.dll	// Syborg HAL
+
+          
+
+/*#################################################################################*/
+/*#	              HW/SW Debug and Trace Support Specific Binaries	            	  #*/
+/*#					                                                                      #*/
+/*#################################################################################*/
+
+/* Trace and Debug Support */
+// Common monitor support. Must be before both 
+//interactive debugger and automatic logger.
+
+define BTRACEX_LDD _PLATFORM_NAME_btracex.ldd 
+
+#include <btrace.iby>
+
+
+extension[VARID]= KERNEL_DIR\DEBUG_DIR\_PLATFORM_NAME_EXMONCOMMON.DLL 	\sys\bin\EXMONCOMMON.DLL
+extension[VARID]=	KERNEL_DIR\DEBUG_DIR\_PLATFORM_NAME_EXMONDEBUG.DLL  	\sys\bin\EXMONDEBUG.DLL
+extension[VARID]=	KERNEL_DIR\DEBUG_DIR\KDEBUG.DLL				                \sys\bin\KDEBUG.DLL
+//device[VARID]=	KERNEL_DIR\DEBUG_DIR\D_DEBUG.LDD			                \sys\bin\D_DEBUG.LDD
+
+#endif /* __SYBORG_BASEPORT__ */
\ No newline at end of file
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/commsframework/commsframework.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/commsframework/commsframework.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,47 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// ROM include description for all networking and comms-infras components.
+// 
+//
+
+
+
+/**
+ @file
+*/
+
+
+#ifndef __COMMS_FRAMEWORK_IBY__
+#define __COMMS_FRAMEWORK_IBY__
+
+//==========================================================
+//================ Networking Components ===================
+//==========================================================
+
+//================ Comms-Infras Subsystem ==================
+/* Comms Framework */ 
+#include <commsrootserver.iby>                            // includes C32
+#include <commsfw.iby>
+#include <commsdebugutility.iby>
+#include <cflog.iby>
+#include <commsdat.iby>
+#include <mbufmgr.iby>
+#include <dial.iby>
+#include <commdb.iby>	
+#include <commsdat.iby>
+#include <esock.iby>
+
+
+#endif // __COMMS_FRAMEWORK_IBY__
+
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/graphics/aa/bitgdi.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/graphics/aa/bitgdi.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,25 @@
+// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#ifndef __BITGDI_IBY__
+#define __BITGDI_IBY__
+
+#ifdef SYMBIAN_GRAPHICS_USE_GCE
+file=ABI_DIR\BUILD_DIR\bitgdi_gce.dll 		System\Libs\BitGdi.dll
+#else
+file=ABI_DIR\BUILD_DIR\bitgdi.dll 		System\Libs\BitGdi.dll
+#endif
+
+#endif
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/graphics/aa/fbserv.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/graphics/aa/fbserv.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,22 @@
+// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#ifndef __FBSERV_IBY__
+#define __FBSERV_IBY__
+
+file=ABI_DIR\DEBUG_DIR\fbserv.exe 	System\Libs\FbServ.exe 
+file=ABI_DIR\DEBUG_DIR\fbscli.dll 	System\Libs\FbsCli.dll
+
+#endif
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/graphics/aa/fntstore.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/graphics/aa/fntstore.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,24 @@
+// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#ifndef __FNTSTORE_IBY__
+#define __FNTSTORE_IBY__
+
+REM Font File & Object Manager
+
+file=ABI_DIR\BUILD_DIR\fntstr.dll 	System\Libs\FntStr.dll 
+
+
+#endif
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/graphics/aa/freetype.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/graphics/aa/freetype.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,46 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef __FREETYPE_IBY__
+#define __FREETYPE_IBY__
+
+REM True Type Fonts
+
+#ifndef GRAPHICS_EXCLUDE_FREETYPE
+ECOM_PLUGIN(freetype.dll, 100012A7.RSC)
+#endif
+
+#ifndef EXCLUDE_FREETYPE_FONTS_FROM_ROM
+define FONTSTARGET			ZRESOURCE\fonts
+define FONTSDESTINATION 		Resource\Fonts
+
+data=FONTSTARGET\DejaVuSansCondensed.ttf				FONTSDESTINATION\DejaVuSansCondensed.ttf
+data=FONTSTARGET\DejaVuSansCondensed-Bold.ttf			FONTSDESTINATION\DejaVuSansCondensed-Bold.ttf
+data=FONTSTARGET\DejaVuSansCondensed-Oblique.ttf		FONTSDESTINATION\DejaVuSansCondensed-Oblique.ttf
+data=FONTSTARGET\DejaVuSansCondensed-BoldOblique.ttf	FONTSDESTINATION\DejaVuSansCondensed-BoldOblique.ttf
+data=FONTSTARGET\DejaVuSansMono.ttf						FONTSDESTINATION\DejaVuSansMono.ttf
+data=FONTSTARGET\DejaVuSansMono-Bold.ttf				FONTSDESTINATION\DejaVuSansMono-Bold.ttf
+data=FONTSTARGET\DejaVuSansMono-Oblique.ttf				FONTSDESTINATION\DejaVuSansMono-Oblique.ttf
+data=FONTSTARGET\DejaVuSansMono-BoldOblique.ttf			FONTSDESTINATION\DejaVuSansMono-BoldOblique.ttf
+data=FONTSTARGET\DejaVuSerifCondensed.ttf				FONTSDESTINATION\DejaVuSerifCondensed.ttf
+data=FONTSTARGET\DejaVuSerifCondensed-Bold.ttf			FONTSDESTINATION\DejaVuSerifCondensed-Bold.ttf
+data=FONTSTARGET\DejaVuSerifCondensed-Italic.ttf		FONTSDESTINATION\DejaVuSerifCondensed-Italic.ttf
+data=FONTSTARGET\DejaVuSerifCondensed-BoldItalic.ttf	FONTSDESTINATION\DejaVuSerifCondensed-BoldItalic.ttf
+#endif
+
+
+#endif
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/graphics/aa/gdi.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/graphics/aa/gdi.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,24 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#ifndef __GDI_IBY__
+#define __GDI_IBY__
+
+file=ABI_DIR\BUILD_DIR\gdi.dll 	System\Libs\Gdi.dll
+file=ABI_DIR\BUILD_DIR\linebreak.dll   System\Libs\linebreak.dll
+file=ABI_DIR\BUILD_DIR\lookuptable.dll 	System\Libs\lookuptable.dll
+
+#endif
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/graphics/aa/iculayoutengine.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/graphics/aa/iculayoutengine.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,24 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef __ICULAYOUTENGINE_IBY__
+#define __ICULAYOUTENGINE_IBY__
+
+REM Shaper
+ECOM_PLUGIN(IcuLayoutEngine.dll, IcuLayoutEngine.RSC)
+
+#endif
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/graphics/aa/libvgi.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/graphics/aa/libvgi.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,26 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+// VGI.iby
+//
+//
+
+#ifndef __OPENVG_VGI_IBY__
+#define __OPENVG_VGI_IBY__
+
+file=ABI_DIR\BUILD_DIR\libvgi.dll       \sys\bin\libvgi.dll
+
+#endif
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/graphics/aa/openvg.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/graphics/aa/openvg.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,27 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+// VGI.iby
+//
+//
+
+#ifndef __OPENVG_IBY__
+#define __OPENVG_IBY__
+
+file=ABI_DIR\BUILD_DIR\libopenVG.dll       \sys\bin\libopenVG.dll
+file=ABI_DIR\BUILD_DIR\libopenVGU.dll       \sys\bin\libopenVGU.dll
+
+#endif
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/graphics/aa/palette.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/graphics/aa/palette.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,21 @@
+// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#ifndef __PALETTE_IBY__
+#define __PALETTE_IBY__
+
+file=ABI_DIR\BUILD_DIR\Palette.dll		 	System\Libs\Palette.dll
+
+#endif
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/graphics/screendriver.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/graphics/screendriver.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,27 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef __SCREENDRIVER_IBY__
+#define __SCREENDRIVER_IBY__
+
+//#ifdef SYMBIAN_GRAPHICS_USE_GCE
+file=ABI_DIR\DEBUG_DIR\_generic_scdv.dll           \sys\bin\scdv.dll           // Generic Driver with GCE Support
+//#else
+//file=ABI_DIR\DEBUG_DIR\_omapqvga_scdv.dll          \sys\bin\scdv.dll           // Generic Driver without GCE Support
+//#endif
+
+#endif
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/group/bld.inf	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,54 @@
+/*
+* Copyright (c) 2010 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:
+*
+*/
+
+PRJ_PLATFORMS
+ARMV5
+
+PRJ_EXPORTS
+../F32/F32.iby                                  /epoc32/rom/config/syborg/platform/F32/
+../QT46/qt.iby                                  /epoc32/rom/config/syborg/platform/QT46/
+../S60Macros.iby                                /epoc32/rom/config/syborg/platform/
+../baseport/Syborg_textshell.iby                /epoc32/rom/config/syborg/platform/baseport/
+../baseport/compsupp.iby                        /epoc32/rom/config/syborg/platform/baseport/
+../baseport/syborg_baseport.iby                 /epoc32/rom/config/syborg/platform/baseport/
+../commsframework/commsframework.iby            /epoc32/rom/config/syborg/platform/commsframework/
+../graphics/aa/bitgdi.iby                       /epoc32/rom/config/syborg/platform/graphics/aa/
+../graphics/aa/fbserv.iby                       /epoc32/rom/config/syborg/platform/graphics/aa/
+../graphics/aa/fntstore.iby                     /epoc32/rom/config/syborg/platform/graphics/aa/
+../graphics/aa/freetype.iby                     /epoc32/rom/config/syborg/platform/graphics/aa/
+../graphics/aa/gdi.iby                          /epoc32/rom/config/syborg/platform/graphics/aa/
+../graphics/aa/iculayoutengine.iby              /epoc32/rom/config/syborg/platform/graphics/aa/
+../graphics/aa/libvgi.iby                       /epoc32/rom/config/syborg/platform/graphics/aa/
+../graphics/aa/openvg.iby                       /epoc32/rom/config/syborg/platform/graphics/aa/
+../graphics/aa/palette.iby                      /epoc32/rom/config/syborg/platform/graphics/aa/
+../graphics/screendriver.iby                    /epoc32/rom/config/syborg/platform/graphics/
+../image_conf_Syborg.mk                         /epoc32/rom/config/syborg/platform/
+../image_conf_Syborg_tshell.mk                  /epoc32/rom/config/syborg/platform/
+../language/langpack_01/language_variant.mk     /epoc32/rom/config/syborg/platform/language/langpack_01/
+../mw/custom/AppInstUI.iby                      /epoc32/rom/config/syborg/platform/mw/custom/
+../romheader/header.iby                         /epoc32/rom/config/syborg/platform/
+../syborgMasterFullUI.oby                       /epoc32/rom/config/syborg/platform/
+../syborgMasterTextShell.oby                    /epoc32/rom/config/syborg/platform/
+../systemModel/S60Macros.iby                    /epoc32/rom/config/syborg/platform/systemModel/
+../systemModel/app.iby                          /epoc32/rom/config/syborg/platform/systemModel/
+../systemModel/mw.iby                           /epoc32/rom/config/syborg/platform/systemModel/
+../systemModel/os.iby                           /epoc32/rom/config/syborg/platform/systemModel/
+../systemstarter/SSCForStartupMode1.rss         /epoc32/rom/config/syborg/platform/systemstarter/
+../systemstarter/SSCForStartupMode1_target.rss  /epoc32/rom/config/syborg/platform/systemstarter/
+../systemstarter/initilizelocale_Variant.iby    /epoc32/rom/config/syborg/platform/systemstarter/
+../systemstarter/sysagent.iby                   /epoc32/rom/config/syborg/platform/systemstarter/
+../systemstarter/sysstart.iby                   /epoc32/rom/config/syborg/platform/systemstarter/
+../systemstarter/sysstartconfig.iby             /epoc32/rom/config/syborg/platform/systemstarter/
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/image_conf_Syborg.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/image_conf_Syborg.mk	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,93 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+# which accompanies this distribution, and is available
+# at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# Example version of a platform-specific configuration makefile,
+# common to many products.
+#
+
+COREPLAT_NAME    =__SYBORG__
+COREPLAT_VERSION = 1
+S60_VERSION      = 5.0
+SOS_VERSION      = 9.4
+PLATFORM_NAME    =__SYBORG__
+
+
+USE_PAGING     	= 0
+USE_ROMFILE    	= 1
+USE_ROFS	      = 0
+USE_SYMGEN     	= 0
+USE_UDEB       	= 0
+USE_VARIANTBLD 	= 0
+USE_VERGEN     	= 1
+USE_FLOAT       = 0
+
+
+PRODUCT_NAME  	= Syborg
+PLATFORM_NAME   = Syborg
+PRODUCT_TYPE  	= Syborg
+PRODUCT_MODEL 	= Syborg
+
+ARM_VERSION     = _ARMV5
+ROMMEGS         =71
+ROMDATE         =abcd 
+
+
+# CORE
+# imaker -f /epoc32/rom/config/platform/product/image_conf_product.mk core
+#(ARM_VERSION)
+COREPLAT_OPT = $(BLDROM_OPT) -D_EABI=$(ARM_VERSION)\
+  $(if $(PRODUCT_MSTNAME),-D$(call ucase,$(PRODUCT_MSTNAME))) -D$(call ucase,$(PRODUCT_NAME)) $(PRODUCT_OPT)
+
+#CORE_OBYGEN =\
+#  geniby | $(CORE_PREFIX)_core_collected.oby |\
+#    $(E32ROMINC)/core/app $(E32ROMINC)/core/mw $(E32ROMINC)/core/osext\
+#    $(call select,$(TYPE),prd,,$(E32ROMINC)/core/tools) | *.iby | \#include "%3" | end
+#
+#CORE_OBY = $(E32ROM)/master.oby $(CORE_PREFIX)_core_collected.oby <symbianos.iby> <variant/patchdata.iby>
+
+NAME            = MySyborg
+CORE_NAME 	    = Syborg
+CORE_NDNAME     = Syborg.NDcore
+CORE_OBY        = $(E32ROM)/config/Syborg/platform/SyborgMasterFullUI.oby
+
+CORE_UDEBFILE   = $(E32ROM)/config/Syborg/platform/mytraces.txt
+CORE_ROMFILE    = $(E32ROM)/config/Syborg/platform/romfiles.txt
+CORE_NDPROMFILE	= $(E32ROM)/config/Syborg/platform/romfiles.txt
+CORE_OPT= $(COREPLAT_OPT) -es60ibymacros -DSECTION
+
+# Workaround to fix Rombuild errors:
+# "ERROR: incorrect format for time keyword..." and "The size of the ROM has not been supplied."
+CORE_OPT += --DROMMEGS=80 --DROMDATE=$(CORE_TIME)
+
+
+# ROFS2
+# imaker -f /epoc32/rom/config/platform/product/image_conf_product.mk langpack_01
+#
+ROFS2_OBYGEN =\
+  geniby | $(ROFS2_PREFIX)_rofs2_customer_collected.oby | $(E32ROMINC)/customer/* | *.iby | \#include "%3" | end |\
+  geniby | $(ROFS2_PREFIX)_rofs2_language_collected.oby | $(E32ROMINC)/language/* |\
+    __header__ | LOCALISE_ALL_RESOURCES_BEGIN | *.iby | \#include "%3" | __footer__ | LOCALISE_ALL_RESOURCES_END | end
+
+ROFS2_OBY = <Variant.oby> $(ROFS2_PREFIX)_rofs2_language_collected.oby $(ROFS2_PREFIX)_rofs2_customer_collected.oby
+ROFS2_OPT = $(COREPLAT_OPT) -es60ibymacros -elocalise -DLOCALES_SC_IBY -D__LOCALES_SC_IBY__
+
+
+# ROFS3
+# imaker -f /epoc32/rom/config/platform/product/image_conf_product.mk custvariant_XX
+#
+ROFS3_OBYGEN =\
+  geniby | $(ROFS3_PREFIX)_rofs3_collected.oby | $(E32ROMINC)/customervariant/* | *.iby | \#include "%3" | end
+
+ROFS3_OBY = $(ROFS3_PREFIX)_rofs3_collected.oby
+ROFS3_OPT = $(COREPLAT_OPT) -es60ibymacros
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/image_conf_Syborg_tshell.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/image_conf_Syborg_tshell.mk	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,90 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+# which accompanies this distribution, and is available
+# at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# Example version of a platform-specific configuration makefile,
+# common to many products.
+#
+
+COREPLAT_NAME    =__SYBORG__
+COREPLAT_VERSION = 1
+S60_VERSION      = 5.0
+SOS_VERSION      = 9.4
+PLATFORM_NAME    =__SYBORG__
+
+
+USE_PAGING     	= 0
+USE_ROMFILE    	= 1
+USE_ROFS	= 0
+USE_SYMGEN     	= 0
+USE_UDEB       	= full
+USE_VARIANTBLD 	= 0
+USE_VERGEN     	= 1
+
+
+PRODUCT_NAME  	= Syborg
+PRODUCT_TYPE  	= Syborg
+PRODUCT_MODEL 	= Syborg
+
+BUILD           =armv5
+ROMMEGS         =71
+ROMDATE         =abcd 
+
+# CORE
+# imaker -f /epoc32/rom/config/platform/product/image_conf_product.mk core
+#(ARM_VERSION)
+COREPLAT_OPT = $(BLDROM_OPT) -D_EABI=$(ARM_VERSION)\
+  $(if $(PRODUCT_MSTNAME),-D$(call ucase,$(PRODUCT_MSTNAME))) -D$(call ucase,$(PRODUCT_NAME)) $(PRODUCT_OPT)
+
+#CORE_OBYGEN =\
+#  geniby | $(CORE_PREFIX)_core_collected.oby |\
+#    $(E32ROMINC)/core/app $(E32ROMINC)/core/mw $(E32ROMINC)/core/osext\
+#    $(call select,$(TYPE),prd,,$(E32ROMINC)/core/tools) | *.iby | \#include "%3" | end
+#
+#CORE_OBY = $(E32ROM)/master.oby $(CORE_PREFIX)_core_collected.oby <symbianos.iby> <variant/patchdata.iby>
+
+NAME            = MySyborg
+CORE_NAME 	= Syborg
+CORE_NDNAME     = Syborg.NDcore
+CORE_OBY        = $(E32ROM)/config/Syborg/platform/SyborgMasterTextShell.oby
+
+CORE_UDEBFILE   = $(E32ROM)/config/Syborg/platform/mytraces.txt
+CORE_ROMFILE    = $(E32ROM)/config/Syborg/platform/romfiles.txt
+CORE_NDPROMFILE	= $(E32ROM)/config/Syborg/platform/romfiles.txt
+#Emilio CORE_OPT= $(COREPLAT_OPT) -es60ibymacros -DSECTION
+
+# Workaround to fix Rombuild errors:
+# "ERROR: incorrect format for time keyword..." and "The size of the ROM has not been supplied."
+CORE_OPT += --DROMMEGS=80 --DROMDATE=$(CORE_TIME)
+
+
+# ROFS2
+# imaker -f /epoc32/rom/config/platform/product/image_conf_product.mk langpack_01
+#
+ROFS2_OBYGEN =\
+  geniby | $(ROFS2_PREFIX)_rofs2_customer_collected.oby | $(E32ROMINC)/customer/* | *.iby | \#include "%3" | end |\
+  geniby | $(ROFS2_PREFIX)_rofs2_language_collected.oby | $(E32ROMINC)/language/* |\
+    __header__ | LOCALISE_ALL_RESOURCES_BEGIN | *.iby | \#include "%3" | __footer__ | LOCALISE_ALL_RESOURCES_END | end
+
+ROFS2_OBY = <Variant.oby> $(ROFS2_PREFIX)_rofs2_language_collected.oby $(ROFS2_PREFIX)_rofs2_customer_collected.oby
+ROFS2_OPT = $(COREPLAT_OPT) -es60ibymacros -elocalise -DLOCALES_SC_IBY -D__LOCALES_SC_IBY__
+
+
+# ROFS3
+# imaker -f /epoc32/rom/config/platform/product/image_conf_product.mk custvariant_XX
+#
+ROFS3_OBYGEN =\
+  geniby | $(ROFS3_PREFIX)_rofs3_collected.oby | $(E32ROMINC)/customervariant/* | *.iby | \#include "%3" | end
+
+ROFS3_OBY = $(ROFS3_PREFIX)_rofs3_collected.oby
+ROFS3_OPT = $(COREPLAT_OPT) -es60ibymacros
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/language/langpack_01/language_variant.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/language/langpack_01/language_variant.mk	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,25 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+# which accompanies this distribution, and is available
+# at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# Example language_variant.mk for langpack_01 EURO1.
+#
+
+
+LANGPACK_LANGS       = English French German Italian Portuguese Spanish
+LANGPACK_DEFAULTLANG = English
+
+# Language codes can be used as well
+#
+#LANGPACK_LANGS       = 01 02 03 05 13 04
+#LANGPACK_DEFAULTLANG = 01
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/mw/custom/AppInstUI.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/mw/custom/AppInstUI.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,65 @@
+/*
+* Copyright (c) 2004 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Series 60 ROM description for Software install application
+*
+*/
+
+
+#ifndef APPINSTUI_IBY
+#define APPINSTUI_IBY
+
+// Client API
+file = ABI_DIR\BUILD_DIR\SWInstCli.dll                       SHARED_LIB_DIR\SWInstCli.dll
+
+// Server application
+S60_APP_EXE(SWInstSvrUI)
+S60_APP_AIF_ICONS(SWInstSvrUI)
+S60_APP_AIF_RSC(SWInstSvrUI)
+
+// CommonUI
+file = ABI_DIR\BUILD_DIR\SWInstCommonUI.dll                  SHARED_LIB_DIR\SWInstCommonUI.dll
+
+//Emilio #ifdef __INSTALLER_SISX
+ // Sisx plugin
+//Emilio ECOM_PLUGIN(SisxUI.dll,101F875D.rsc)
+//Emilio #endif
+
+#ifndef RD_JAVA_ARCHITECTURE_RENEWAL_PHASE1
+#ifdef __JAVA_MIDP20
+ // Midlet plugin
+ ECOM_PLUGIN(MidletUI.dll,101F875F.rsc) 
+#endif
+#endif
+
+// Task manager
+file = ABI_DIR\BUILD_DIR\SWInstTaskManager.dll               SHARED_LIB_DIR\SWInstTaskManager.dll
+
+// Log task
+ECOM_PLUGIN(SWInstLogTask.dll,10207211.rsc)
+data=ZPRIVATE\100012a5\policy\10207216.spd                   PRIVATE\100012a5\policy\10207216.spd
+
+// File task
+ECOM_PLUGIN(SWInstFileTask.dll,102073EC.rsc)
+
+//EMILIO #ifdef __EXTENDED_STARTUP
+ // Startup task
+//EMILIO ECOM_PLUGIN(SWInstStartupTask.dll,1020720E.rsc)
+//EMILIO #endif
+
+// Backup
+data=ZPRIVATE\101F875A\backup_registration.xml               PRIVATE\101F875A\backup_registration.xml
+
+#endif // APPINSTUI_IBY
+
+//  End of File
\ No newline at end of file
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/romheader/header.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/romheader/header.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,171 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+// 
+// Contributors:
+//
+
+#ifndef __HEADER_IBY__
+#define __HEADER_IBY__
+
+unicode
+
+romsize=0x##ROMMEGS##00000
+time=ROMDATE 12:00:00
+
+#ifdef CDMA
+define CDMA_SUFFIX _cdma
+#else
+define CDMA_SUFFIX ## 		// nothing
+#endif
+
+#ifdef _NAND
+define NAND_SUFFIX .nand
+#else
+define NAND_SUFFIX ##		// nothing
+#endif
+
+#ifdef _NAND2
+define NAND_SUFFIX .nand
+#endif
+
+romname=##VARIANT##_##BUILDNO##LANGID##.##OBEYFILE##CDMA_SUFFIX##NAND_SUFFIX.IMG
+
+#ifdef _NAND
+ECHO Preparing NAND core image with associated ROFS image
+
+#ifndef _ROFS_SIZE
+#define _ROFS_SIZE	32000000	// 32 Meg default
+#endif
+define ROFS_SIZE	_ROFS_SIZE
+
+compress
+rom_image 1 rofs size=ROFS_SIZE non-xip compress
+
+#endif
+
+
+#ifdef _NAND2
+ECHO Preparing NAND core image with associated ROFS image
+
+#ifndef _ROFS_SIZE
+#define _ROFS_SIZE	32000000	// 32 Meg default
+#endif
+define ROFS_SIZE	_ROFS_SIZE
+
+compress
+rom_image 1 rofs size=ROFS_SIZE non-xip compress
+
+#endif
+
+REM ROM version number
+
+version=##VERSION##(##BUILDNO##)
+
+#ifdef _FULL_DEBUG
+#ifndef _DEBUG
+#define _DEBUG // _FULL_DEBUG implies _DEBUG
+#endif
+define BUILD_DIR udeb
+#else
+define BUILD_DIR urel
+#endif
+
+#ifdef _DEBUG
+define DEBUG_DIR udeb
+#else
+define DEBUG_DIR urel
+#endif
+
+ifndef _EABI
+  ifdef _ARM4
+    define _EABI ARM4
+	 ECHO Defaulting to ARM4
+  elif defined(_ARMV5)
+    define _EABI ARMV5
+	 ECHO Defaulting to ARMV5
+  endif
+endif
+
+#  ifdef _PLAT
+#    undef _EABI
+#    define _EABI _PLAT
+#	 ECHO Defaulting to _EABI
+#  endif
+
+#  ifdef _GCCE
+#    undef _EABI
+#    define _EABI GCCE
+#  elif defined(ABIV2) || defined(ABIv2)
+#    undef _EABI
+#    define _EABI ARMV5_ABIV2
+#  endif
+
+// This is to include ABIV2 specific runtime libraries. This inclusion
+// in other obey files depends on the definition of RVCT
+#ifdef _GCCE
+# define RVCT
+#endif
+
+define ABI_DIR    EPOCROOT##epoc32\release\##_EABI
+
+#ifndef _KABI
+#define _KABI _EABI
+#endif
+
+define KERNEL_DIR   EPOCROOT##epoc32\release\##_KABI
+
+define DATAZ_     EPOCROOT##epoc32\data\Z     
+define ZSYSTEM    DATAZ_\System
+define ZPRIVATE   DATAZ_\Private
+define ZRESOURCE  DATAZ_\Resource
+
+define DATAC_     EPOCROOT##epoc32\data\C    
+define CSYSTEM    DATAC_\System    
+
+// default location of executables
+define SYSTEM_BINDIR  System\Libs		// will be Sys\Bin for Secure platform
+
+
+// Support for ECOM_PLUGIN
+// Format is ECOM_PLUGIN(<DLL Name>,<Resource File Name>)
+// e.g. ECOM_PLUGIN(foo.dll,12345abc.rsc)
+
+define ECOM_RSC_DIR Resource\Plugins
+define ECOM_BIN_DIR Sys\Bin
+
+
+// __ECOM_PLUGIN(emulator directory, file rom dir, dataz_, resource rom dir, filename, resource filename)
+#define ECOM_PLUGIN(file,resource) __ECOM_PLUGIN(ABI_DIR\BUILD_DIR,ECOM_BIN_DIR,DATAZ_,ECOM_RSC_DIR,file,file)
+#define ECOM_PLUGIN_UDEB(file,resource) __ECOM_PLUGIN(ABI_DIR\UDEB,ECOM_BIN_DIR,DATAZ_,ECOM_RSC_DIR,file,file)
+
+// Support for HIDE_ECOM_PLUGIN
+// Format is HIDE_ECOM_PLUGIN(<DLL Name>,<Resource File Name>)
+// e.g. HIDE_ECOM_PLUGIN(foo.dll,12345abc.rsc)
+
+// _HIDE__ECOM_PLUGIN(emulator directory, file rom dir, dataz_, resource rom dir, filename, resource filename)
+#define HIDE_ECOM_PLUGIN(file,resource) _HIDE__ECOM_PLUGIN(ABI_DIR\BUILD_DIR,ECOM_BIN_DIR,DATAZ_,ECOM_RSC_DIR,file,file)
+#define HIDE_ECOM_PLUGIN_UDEB(file,resource) _HIDE__ECOM_PLUGIN(ABI_DIR\UDEB,ECOM_BIN_DIR,DATAZ_,ECOM_RSC_DIR,file,file)
+
+#ifdef SYMBIAN_ROM_STATIC_PLUGIN_INFORMATION
+	enable_spi
+#else
+	disable_spi
+#endif
+
+// Secure platform setting - use PlatSec.oby to turn diagnostics on
+PlatSecDiagnostics OFF
+PlatSecEnforcement ON
+PlatSecEnforceSysBin ON
+PlatSecProcessIsolation ON 
+
+
+//#include "feature.iby"
+
+#endif
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/syborgMasterFullUI.oby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/syborgMasterFullUI.oby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,68 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* 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:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef __SYBORG_OBY__
+#define __SYBORG_OBY__
+
+
+define OBEYFILE Syborg
+define ROMDATE	##TODAY##
+
+                                                          
+#include <data_caging_paths_for_iby.hrh>                // Generic S60 Macro Definitions
+#include "S60Macros.iby"                                // Generic S60 Macro Definitions
+
+REM ##############################################################################
+
+REM Symbian UI Images OS Kernel Level
+
+REM ##############################################################################
+
+#include "./romheader/header.iby"                         // EABI and DEBUG_DIR defines for Imaker
+
+#include "./baseport/Syborg_baseport.iby"                 // Kernel and Baseport Drivers
+
+#include "./F32/F32.iby"                                  // FileServer,File systems, Base Starter , Domain Manager	
+
+REM ##############################################################################
+
+REM Symbian UI Images OS Level
+
+REM ##############################################################################
+
+REM Including the OS Layer of the System Model
+
+#include "./systemModel/os.iby"
+
+REM ##############################################################################
+
+REM Symbian UI Images MW Level
+
+REM ##############################################################################
+
+#include "./systemModel/mw.iby"
+
+ 
+REM ##############################################################################
+
+REM Symbian UI Images App Level
+
+REM ############################################################################## 
+
+#include ".\systemModel\app.iby"
+
+#endif
\ No newline at end of file
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/syborgMasterTextShell.oby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/syborgMasterTextShell.oby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,44 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* 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:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef __SYBORG_OBY__
+#define __SYBORG_OBY__
+
+
+define OBEYFILE Syborg
+define ROMDATE	##TODAY##
+
+
+
+REM ##############################################################################
+
+REM Symbian UI Images OS Kernel Level
+
+REM ##############################################################################
+
+//#define HEAPMAX(x)
+
+#include "./romheader/header.iby"		                  // EABI and DEBUG_DIR defines for Imaker
+
+#include "./baseport/syborg_baseport.iby"		            // Kernel and Baseport Drivers
+
+#include "./filesystem/F32.iby"			                    // FileServer,File systems, Base Starter , Domain Manager	
+
+#include "./baseport/syborg_textshell.iby"		          // Syborg Textshell
+
+
+#endif /* SYBORG_OBY */
\ No newline at end of file
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/systemModel/S60Macros.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/systemModel/S60Macros.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,114 @@
+/*
+* ============================================================================
+*  Name     : S60Macros.iby
+*  Part of  : ROM Build Process
+*
+*  Description:
+*  Build ROM Information
+*
+*  Version:
+*
+*  Copyright (C) 2002 Nokia Corporation.
+*  This material, including documentation and any related 
+*  computer programs, is protected by copyright controlled by 
+*  Nokia Corporation. All rights are reserved. Copying, 
+*  including reproducing, storing,  adapting or translating, any 
+*  or all of this material requires the prior written consent of 
+*  Nokia Corporation. This material also contains confidential 
+*  information which may not be disclosed to others without the 
+*  prior written consent of Nokia Corporation.
+*
+* ============================================================================
+*/
+
+#ifndef __S60MACROS_IBY__
+#define __S60MACROS_IBY__
+
+// Scalable image
+#ifdef RD_SCALABLE_UI
+ #define SCALABLE_IMAGE(path,target,name) __SCALABLE_IMAGE(DATAZ_,path,target,name)
+#else
+ #define SCALABLE_IMAGE(path,target,name) AUTO-BITMAP=DATAZ_\ ## path ## \ ## name ## .mbm  target ## \ ## name ## .mbm
+#endif
+
+
+
+// App files
+#ifndef RD_APPS_TO_EXES
+ #define S60_APP_EXE(NAME) file=ABI_DIR\BUILD_DIR\ ## NAME ## .app                   System\Apps\ ## NAME ## \ ## NAME ## .app
+ #define S60_APP_EXE_UDEB(NAME) file=ABI_DIR\UDEB\ ## NAME ## .app                   System\Apps\ ## NAME ## \ ## NAME ## .app
+#else // RD_APPS_TO_EXES
+ #define S60_APP_EXE(NAME) file=ABI_DIR\BUILD_DIR\ ## NAME ## .exe                   PROGRAMS_DIR\ ## NAME ## .exe
+ #define S60_APP_EXE_UDEB(NAME) file=ABI_DIR\UDEB\ ## NAME ## .exe                   PROGRAMS_DIR\ ## NAME ## .exe
+#endif // RD_APPS_TO_EXES
+
+
+
+// App bitmap
+#ifdef RD_APPS_TO_EXES
+ #ifdef RD_SCALABLE_UI
+  #define S60_APP_BITMAP(NAME) __SCALABLE_IMAGE(DATAZ_,APP_BITMAP_DIR,APP_BITMAP_DIR, ## NAME ## )
+  #define S60_APP_BITMAP2(DIR,NAME) __SCALABLE_IMAGE(DATAZ_,APP_BITMAP_DIR,APP_BITMAP_DIR, ## NAME ## )
+ #else // RD_SCALABLE_UI
+  #define S60_APP_BITMAP(NAME) AUTO-BITMAP=DATAZ_\APP_BITMAP_DIR\ ## NAME ## .mbm APP_BITMAP_DIR\ ## NAME ## .mbm
+  #define S60_APP_BITMAP2(DIR,NAME) AUTO-BITMAP=DATAZ_\APP_BITMAP_DIR\ ## NAME ## .mbm APP_BITMAP_DIR\ ## NAME ## .mbm
+ #endif // RD_SCALABLE_UI
+#else // RD_APPS_TO_EXES
+ #ifdef RD_SCALABLE_UI
+  #define S60_APP_BITMAP(NAME) __SCALABLE_IMAGE(DATAZ_,System\Apps\ ## NAME ## ,System\Apps\ ## NAME ## , ## NAME ## )
+  #define S60_APP_BITMAP2(DIR,NAME) __SCALABLE_IMAGE(DATAZ_,System\Apps\ ## DIR ## ,System\Apps\ ## DIR ## , ## NAME ## )
+ #else // RD_SCALABLE_UI
+  #define S60_APP_BITMAP(NAME) AUTO-BITMAP=DATAZ_\System\Apps\ ## NAME ## \ ## NAME ## .mbm System\Apps\ ## NAME ## \ ## NAME ## .mbm
+  #define S60_APP_BITMAP2(DIR,NAME) AUTO-BITMAP=DATAZ_\System\Apps\ ## DIR ## \ ## NAME ## .mbm System\Apps\ ## DIR ## \ ## NAME ## .mbm
+ #endif // RD_SCALABLE_UI
+#endif // RD_APPS_TO_EXES
+
+
+
+// AIF icons/files
+#ifdef RD_SCALABLE_UI // New app framework used
+ #ifdef RD_APPS_TO_EXES
+  #ifdef __SCALABLE_ICONS
+   #define S60_APP_AIF_ICONS(NAME) data=DATAZ_\APP_BITMAP_DIR\ ## NAME ## _AIF.MIF    APP_BITMAP_DIR\ ## NAME ## _aif.mif
+  #else
+   #define S60_APP_AIF_ICONS(NAME) AUTO-BITMAP=DATAZ_\APP_BITMAP_DIR\ ## NAME ## _AIF.MBM       APP_BITMAP_DIR\ ## NAME ## _aif.mbm
+  #endif
+ #else // RD_APPS_TO_EXES
+  #ifdef __SCALABLE_ICONS
+   #define S60_APP_AIF_ICONS(NAME) data=ZSYSTEM\APPS\ ## NAME ## \ ## NAME ## _AIF.MIF       System\Apps\ ## NAME ## \ ## NAME ## _aif.mif
+  #else
+   #define S60_APP_AIF_ICONS(NAME) AUTO-BITMAP=ZSYSTEM\APPS\ ## NAME ## \ ## NAME ## _AIF.MBM       System\Apps\ ## NAME ## \ ## NAME ## _aif.mbm
+  #endif
+ #endif // RD_APPS_TO_EXES
+ #define S60_APP_AIF_RSC(NAME) data=DATAZ_\PRIVATE\10003A3F\APPS\ ## NAME ## _reg.rsc        Private\10003a3f\apps\ ## NAME ## _reg.rsc
+ #define S60_UPGRADABLE_APP_REG_RSC(NAME) data=DATAZ_\PRIVATE\10003A3F\APPS\ ## NAME ## _reg.rsc        Private\10003a3f\import\apps\ ## NAME ## _reg.rsc
+
+#else // RD_SCALABLE_UI Old app framework used
+ #define S60_APP_AIF_ICONS(NAME) AIF=ZSYSTEM\APPS\ ## NAME ## \ ## NAME ## .AIF            System\Apps\ ## NAME ## \ ## NAME ## .aif
+ #define S60_APP_AIF_RSC(NAME)
+ #define S60_UPGRADABLE_APP_REG_RSC(NAME)
+#endif
+
+
+
+//Resource file(s)
+#ifdef RD_APPS_TO_EXES
+ #define S60_APP_RESOURCE(NAME)  data=DATAZ_\APP_RESOURCE_DIR\ ## NAME ## .RSC   APP_RESOURCE_DIR\ ## NAME ## .rsc
+ #define S60_APP_RESOURCE2(APPNAME,RESNAME) data=DATAZ_\APP_RESOURCE_DIR\ ## RESNAME ## .RSC   APP_RESOURCE_DIR\ ## RESNAME ## .rsc
+ #ifndef RD_SCALABLE_UI // Old app framework used
+  #define S60_APP_CAPTION(NAME)  data=DATAZ_\APP_RESOURCE_DIR\ ## NAME ## _CAPTION.RSC   APP_RESOURCE_DIR\ ## NAME ## _caption.rsc
+ #else
+  #define S60_APP_CAPTION(NAME)
+ #endif // RD_SCALABLE_UI
+#else // RD_APPS_TO_EXES
+ #define S60_APP_RESOURCE(NAME)  data=ZSYSTEM\APPS\ ## NAME ## \ ## NAME ## .RSC    System\Apps\ ## NAME ## \ ## NAME ## .rsc
+ #define S60_APP_RESOURCE2(APPNAME,RESNAME) data=ZSYSTEM\APPS\ ## APPNAME ## \ ## RESNAME ## .RSC    System\Apps\ ## APPNAME ## \ ## RESNAME ## .rsc
+ #ifndef RD_SCALABLE_UI // Old app framework used
+  #define S60_APP_CAPTION(NAME)  data=ZSYSTEM\APPS\ ## NAME ## \ ## NAME ## _CAPTION.RSC   System\Apps\ ## NAME ## \ ## NAME ## _caption.rsc
+ #else
+  #define S60_APP_CAPTION(NAME)
+ #endif // RD_SCALABLE_UI
+#endif // RD_APPS_TO_EXES
+
+
+#endif //__S60MACROS_IBY__
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/systemModel/app.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/systemModel/app.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,113 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* 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:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef __APP_IBY__
+#define __APP_IBY__
+
+                                                          
+#include <data_caging_paths_for_iby.hrh>                     // Generic S60 Macro Definitions
+#include "S60Macros.iby"                                     // Generic S60 Macro Definitions
+ 
+ 
+REM ##############################################################################
+
+REM Symbian UI Images App Level
+
+REM ############################################################################## 
+
+#include <wappush.iby>                                // Required by DRM5 in MW LAYER !!! 
+#include <gtbioutils.iby>                             // Required by wappush
+//file=ABI_DIR\BUILD_DIR\GsmU.dll                       SYSTEM_BINDIR\GsmU.dll
+//file=ABI_DIR\BUILD_DIR\smcm_gsm.dll                   SYSTEM_BINDIR\smcm.dll
+
+#include <versit.iby>                                 // Required by cntModel.dll                        
+#include <conarc.iby>                                 // Required by cntModel.dll
+file=ABI_DIR\BUILD_DIR\ineturilist.dll		            system\libs\ineturilist.dll
+
+#include <.\core\app\richBio.iby>                     // Required by the rsfw.iby in MW LAYER !!!!
+#include <.\core\app\Msgeditorutils.iby>              // Required by the rsfw.iby in MW LAYER !!!!
+#include <.\core\app\MsgMedia.iby>                    // Required by SendUIServices in MW LAYER !!!!
+
+file=ABI_DIR\BUILD_DIR\javadrmutils.dll               SHARED_LIB_DIR\javadrmutils.dll            // in javastubs.iby required by msgcommonutils in MW LAYER !!!
+
+#include <.\core\app\MsgEditor.iby>                   // Required by Richbio and MsgEditorUtil
+#include <.\core\app\Npdlib.iby>                      // Required by MsgEditor
+#include <.\core\app\Muiu.iby>                        // Required by MsgEditor
+
+#include <.\core\app\xhtmlparser.iby>                 // Required by MsgEditor
+#include <gmxml.iby>                                  // Required by xhtmlparser.iby 
+
+file=ABI_DIR\BUILD_DIR\NewService.DLL                 SHARED_LIB_DIR\NewService.DLL      // in VoiceRecorder.iby lets keep like this for a while
+
+#include <.\core\app\CalenImp.iby>                    // Required by SYNCML
+#include <.\core\app\CalenInterimUtils.iby>           // Required by SYNCML
+#include <CalInterimApi.iby>                          // Required by SYNCML
+#include <.\core\app\calencommonutils.iby>
+#include <.\core\app\Calensvr.iby> 
+#include <.\core\app\Calenglobaldata.iby>  
+#include <.\core\app\missedalarmstore.iby>
+#include <.\core\app\AlmAlert.iby>
+#include <.\core\app\CalenLauncher.iby>
+
+#include <.\core\app\PhoneSettings.iby>
+#include <.\core\app\pcs.iby>
+
+#include <.\core\app\PhoneCntFinder.iby>
+
+#include <.\core\app\Phonebook.iby>
+#include <.\language\app\PhonebookResources.iby>
+#include <.\core\app\Phonebook2.iby>
+#include <.\language\app\Phonebook2Resources.iby>
+#include <.\core\app\pbk2rclcontactactionservice.iby>
+#include <.\core\app\pbk2rclcontactactionserviceresources.iby>
+#include <.\core\app\pbk2remotecontactlookup.iby>
+#include <.\core\app\pbk2remotecontactlookupresources.iby>
+
+
+#include <cntmodel.iby>
+#include <.\core\app\filelist.iby>
+#include <.\core\app\browserlauncher.iby>
+
+#include <.\core\app\MmsEngine.iby>
+
+#include <scheduledsending.iby>
+
+#include <gtsmsmtm.iby>
+
+#include <.\core\app\sssettings.iby>
+#include <ups.iby>
+
+/* Speed Dial */
+#include <.\core\app\spdctrl.iby>
+#include <.\language\app\SpeeddialResources.iby>
+
+/* Virtual Phonebook */
+#include <.\core\app\VirtualPhonebook.iby>
+
+/* Contact Presence */
+#include <.\core\app\contactpresence.iby>
+
+
+#include <.\core\app\ccaclient.iby>
+
+#include <.\core\app\presencetrafficlights.iby>
+#include <.\core\app\presencecache.iby>
+#include <.\core\app\bpas.iby>
+
+#include <.\core\app\wvsapsettingsstore.iby>
+
+#endif
\ No newline at end of file
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/systemModel/mw.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/systemModel/mw.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,429 @@
+#ifndef __MW_IBY__
+#define __MW_IBY__
+                                                        
+#include <data_caging_paths_for_iby.hrh>                // Generic S60 Macro Definitions
+
+
+REM ##############################################################################
+
+REM Symbian UI Images MW Level
+
+REM ##############################################################################
+
+#include <Version_Variant.iby>                            // Languages.txt,langsw.txt , etcr 
+
+#include <.\language\mw\elocl.iby>                        // IMPORTANT !!! Defines Series60 localized files ( duplicated file )
+#include <S60CenRep_variant.iby>                          // IMPORTANT Central Repository Files for Avkon et all 
+
+#include <.\core\mw\XMLInterface.iby>                     // Used by the SVG Engine
+#include <.\core\mw\cXMLParser.iby>                       // Required by the XMLInterface
+
+#include <.\core\mw\DRMHelper.iby>                        // Required by the AknSkinsServer
+#include <.\core\mw\DownloadMgr.iby>                      // Required by the DRMHelper 
+#include <.\core\mw\CodHandler.iby>                       // Required by DownloadMgr  TODO : What is this
+#include <multipartparser.iby>                            // Required by CodHandler
+#include <.\core\mw\ApEngine.iby>                         // Required by the CodHandler
+#include <.\core\mw\Fotaserver.iby>                       // Required by the CodHandler
+#include <.\core\mw\ConnMon.iby>                          // Required by Fota Server
+#include <.\core\mw\NSmlCommon.iby>                       // SyncML Common Modules , required by FOTA Server undef manually some defines
+
+//file=ABI_DIR\BUILD_DIR\nsmldmmodule.dll			             SHARED_LIB_DIR\nsmldmmodule.dll     // Part of NsmlDSSync and NSmlCommon FOTA part , some defs are not defined
+#include <.\core\mw\NSmlDSSync.iby>                       // SyncML SyncML Data Synchronisation , required by SyncML common Modules  , Provisioning wpds.dll is disabled
+#include <.\core\mw\NSmlDMSync.iby>                       // SyncML SyncML Data Synchronisation , required by SyncML common Modules  , Provisioning wpds.dll is disabled
+
+#include <.\core\mw\policyengine.iby>                     // Required by SyncML common Modules
+#include <.\language\mw\policyengineresources.iby>        // Required by PolicyEngine
+#include <.\core\mw\dmutilserver.iby>                     // Required by PMRFs Plugin in PolicyEngine
+
+
+#include <.\core\mw\vpnapi.iby>                           // Required by APEngine
+#include <.\core\mw\WEPSecuritySettingsUI.iby>            // Required by APEngine
+#include <.\core\mw\WPASecuritySettingsUI.iby>            // Required by APEngine
+
+
+
+
+#include <.\core\mw\DRM5.iby>                             // Required by the DRMHelper 
+
+#include <.\core\mw\CmManager.iby>                        // Required by the DRMHelper 
+#include <.\core\mw\CmManagerDatabase.iby>                // Required by the CmManager 
+#include <hlpmodel.iby>                                   // GT Help Model Required by the CmManager
+#include <.\core\mw\tactilefeedback.iby>                  // Required by the CmManager
+ 
+#include <.\core\mw\HttpFilterCommon.iby>                 // Required by DRM5 and DownloadMgr
+#include <.\core\mw\wmdrm.iby>                            // Windows Media DRM Required by DRM5 and DownloadMgr
+#include <.\core\mw\connectionmanager.iby>                // Required by Windows Media DRM
+#include <.\core\mw\agentdialog.iby>                      // Required by Connection Manager
+
+#include <.\core\mw\webkit.iby>                           // Required by Windows Media DRM
+#include <.\core\mw\DownloadMgrUiLib.iby>                 // Required by WEBKIT
+#include <.\core\mw\BrowserDialogsProvider.iby>           // Required by WEBKIT
+#include <.\language\mw\BrowserDialogsProviderResources.iby>  // Required by WEBKIT
+#include <.\core\mw\CookieManager.iby>                    // Required by WEBKIT
+#include <.\core\mw\webutils.iby>                         // Required by WEBKIT
+#include <.\core\mw\gesturehelper.iby>                    // Required by WEBKIT    , Dissapeared in Symbian^3g PDK
+#include <.\core\mw\RecentURLStore.iby>                   // Required by WEBKIT
+#include <.\core\mw\WidgetInstaller.iby>                  // Required by WEBKIT
+file=ABI_DIR\BUILD_DIR\RTSecMgrClient.dll                 SHARED_LIB_DIR\RTSecMgrClient.dll   // From Serviceapi.iby 
+file=ABI_DIR\BUILD_DIR\RTSecMgrUtil.dll                   SHARED_LIB_DIR\RTSecMgrUtil.dll
+
+#include <.\core\mw\drmroapwbxmlparser.iby>               // Required by DRM5
+#include <.\core\mw\drmrightsstoringlocation.iby>         // Required by WMDRM
+
+#include <.\core\mw\ServiceHandler.iby>                   // Required by the AknSkinsServer
+
+#include <.\core\mw\commonui.iby>                         // Required by the ROAHandler in DRM5 and codhandler and downloadmanager
+#include <.\core\mw\commondialogs.iby>                    // Required by commonui
+#include <.\language\mw\commondialogsresources.iby>       // Resource files for commondialogs
+
+
+#include <.\core\mw\DirectoryLocalizer.iby>               // Required by commondialogs 
+#include <.\core\mw\rsfw.iby>                             // Remote Storage Framework ?? Required by commondialogs
+
+
+#include <.\core\mw\favouritesengine.iby>                 // Required by commonui
+#include <.\core\mw\senduiservices.iby>                   // Required by commonui
+#include <gtmtur.iby>                                     // Required by senduiservices includes messageserver ,already in the OS ,  TODO: find the correct place
+#include <.\core\mw\msgcommonutils.iby>                   // Required by senduiservices 
+
+
+#include "..\mw\custom\AppInstUI.iby"                      // Required by commonui . SISXUI PLUGIN DISABLED MANUALLY
+
+#include <.\core\mw\X509CertNameParser.iby>               // Required by AppInstUI
+
+
+
+#include <.\core\mw\aiwdialdata.iby>                      // Required by commonui
+#include <.\core\mw\spsettings.iby>                       // Required by commonui
+#include <.\core\mw\cenrepdatabase.iby>                   // Central Repository Database in MW Required by spssettings , OS CENTRAL REPOSITORY API ? 
+#include <.\core\mw\cenrepsourceplugin.iby>
+
+
+
+file=ABI_DIR\BUILD_DIR\MPEngine.dll                       SHARED_LIB_DIR\MPEngine.dll
+//file=ABI_DIR\BUILD_DIR\MediaClientVideo.dll               System\Libs\MediaClientVideo.dll
+#include <.\core\mw\mpsetteng.iby>                        // MediaPlayer Setting Engine 
+//#include <.\core\mw\MediaPlayer.iby>                    // Required by commonui don't go to the player engine yet
+//#include <mmf.iby>
+
+#include <.\core\mw\svgengine.iby>                        // SVG Engine
+#include <.\core\mw\nvgdecoder_sw.iby>                    // Required by AknIcon
+
+/* NGA */
+#include <.\core\mw\VGRenderer.iby>
+
+
+#include <imageconversion.iby>                           // Required by ICLExtJPeg also includes bitmapTransforms Required by the AknSkinsServer
+#include <iclcodecs.iby>                                 // Image Codecs Required by imageconversion
+#include <JPEGYuvDecoder.iby>                            // Image Codecs Required by Imageconversion
+#include <mmcommon.iby>                                  // Required by ImageConversion.dll
+
+#include <inetprotutil.iby>                              // Required by mmfcontrollerframework.dll
+//file=ABI_DIR\BUILD_DIR\MMFStandardCustomCommands.dll     System\Libs\MMFStandardCustomCommands.dll
+
+#include "MmfDrmPlugin.iby"
+
+#include <.\core\mw\asxparser.iby>
+
+/* Classic UI */
+
+#include <egul.iby>                                      // Egul components required by eikore
+#include <cone.iby>                                      // Cone Components
+
+#include <uikon.iby>                                     // uikon components, eikore , viewcli
+#include <.\language\mw\uikonresources.iby>              // uikon resources
+#include <.\core\mw\uiklaf.iby>
+#include <.\customer\mw\uiklaf_Variant.iby>              // uikon resources EIKPRIV.rsc
+file=ABI_DIR\BUILD_DIR\clocka.dll 		                   System\Libs\ClockA.dll     // in MESON.IBY Required by EIKMSG at runtime !!!
+file=ABI_DIR\BUILD_DIR\clock.dll 		                     System\Libs\Clock.dll      // Required by eikore
+
+#include <.\core\mw\eikstd.iby>                          // Eikon components and resource files 
+#include <.\language\mw\EikStdResources.iby>             // Eikore resources
+
+#include <.\core\mw\jplangutil.iby>                      // Required by eikstd
+#include <.\core\mw\eikctl.iby>                          // Eikon components
+#include <.\language\mw\eikctlresources.iby>             // Eikctl resources
+
+//NOT PRESENT #include <lbsvariant2.iby>                               // Required by eikctl TODO: What is this?
+
+
+#include <form.iby>
+#include <.\core\mw\fontprovider.iby>                    // Required by uiklaf.dll from uikon
+
+#include <alarmserver.iby>                               // Required by uikon , includes backuprestorenotification.iby
+
+/* FEP */
+#include <fepbase.iby>                                   // Required by uikon , 
+#include <.\language\mw\aknfepresources.iby>             
+#include <.\customer\mw\aknfep_variant.iby>
+#include <.\core\mw\aknjapanesereading.iby> 
+#include <.\core\mw\aknfepuiinterface.iby>
+#include <.\core\mw\peninputarc.iby>
+
+#include <.\core\mw\GSListBox.iby>                       // Required by FEP 
+#include <.\core\mw\GsApp.iby>                           // Required by FEP 
+#include <.\language\mw\GSAppResources.iby>              // Required by FEP
+
+
+#include <pwrcli.iby>                                    // Shutdown Server , required by Uikon TODO : Should be on the OS ?
+
+
+#include <.\core\mw\avkon.iby>                           // Avkon Components and avkon priv resources
+#include <.\language\mw\avkonresources.iby>              // Avkon Resources
+//#include <.\core\mw\aknglobalUI.iby>                     // Avkon Components
+#include <.\language\mw\aknglobalUIresources.iby>        // Resources for AknGlobalUI
+#include <.\core\mw\aknphysics.iby>                      // Avkon Components
+#include <.\core\mw\akntransitionutils.iby>               // Avkon Components
+#include <.\core\mw\aknlistloadertfx.iby>                // Avkon Components
+#include <.\core\mw\aknpictograph.iby>                    // Avkon Components
+#include <.\core\mw\aknmemcardui.iby>                     // Avkon Components, required by commondialogs
+#include <.\core\mw\akninputlanguage.iby>                 // Avkon Components, required by ApSettingsHandlerUi
+#include <.\core\mw\aknExtendedFader_ARM11.iby>
+#include <.\core\mw\Akncompamode.iby>
+
+
+#include <.\core\mw\aknskins.iby>                        // Skin Server and skins
+#include <.\customer\mw\aknskins_variant.iby>            // Skin server skin exclusion.ini file
+#include <.\language\mw\aknskinsresources.iby>           // Skin Server localizable resources aknswallpaperplugin.rsc
+#include <.\language\app\eventsui_resources.iby>         // Required by Notify Dialogs
+
+#include <.\core\mw\aknicon.iby>                         // Icon Server without oom plugin
+#include <.\core\mw\cdl.iby>                             // TO FIND What is this , required by aknicon
+
+/* LAYOUTS */
+//#include <.\core\app\fs_generic.iby>
+
+
+//#include <.\core\mw\AknLayout2.iby>
+#include <.\core\mw\AknLayout2_common.iby>
+//#include <.\core\mw\AknLayout2_double.iby>
+//#include <.\core\mw\AknLayout2_hvga.iby>
+//#include <.\core\mw\AknLayout2_low.iby>
+//#include <.\core\mw\AknLayout2_hvga_touch.iby>
+//#include <.\core\mw\AknLayout2_qhd_touch.iby>
+#include <.\core\mw\AknLayout2_nhd.iby>
+#include <.\core\mw\AknLayout2_nhd4_touch.iby>
+#include <.\core\mw\AknLayout2_qvga_touch.iby>
+#include <.\core\mw\AknLayout2_qvga1.iby>
+#include <.\core\mw\AknLayout2_qvga2.iby>
+//#include <.\core\mw\AknLayout2_vga3.iby>
+//#include <.\core\mw\AknLayout2_vga.iby>
+//#include <.\core\mw\AknLayout2_vga_touch.iby>
+
+
+#include <.\core\mw\ode.iby>                             // Required by AknPhysics
+
+#include <.\core\mw\numbergrouping.iby>                  // Required by avkon
+#include <.\core\mw\keylockpolicyapi.iby>                // Required by avkon
+#include <bmpanim.iby>                                   // Required by avkon
+#include <gfxtranseffect.iby>                            // Required by avkon
+
+#include <.\core\stubs\tactileclickpluginstub.iby>       // Required by avkon
+
+#include <.\core\mw\WidgetRegistry.iby>                  // Required by avkon
+
+#include <.\core\mw\Phoneclient.iby>                     // Required by avkon
+#include <.\core\mw\PtiEngine.iby>                       // Required by avkon
+
+/* Find Utilities */
+#include <.\core\mw\findutil.iby>                        // Required by Avkon 
+
+/* Font Utilities Dissapeared in Symbian^3g PDK*/
+#include <.\core\mw\Fontutils.iby>                       // Required by Avkon , Eikon and fontprovider
+#include <.\customer\mw\fonts_variant.iby>               // Required by Avkon , Eikon and fontprovider
+
+/* Out of Memory Monitor */
+
+#include <.\core\mw\oommonitor.iby>                      // Out of Memory Monitor Required by avkon and eikstd
+#include <.\core\mw\oodmonitor.iby>                      // Out of Memory Monitor Required by eiksrvui in uikon two oommonitors ?? ????
+
+/* Image Handling Library */
+
+#include <.\core\mw\Ihl.iby>                             // Image Handling library required by MsgEditorMediaControl.dll
+
+/* Media Fetching */
+
+#include <.\core\mw\mediafetch.iby>                      // Required by Message Editor in APP LAYER 
+
+/* Branding Server */
+#include <.\core\mw\brandingserver.iby>                  // Branding Server , Required by the phonebook in APP LAYER 
+
+/* Access Points UI*/
+#include <.\core\mw\ApSettingsHandlerUi.iby>             // Access Point Settings UI ( IN MW LAYER ??) , Required by the MediaPlayer in APP LAYER
+#include <.\core\mw\ConnectionUiUtilities.iby>           // Required by APSeetingsHandlerUI
+
+
+/* Content Listing Framework */
+#include <.\core\mw\contentlistingframework.iby>         // Content Listing Server , Required by MediaPlayer in APP LAYER
+#include <.\core\mw\metadatautility.iby>                 // Required by the Content Listing Server
+
+/* Multimedia */
+#include <.\core\mw\3GPMP4LIB.iby>                       // 3G/MP4 File Format Library, Required by Metadata Utility
+
+
+/* Time Zone Server */
+#include <timezoneserver.iby>                            // Required by imcm ( Email Framework ) . should be here or in OS Layer ??
+
+
+/* DRM Utilities */
+#include <.\core\mw\drmutility.iby>                      // DRM Utilities, Required by Mediaplayer in APP LAYER  
+
+
+/* Applications Framework */
+
+#include <emime.iby>
+#include <apparc.iby>		                                 // Application architecture 
+
+
+/* System Starter for Syborg TexShell */
+//file=	KERNEL_DIR\DEBUG_DIR\ECONS.DLL				\sys\bin\ECONS.DLL
+//file=	ABI_DIR\DEBUG_DIR\eshell.exe				\sys\bin\eshell.exe HEAPMAX(0x20000) capability tcb+diskadmin+allfiles+ProtServ
+
+
+/* SplashScreen */
+#include <.\core\mw\splashscreen.iby>
+#include <.\customer\mw\splashscreen_variant.iby> 
+
+/* Startup */
+#include <.\core\mw\startup.iby>                      // Startup Application with Startup Animations 
+#include <.\core\mw\startupanimation.iby>
+#include <.\customer\mw\startup_variant.iby>          // Resources for startup app 
+
+/* Playback */
+#include <.\core\mw\playbackhelper.iby>
+
+/* SAT */
+#include <.\core\mw\satserver.iby>
+
+/* Unknown Dissapeared in Symbian^3g PDK*/
+//#include<plpvariant.iby>
+
+/* FOTA */
+#include <.\core\mw\DevEncDiskUtils.iby>
+
+/* Phone Parser */
+#include <.\core\mw\Phoneparser.iby>
+
+/* MDS */
+#include <.\core\mw\mds.iby>
+
+/* Voice Mail */
+#include <.\core\mw\vmbxengine.iby> 
+
+/* Profile Engine */
+#include <.\core\mw\ProfileEngine.iby>
+#include <.\language\mw\ProfileEngineResources.iby>
+
+/* Tactile Feedback Resolver */
+#include <.\core\mw\tactilefeedbackresolver.iby>
+
+/* Provisioning Engine */
+#include <.\core\mw\provisioning.iby>
+
+/* SEC UI */
+#include <.\core\mw\secui.iby>
+
+/* BT Engine Settings */
+#include <.\core\mw\bteng.iby>
+
+/* Character Converter */
+#include <charconv_S60.iby>
+
+/* Unknown */
+#include <.\core\mw\rfs.iby>
+
+/* Metadata Utility */
+#include <.\core\mw\MetaDataUtility.iby>
+
+/* Thumbnail Manager */
+#include <.\core\mw\thumbnailmanager.iby>
+
+/* Synchronization */
+#include <.\core\mw\syncservice.iby>
+
+/* Unknown */
+#include <.\core\mw\hgcontextutility.iby>
+
+/* Tactile*/
+#include <.\core\mw\tacticonserver.iby>
+
+/* GOOM Monitor */
+#include <.\core\mw\goommonitor.iby>
+
+/* TNE Engine */
+#include <.\core\mw\TNEEngine.iby>
+
+/* Windows Media DRM */
+#include <.\core\mw\wmdrmkeystorage_dist.iby>
+
+/* Unknown */
+#include <.\core\mw\scpclient.iby>
+#include <.\language\mw\scpclientresources.iby>
+
+/* Location Framework */
+#include <.\core\mw\locationmnfw.iby>
+#include <.\language\mw\locationmnfw_resources.iby>
+#include <.\core\mw\LocationLandMarks.iby>
+
+/* */
+#include <.\core\mw\sortutil.iby>
+
+/* */
+#include <.\core\mw\mediafilelist.iby>
+#include <.\language\mw\mediafilelistresources.iby>
+
+/* */
+#include <.\core\app\rcse2.iby>
+
+/* SIP */
+#include <sipsw.iby>
+
+/* SWI */
+#include <swi.iby>
+
+/* Context Framework */
+#include <.\core\mw\ContextFramework.iby>
+
+/* Remote Lock */
+#include <.\core\mw\RemoteLock.iby>
+
+/* WIM Client */
+#include <.\core\mw\wim.iby>
+
+/* DRMs */
+#include <.\core\mw\wmdrmpd_dist.iby>
+
+/* UI Accelerator */
+#include <.\core\mw\alfred.iby>
+
+/* Http Dependent Components */
+#include <.\core\mw\extendedconnpref.iby>
+#include <.\core\mw\extendedconnprefecom.iby>
+
+/* */
+#include <.\core\mw\EnhancedMediaClient.iby>
+
+/* */
+#include <.\core\mw\stmgesturefw.iby>
+
+/* Audio */
+#include <.\core\mw\AudioControllerPluginsVariant.iby>
+
+/* Avkon System State Manager */
+#include <.\core\mw\akncustcmds.iby>
+
+/* PhoneServer */
+#include <.\core\mw\Phoneserver.iby>
+
+/* SysAp */
+#include <.\core\mw\SysAp.iby>
+#include <.\customer\mw\SysAp_variant.iby>
+#include <.\language\mw\SysApResources.iby>
+
+/* PowerSave Utilities */
+#include <.\core\mw\powersaveutilities.iby>
+
+/* Profile Monitor */
+#include <.\core\mw\ProfileSettingsMonitor.iby>
+
+#endif 
\ No newline at end of file
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/systemModel/os.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/systemModel/os.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,340 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* 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:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef __OS_IBY__
+#define __OS_IBY__
+                                                        
+#include <data_caging_paths_for_iby.hrh>                // Generic S60 Macro Definitions
+
+#define __INCLUDE_SW_KEYSTORE__                         // in Certman.iby some files need this
+
+
+REM ##############################################################################
+
+REM Symbian UI Images OS Level
+
+REM ##############################################################################
+
+REM From here should start the UI stuff
+
+/* Low Level libraries and Framework */
+#include <ecom.iby>                                       // Plugins Framework
+#include <bafl.iby>                                       // VERY IMPORTANT Backup Server,System Sounds Server,Centralrepository, initlocale.iby
+//Emilio #include "../core/os/initialiselocale_variant.iby"        // Custom VERY IMPORTANT FOR LOCALIZATION Central Repository file for variant locales
+
+//Not Present #include <./core/os/locale.iby>                           // Locale Files Different From Symbian^2
+
+#include <sysutil.iby>                                    //System Utilities
+
+#include <stdlib.iby>                                     // Standard C Library has a dependency with C32.lib
+#include <charconv.iby>                                   // TODO :
+//Emilio #include <./customer/mw/charconvPlugin_variant.iby>       // TODO :
+#include <ezlib.iby>                                      // Compresion Libraries
+#include <etext.iby>                                      // To FIND:
+#include <numberconversion.iby>                           // To FIND:
+#include <./core/os/platformenv.iby>                      // Required by the SkinsServer
+
+
+#include <commonengine.iby>                              // Required by the SkinsServer
+#include <commonengineresources.iby>                     // Required by the SkinsServer
+
+
+
+
+#include <FeatMgr.iby>                                   // Required by the DRMHelper ,asking if feature is supported or not 
+//Emilio #include <./customer/os/featuremanager_variant.iby>       // StaticFeatures.DLL for the feature manager
+#include <./core/os/mediator.iby>                         // Mediator Server Required by the DRMHelper
+#include <./core/os/dosserver.iby>                        // DosServer required by commonengine
+             
+#include <HWResourceManager.iby>                         
+
+#include <Openenv.iby>                                    // Includes libpthread.dll required by WEBKIT
+#include <timezonelocalization.iby>                       // Required by OpenEnv
+#include <watcher.iby>                                    // The Watcher Framework required by BIOUtils Biowatcher.dll
+#include <messageserver.iby>                              // Message Server TODO: What is this use for and where this is coming from 
+#include <schsvr.iby>                                     // Task Scheduler Server Required by FOTA Server
+#include <logeng.iby>                                     // Log Engine Required by the schsvr scheduler server
+
+
+/* Comms Framework and Networking Services */ 
+//#include "../commsframework/commsframework.iby"            // Custom Minimal comms framework for a simple UI
+#include <insock.iby>                                     // Required by the cmmanager ( comms manager ?? )
+
+                      
+/* Networking */
+#include <network.iby>  
+#include <commdb.iby>
+#include <dial.iby>
+
+// NGA stack
+//
+#define SYMBIAN_GRAPHICS_USE_GCE
+#define SYMBIAN_GRAPHICS_USE_OPENWF
+#define OPENWFCLIB_DRV <openwfc_ref.iby>
+#define EGL_DRV <egl_ref.iby>
+ 
+#include <gdi.iby>
+#include <bitgdi.iby>
+#include <fntstore.iby>
+#include <fbserv.iby>
+#include <iculayoutengine.iby>
+#include <freetype.iby>
+#include <directgdi.iby>
+#include <wserv.iby>
+#include <wslog.iby>
+//#include <econs_wserv.iby>
+#include <surfaceupdate.iby>
+#include <surfacemanager.iby>
+//file=\epoc32\release\ARMV5\urel\_generic_scdv.dll	sys\bin\scdv.dll
+ 
+//data=DATAZ_\wsini_minigui.ini	\system\data\wsini.ini
+data=DATAZ_\wsini.ini            system\data\wsini.ini
+
+
+
+/* Graphics Package */
+//#include <wserv.iby>                                        // Windows Server with NGA and NONGA Support
+
+//#include <graphicsresource.iby>
+//#include <directgdi.iby>
+//#include <surfacemanager.iby>
+//#include <surfaceupdate.iby>
+//#include <fbserv.iby>                                       // Font and Bitmap Server
+                                    
+#include <opengles.iby>
+//#include <egl.iby>                                          // Included in the OpenVG iby 
+#include <openvg.iby>                                       // Define another implementation libEGL.dll different than egl.iby
+//#include <openwfc.iby>                                      // Pointing to libegl_ref.dll
+
+//#include <tiger.iby>
+//#include <freetype.iby>
+//#include <freetype.hby>
+
+#include <.\core\os\libvgi.iby>
+#include <.\core\os\m3gcore.iby>
+
+//#ifdef _DEBUG
+//ECOM_PLUGIN_UDEB(t_extendedbitmaprenderstage.dll, t_extendedbitmaprenderstage.rsc)
+//#else
+//ECOM_PLUGIN(t_extendedbitmaprenderstage.dll, t_extendedbitmaprenderstage.rsc)
+//#endif
+//file=ABI_DIR\DEBUG_DIR\textendedbitmapgc.dll \sys\bin\textendedbitmapgc.dll
+
+//#include <sfopenvg.iby>
+//ECOM_PLUGIN(10286378.dll,10286378.rsc)
+
+
+
+//#include <gdi.iby>				                      // Graphics Device Interface
+//#include "../graphics/palette.iby"                         // Palette Components required by GDI and FontBitmap Server
+//#include <bitgdi.iby>                          // Bitmaps Graphics Device Interface
+//#include <fntstore.iby>                        // Font Storage
+
+//#include "../graphics/iculayoutengine.iby"
+//#include "../graphics/freetype.iby"                        // TrueType Support and Fonts Requires StdLib
+
+//#include "../graphics/screendriver.iby"                    // SCDV ScreenDriver NO NGA Support for Syborg and Symbian^2
+//data=DATAZ_\wsini.ini            system\data\wsini.ini
+data=DATAZ_\BMP\WSAUTOTEST.MBM   BMP\WSAUTOTEST.MBM
+
+#include <nvgrenderstage.iby>
+
+
+/* OS Security */
+#include <caf.iby>           	                            // Content Access Framework ( DRMs ).
+#include <reccafconfig.iby>                               // Content Access Framework Recognizer Configuration Files.
+
+#include <certman.iby>                                    // Required by DRM5  
+#include <crypto.iby>                                     // Required by DRM5 , includes Hash.iby and random.iby
+                                     
+
+/* XML Services */
+//#include <xml.iby>                                      // XML Package
+#include <xmlframework.iby>
+#include <.\core\os\xmlsec.iby>                          // XMLSec Package for Base64Decoding in SVGEngine.dll
+#include <xmlengine.iby>                       // Required by XMLSec 
+#include <xmlengineutils.iby>                   // Required by WEBKIT
+
+#include <sql.iby>                                        // SQL Lite
+file=ABI_DIR\BUILD_DIR\abclient.dll			  sys\bin\abclient.dll     // for central repository and sqllite
+#include <dbms.iby>                                       // Symbian Relational Database
+#include <store.iby>                                      // Symbian Local Persistent Storage
+
+
+/* Imaging and Camera Framework */
+#include <.\core\os\IclExtJpegApi.iby>                    // Required by the AknSkinsServer
+
+/* Bluetooth */
+#include <bluetooth.iby>                                  // Required by SyncML and FOTA Server 
+#include <btlogger.iby>
+
+/* Open Env */
+#include <openenv.iby>
+
+/* Etel Sat */
+#include <etelsat.iby>
+
+/* Localization */
+#include <lbs.iby>
+
+/* Etel isv */
+#include <etelisv.iby>
+
+/* Obex */
+#include <obexprotocol.iby>
+
+/* irda */
+#include <irda.iby>
+
+#include <.\core\os\diskspacereserver.iby>
+
+/* System State Manager */
+
+#include <ssma.iby>
+#include <shma.iby>
+#include <conditionevaluator.iby>
+#include <scs.iby>
+
+
+
+#include <.\core\os\ssmcmdlists.iby>
+//#include <.\core\os\ssmcompatibility.iby>
+#include <.\core\os\ssmcustcmds.iby>
+#include <.\core\os\ssmmapperutility.iby>
+#include <.\core\os\ssmpolicyplugins.iby>
+#include <.\core\os\ssmutilityplugins.iby>
+#include <.\core\os\syslangutil.iby>
+#include <.\core\os\sysrestart.iby>
+#include <ssplugins.iby>
+//#include <.\core\os\sysuiprovider.iby>
+//#include <sysstartconfig.iby>
+//#include <ssmclayer.iby>
+#include <ssrefplugins.iby>
+#include <lafshutdowneventobserveradaptor.iby>
+
+
+/* Exif Lib */
+#include <.\core\os\Exiflib.iby>
+
+
+/* */
+#include <securitycommonutils.iby>
+
+/* DRM Audio Player */
+#include <.\core\os\DrmAudioPlayer.iby>
+
+/* IP SEC */
+#include <ipsec.iby>
+
+/* OCSP */
+#include <ocsp.iby>
+//#include <ocspconfig.iby>
+
+/* WAP */
+#include <wappushsupport.iby>
+
+/* */
+#include <.\core\os\tspclientmapper.iby>
+
+/* Http */
+#include <httpcore.iby>
+
+/* MMF */
+#include <mmf.iby>
+#include <.\core\os\MmfCustomInterfaces.iby>
+#include <.\core\os\mmextfw.iby>
+#include <.\core\os\effects.iby>
+#include <.\core\os\AudioRouting.iby>
+#include <.\core\os\RestrictedAudioOutput.iby>
+#include <.\core\mw\AudioControllerPluginsVariant.iby>
+#include <.\core\os\AudioOutputControlUtility.iby>
+#include <.\core\os\AddedDevSoundControl.iby>
+
+/* */
+#include <.\core\os\ConfigurationComponentsFactory.iby>
+
+/* */
+
+
+#include "../qt46/qt.iby"
+#include <sendas2.iby>
+ 
+//file=\epoc32\release\armv5\urel\hyperui.exe 				\sys\bin\hyperui.exe
+//data=\epoc32\data\z\resource\apps\hyperui.rsc 				\resource\apps\hyperui.rsc
+//data=\epoc32\data\z\private\10003a3f\import\apps\hyperui_reg.rsc 	\private\10003a3f\import\apps\hyperui_reg.rsc
+//data=\epoc32\data\z\resource\apps\hyperui.mif 				\resource\apps\hyperui.mif
+
+//#include <.\core\os\stdcpp.iby>
+#include <.\core\os\glib.iby>
+#include <.\core\os\ssl.iby>
+#include <.\core\os\stdcpp4.iby>
+#include <.\core\os\stdlibs.iby>
+
+/**/
+#include <btlogger.iby>
+#include <cflog.iby>
+
+/* TRK Debugger */
+
+//#include <.\core\tools\dbgtrccomm.iby>
+//#include <.\core\tools\trk.iby>
+
+//data=ZSYSTEM\..\trk\trk_syborg.ini     \trk.ini
+
+// test mbms
+data=ZSYSTEM\DATA\dgdi32bit.mbm           		System\data\dgdi32bit.mbm
+
+/* Sensor Server */
+#include <.\core\os\SensorServer.iby>
+
+/* */
+#include <.\core\os\Frametable.iby>
+
+/* */
+#include <.\core\os\accremcon.iby>
+
+/* Audio Server */
+#include <a3fserverstart.iby>
+#include <a3fdevsound.iby>
+#include <acf.iby>
+#include <devsoundadaptationinfo.iby>
+#include <refacladaptation.iby>
+#include <acl.iby>
+
+/**/
+#include <refmmrc.iby>
+
+/* Telephony */
+#include <.\core\os\TelephonyAudioRouting.iby>
+#include <ctsy.iby>
+file=ABI_DIR\DEBUG_DIR\licenseetsy_stub.dll     	\sys\bin\licenseetsy.dll
+file=ABI_DIR\DEBUG_DIR\SIMATKTSY_STUB.dll         \sys\bin\SIMATKTSY.dll
+
+
+/* Accesory Server */
+#include <.\core\os\AccServer.iby>
+
+/* PSM Server */
+#include <.\core\os\psmserver.iby>
+
+/* */
+#include <fmtx_hwrm.iby>
+
+/* Graphic Test */
+#include <graphicstest.iby>
+
+#endif
\ No newline at end of file
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/systemstarter/SSCForStartupMode1.rss
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/systemstarter/SSCForStartupMode1.rss	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,116 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Used for bringing up textshell for test purposes.
+// 
+//
+
+#include "startup.rh"
+
+/////////////////////////////////////////////
+// ENTRY POINT
+/////////////////////////////////////////////
+
+// THIS MUST BE THE FIRST RESOURCE. The system relies on
+// this having a resource ID of 1
+
+RESOURCE STARTUP_ENTRY_POINT r_entry_point
+	{
+	entry_point = r_startup_state_critical_static; 
+	}
+/////////////////////////////////////////////
+
+
+
+/////////////////////////////////////////////
+// CRITICAL-STATIC startup state
+/////////////////////////////////////////////
+RESOURCE STATE_INFO r_startup_state_critical_static
+	{
+	id = EStartupStateCriticalStatic;
+	name = "Critical Static";
+	command_list = r_critical_static_commands;
+	next = r_startup_state_critical_dynamic;
+	}
+
+RESOURCE COMMAND_ARRAY r_critical_static_commands
+	{
+	commands =
+		{
+#ifdef SYMBIAN_PROCESS_MONITORING_AND_STARTUP
+		START_PROCESS_INFO
+			{
+			path = "Z:\\sys\\bin\\sysmon.exe";
+			start_method = EWaitForStart;
+			no_of_retries_on_failure = 2;
+			},
+#endif
+		START_PROCESS_INFO
+			{
+			path = "Z:\\sys\\bin\\SysAgt2Svr.exe"; 
+			start_method = EWaitForStart;
+			no_of_retries_on_failure = 2;
+			},
+		START_PROCESS_INFO
+			{
+			path = "Z:\\sys\\bin\\ewsrv.exe";
+			start_method = EWaitForStart;
+			} 	 
+		};
+	}
+
+/////////////////////////////////////////////
+// CRITICAL-DYNAMIC startup state
+/////////////////////////////////////////////
+RESOURCE STATE_INFO r_startup_state_critical_dynamic
+	{
+	id = EStartupStateCriticalDynamic;
+	name = "Critical Dynamic";
+	command_list = r_critical_dynamic_commands;
+	next = r_startup_state_non_critical;
+	}
+
+RESOURCE COMMAND_ARRAY r_critical_dynamic_commands
+	{
+	commands =
+		{
+		 START_APP_INFO
+			{
+			path = "Z:\\sys\\bin\\eshell.exe";
+			viewless = 1;
+			}
+		};
+	}
+
+/////////////////////////////////////////////
+// NON-CRITICAL startup state
+/////////////////////////////////////////////
+RESOURCE STATE_INFO r_startup_state_non_critical
+	{
+	id = EStartupStateNonCritical;
+	name = "Non-critical";
+	command_list = r_non_critical_commands;
+	next = 0;	// No more state transitions
+	}
+
+RESOURCE COMMAND_ARRAY r_non_critical_commands
+	{
+	commands =
+		{
+#ifdef SYMBIAN_PROCESS_MONITORING_AND_STARTUP
+		START_AMA_STARTER
+			{
+			} 
+#endif
+		};
+	}
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/systemstarter/SSCForStartupMode1_target.rss
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/systemstarter/SSCForStartupMode1_target.rss	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,118 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// SSCForStartupMode1.rss
+// Used to bring up textshell for testing purposes.
+// 
+//
+
+#include "startup.rh"
+
+/////////////////////////////////////////////
+// ENTRY POINT
+/////////////////////////////////////////////
+
+// THIS MUST BE THE FIRST RESOURCE. The system relies on
+// this having a resource ID of 1
+
+RESOURCE STARTUP_ENTRY_POINT r_entry_point
+	{
+	entry_point = r_startup_state_critical_static; 
+	}
+/////////////////////////////////////////////
+
+
+
+/////////////////////////////////////////////
+// CRITICAL-STATIC startup state
+/////////////////////////////////////////////
+RESOURCE STATE_INFO r_startup_state_critical_static
+	{
+	id = EStartupStateCriticalStatic;
+	name = "Critical Static";
+	command_list = r_critical_static_commands;
+	next = r_startup_state_critical_dynamic;
+	}
+
+RESOURCE COMMAND_ARRAY r_critical_static_commands
+	{
+	commands =
+		{
+#ifdef SYMBIAN_PROCESS_MONITORING_AND_STARTUP
+		START_PROCESS_INFO
+			{
+			path = "Z:\\sys\\bin\\sysmon.exe";
+			start_method = EWaitForStart;
+			no_of_retries_on_failure = 2;
+			},
+#endif
+		START_PROCESS_INFO
+			{
+			path = "Z:\\sys\\bin\\SysAgt2Svr.exe"; 
+			start_method = EWaitForStart;
+			no_of_retries_on_failure = 2;
+			},
+		START_PROCESS_INFO
+			{
+			path = "Z:\\sys\\bin\\ewsrv.exe";
+			start_method = EWaitForStart;
+			}
+		};
+	}
+
+/////////////////////////////////////////////
+// CRITICAL-DYNAMIC startup state
+/////////////////////////////////////////////
+RESOURCE STATE_INFO r_startup_state_critical_dynamic
+	{
+	id = EStartupStateCriticalDynamic;
+	name = "Critical Dynamic";
+	command_list = r_critical_dynamic_commands;
+	next = r_startup_state_non_critical;
+	}
+
+RESOURCE COMMAND_ARRAY r_critical_dynamic_commands
+	{
+	commands =
+		{
+		START_APP_INFO
+			{
+			path = "Z:\\sys\\bin\\eshell.exe";
+			viewless = 1;
+			}
+
+		};
+	}
+
+/////////////////////////////////////////////
+// NON-CRITICAL startup state
+/////////////////////////////////////////////
+RESOURCE STATE_INFO r_startup_state_non_critical
+	{
+	id = EStartupStateNonCritical;
+	name = "Non-critical";
+	command_list = r_non_critical_commands;
+	next = 0;	// No more state transitions
+	}
+
+RESOURCE COMMAND_ARRAY r_non_critical_commands
+	{
+	commands =
+		{
+#ifdef SYMBIAN_PROCESS_MONITORING_AND_STARTUP
+		START_AMA_STARTER
+			{
+			} 
+#endif
+		};
+	}
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/systemstarter/initilizelocale_Variant.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/systemstarter/initilizelocale_Variant.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,30 @@
+/*
+* Copyright (c) 2002-2005 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  iby variant file for initiliselocale
+*
+*/
+
+
+#ifndef INITIALISELOCALE_VARIANT_IBY
+#define INITIALISELOCALE_VARIANT_IBY
+
+//default locale dll
+file=ABI_DIR\BUILD_DIR\elocl.loc			System\Libs\elocl.loc
+ 
+//default repositary file for locale settings
+data=DATAZ_\PRIVATE\10202be9\1020e4d3.cre 	private\10202be9\1020e4d3.cre
+                         
+#endif // INITIALISELOCALE_VARIANT_IBY
+
+//  End of File  
\ No newline at end of file
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/systemstarter/sysagent.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/systemstarter/sysagent.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,28 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#ifndef SYSAGENT_IBY
+#define SYSAGENT_IBY
+
+file=ABI_DIR\BUILD_DIR\sysagt2cli.dll	sys\bin\sysagt2cli.dll
+file=ABI_DIR\BUILD_DIR\sysagt2svr.exe	sys\bin\sysagt2svr.exe
+file=ABI_DIR\BUILD_DIR\halsettings.exe  sys\bin\halsettings.exe 
+
+#ifdef SYMBIAN_HAL_PENSTATE_PERSISTENCE_DISABLED
+patchdata halsettings.exe@KHalPenStatePersistenceDisabled SYMBIAN_HAL_PENSTATE_PERSISTENCE_DISABLED
+#endif
+
+#endif // SYSAGENT_IBY
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/systemstarter/sysstart.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/systemstarter/sysstart.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,41 @@
+// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#ifndef __SYSSTART_IBY__
+#define __SYSSTART_IBY__
+
+REM SysStart
+file=ABI_DIR\BUILD_DIR\SysStart.exe				Sys\bin\SysStart.exe
+file=ABI_DIR\BUILD_DIR\domainpolicy2.dll		Sys\bin\domainpolicy2.dll
+
+#ifdef SYMBIAN_PROCESS_MONITORING_AND_STARTUP
+
+file=ABI_DIR\BUILD_DIR\startupproperties.dll	Sys\bin\startupproperties.dll
+file=ABI_DIR\BUILD_DIR\startsafe.dll			Sys\bin\startsafe.dll
+file=ABI_DIR\BUILD_DIR\restartsys.dll			Sys\bin\restartsys.dll
+
+REM SysMon
+file=ABI_DIR\BUILD_DIR\sysmoncli.dll			Sys\bin\sysmoncli.dll
+file=ABI_DIR\BUILD_DIR\sysmon.exe				Sys\bin\sysmon.exe
+
+REM AmaStarter
+file=ABI_DIR\BUILD_DIR\amastart.dll				Sys\bin\amastart.dll
+file=ABI_DIR\BUILD_DIR\amastarter.exe			Sys\bin\amastarter.exe
+file=ABI_DIR\BUILD_DIR\dscstore.dll        		sys\bin\dscstore.dll
+data=ZPRIVATE\100012a5\policy\2000836D.spd 		PRIVATE\100012a5\policy\2000836D.spd
+
+#endif // SYMBIAN_PROCESS_MONITORING_AND_STARTUP
+
+#endif // __SYSSTART_IBY__
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/syborg/systemstarter/sysstartconfig.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/syborg/systemstarter/sysstartconfig.iby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,50 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#ifndef __SYSSTARTCONFIG_IBY__
+#define __SYSSTARTCONFIG_IBY__
+
+REM Simple startup configuration - install a single resource file 
+REM as the default "mode 0" file.
+REM Note this is a Techview specific way of including just the 
+REM SSC required in the ROM. Licensees are expected to include more 
+REM than one SSC in their devices.
+
+
+#ifdef _STARTUPMODE
+define _10205CC4_MODE _STARTUPMODE
+
+// previous scheme used _STARTUPMODEx defines which are maintained for backwards compatibility
+
+#elif defined(_STARTUPMODE1)
+define _10205CC4_MODE 1	        // Text shell
+#elif defined(_STARTUPMODE2)
+define _10205CC4_MODE 2         // System Test
+#elif defined(_STARTUPMODE3)
+define _10205CC4_MODE 3         // Rapid Techview
+#elif defined(_STARTUPMODE4)
+define _10205CC4_MODE 4         // No watchers
+#elif defined(_STARTUPMODE5)
+define _10205CC4_MODE 5         // Demand Paging
+#else
+
+// default to mode 0
+define _10205CC4_MODE 1         // Normal
+#endif
+
+REM Selected mode _10205CC4_MODE startup resource file
+
+data=MULTI_LINGUIFY(RSC EPOCROOT##epoc32\data\Z\private\10205C44\SSCForStartupMode##_10205CC4_MODE##_target  private\10205C44\SSCForStartupMode0)
+#endif
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/zoom2/bigrom.oby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/zoom2/bigrom.oby	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,760 @@
+/*
+
+   Big ROM IBY for Symbian^3
+   garethl@symbian.org
+
+*/
+
+#include <RemovableFeatures.iby>
+
+#undef SYMBIAN_EXCLUDE_KEYMAP
+#undef SYMBIAN_EXCLUDE_LOCATION // so that lbs.dll is included
+#undef SYMBIAN_EXCLUDE_SIP // so that sipsw.dll etc are included
+#undef SYMBIAN_EXCLUDE_SCDV // so that SCDV is included
+#undef SYMBIAN_EXCLUDE_BLUETOOTH // so that BT is included
+#undef SYMBIAN_EXCLUDE_MTP
+#undef SYMBIAN_EXCLUDE_OFFLINE_MODE
+#undef SYMBIAN_EXCLUDE_OBEX
+
+
+#define __OMA_SUPL_PLUGINS // for core/mw/omasuplprotocolhandler.iby
+
+
+#define __VIDEOEDITORENGINE_IBY__
+#define __VIDEOEDITORUICOMPONENTS_IBY__
+#define __SIMPLEVIDEOEDITOR_IBY__
+#define __SIMPLECUTVIDEO_IBY__
+#define __VIDEOPROVIDER_IBY__
+
+/* eaacplusaudiocontrollerutility.dll can't be built, so remove whatever uses it */
+#define AUDIOCONTROLLERPLUGINSVARIANT_IBY
+
+#include <variant/s60macros.iby>
+#include <zoom2.oby>
+//                                            which includes <header.iby>
+//                                            which includes <symbian_os_romdefs.hby>
+//                                            which includes <feature.iby>
+//                                            which includes <base.iby>
+//                                            which includes <kernel.hby>
+//                                            which includes <base.iby>
+//                                            which includes <base_zoom2.iby>
+//                                            which includes <compsupp.iby>
+//                                            which includes <rm_debug_svr.iby>
+//#undef SURFACEMANAGER_DRV // because zoom2.oby defines it but doesn't have _zoom2_surfacemanagerdriver.ldd
+//device[VARID]=KERNEL_DIR\BUILD_DIR\pipelib.ldd        \Sys\Bin\pipelib.ldd /* zoom2 base was not including this */
+
+/* Graphics adaptation */
+
+#define SYMBIAN_BUILD_GCE
+#define SYMBIAN_GRAPHICS_USE_GCE // for graphics_adaptation.hby
+#undef SYMBIAN_GRAPHICS_ADAPTATION // allows for setup of SYMBIAN_GRAPHICS_ADAPTATION to SGA_SW
+#define SYMBIAN_GRAPHICS_USE_EGL_REF
+#define SYMBIAN_GRAPHICS_USE_OPENWF
+#define FBSRASTERIZER_DRV <fbsrasterizer_stub.iby>
+//#define GRAPHICSRESOURCE_DRV <graphicsresourceadapter_stub.iby>
+#define OPENWFCLIB_DRV <openwfc_ref.iby>
+
+#undef FF_WLAN_WAPI_INCLUDE_IN_ROM // needed so that wapisecuritysettingsui.iby pulls in a wapuisecuritysettingsui.dll that we have in the build
+
+/* miscallaneous defines */
+
+//#define SYMBIAN_USING_CTSY_DISPATCHER // for ctsy.iby to pull in phonetsy.tsy
+
+//#define OPENGLES_DRV <opengles_sw.iby>
+
+#undef FF_WLAN_WAPI_INCLUDE_IN_ROM // needed so that wapisecuritysettingsui.iby pulls in a wapuisecuritysettingsui.dll that we have in the build
+
+/* miscallaneous defines */
+
+//#define SYMBIAN_USING_CTSY_DISPATCHER // for ctsy.iby to pull in phonetsy.tsy 
+
+//#define OPENGLES_DRV <opengles_sw.iby>
+
+#undef FF_WLAN_WAPI_INCLUDE_IN_ROM // needed so that wapisecuritysettingsui.iby pulls in a wapuisecuritysettingsui.dll that we have in the build
+
+/* miscallaneous defines */
+
+//#define SYMBIAN_USING_CTSY_DISPATCHER // for ctsy.iby to pull in phonetsy.tsy
+
+/* The top-level includes */
+
+
+#include <graphics_adaptation.hby>
+
+
+
+
+#include <3gplibrary.iby>
+//                                            which includes <3gpmp4lib.iby>
+#include <a3fdevsound.iby>
+#include <a3fserverstart.iby>
+
+#include <abtester.oby>
+//                                            which includes <ABTester.iby>
+#include <acf.iby>
+#include <acl.iby>
+#include <activitymanager.iby>
+#include <addressinfohook.iby>
+#include <agentdialog.iby>
+#include <agentpr.iby>
+//                                            which includes <agentprcore.iby>
+#include <agentshellnotifier.iby>
+#include <agnmodel.iby>
+#include <agnversit.iby>
+//                                            which includes <timezoneserver.iby>
+//                                            which includes <BackupRestoreNotification.iby>
+//                                            which includes <swiplugin.iby>
+//                                            which includes <sql.iby>
+//                                            which includes <utrace.iby>
+//                                            which includes <btrace.iby>
+#include <alarmserver.iby>
+//                                            which includes <ssmsus.iby>
+#include <amastart.iby>
+#include <animation.iby>
+#include <aplp.iby>
+#include <apparc.iby>
+#include <asn1export.iby>
+#include <asn1rrlp.iby>
+#include <asn1supl.iby>
+#include <asnpkcs.iby>
+//                                            which includes <pbe.iby>
+//                                            which includes <crypto.iby>
+//                                            which includes <random.iby>
+//                                            which includes <hash.iby>
+//                                            which includes <cryptospi_plugins.iby>
+//                                            which includes <filetokensconfig.iby>
+#include <ASR.iby>
+#include <autotest.iby>
+#include <avi.iby>
+//                                            which includes <subtitledecoder.iby>
+#include <bioclass0smsplugin.iby>
+//                                            which includes <watcher.iby>
+//                                            which includes <flogger.iby>
+//                                            which includes <gtbioutils.iby>
+//                                            which includes <messageserver.iby>
+//                                            which includes <messageserver.hby>
+//                                            which includes <gtsmsmtm.iby>
+//                                            which includes <c32.iby>
+//                                            which includes <usb.iby>
+//                                            which includes <usbman.iby>
+//                                            which includes <c32.iby>
+//                                            which includes <ecom.iby>
+//                                            which includes <ecompatchconstants.hby>
+//                                            which includes <usbmanrsc.iby>
+//                                            which includes <usbmanbin.iby>
+//                                            which includes <esock.iby>
+//                                            which includes <esock_core.iby>
+//                                            which includes <subconparams.iby>
+//                                            which includes <connservparams.iby>
+//                                            which includes <ESockMessages.iby>
+//                                            which includes <esock_params.iby>
+//                                            which includes <esock_api_ext.iby>
+//                                            which includes <commsdataobjects.iby>
+//                                            which includes <commsdataobjectsecom.iby>
+//                                            which includes <serverden.iby>
+//                                            which includes <commsfw.iby>
+//                                            which includes <factories.iby>
+//                                            which includes <meshmachine.iby>
+//                                            which includes <NETMSG.iby>
+//                                            which includes <NetInterfaces.iby>
+//                                            which includes <NETMessages.iby>
+//                                            which includes <NetMeta.iby>
+//                                            which includes <NETSubscribe.iby>
+//                                            which includes <esock.iby>
+//                                            which includes <insock.iby>
+//                                            which includes <esock.iby>
+//                                            which includes <nodemessages.iby>
+//                                            which includes <ResponseMsg.iby>
+//                                            which includes <rootserver.iby>
+//                                            which includes <NETStSrv.iby>
+//                                            which includes <NETSM.iby>
+//                                            which includes <virtualconstructors.iby>
+//                                            which includes <logeng.iby>
+//                                            which includes <dbms.iby>
+//                                            which includes <logeng.hby>
+//                                            which includes <scheduledsending.iby>
+//                                            which includes <schsvr.iby>
+//                                            which includes <sysagent.iby>
+//                                            which includes <cntmodel.iby>
+//                                            which includes <versit.iby>
+//                                            which includes <conarc.iby>
+//                                            which includes <charconv.iby>
+//                                            which includes <cntplsql.iby>
+//                                            which includes <cntmatchlog.iby>
+//                                            which includes <smsstack.iby>
+//                                            which includes <commsdebugutility.iby>
+//                                            which includes <ost.iby>
+//                                            which includes <etel.iby>
+//                                            which includes <commdb.iby>
+//                                            which includes <commsdat.iby>
+//                                            which includes <ShimNotifier.iby>
+//                                            which includes <fax.iby>
+//                                            which includes <etelmm.iby>
+//                                            which includes <gtsmsmtm.hby>
+#include <bionbswatcher.iby>
+#include <bioparsers.iby>
+#include <biowapwatcher.iby>
+#include <bitgdi.iby>
+#include <bitmaptransforms.iby>
+#include <bitmaptransformsplugin.iby>
+//#include <bldinfo.hby>
+#include <bluetooth.iby>
+//                                            which includes <btlogger.iby>
+//                                            which includes <remotecontrol.iby>
+//                                            which includes <tsp.iby>
+//                                            which includes <hci.iby>
+//                                            which includes <hci_framework.iby>
+//                                            which includes <hci_implementation.iby>
+//                                            which includes <corehci_symbian.iby>
+//                                            which includes <commandsevents_symbian.iby>
+//                                            which includes <hci_qdp_symbian.iby>
+//                                            which includes <hctl_bcsp.iby>
+//                                            which includes <initialisor_symbian.iby>
+#include <bmpanim.iby>
+#include <bookmarkdb.iby>
+#include <btpan.iby>
+#include <btsnoophcilogger.iby>
+#include <c32bca.iby>
+#include <c32start.iby>
+#include <caf.iby>
+//                                            which includes <reccafconfig.iby>
+#include <calcon.iby>
+#include <calinterimapi.iby>
+#include <ced.iby>
+//                                            which includes <Xml.iby>
+//                                            which includes <xmlframework.iby>
+//                                            which includes <xmlcustomresolver.iby>
+//                                            which includes <xmlparserplugin.iby>
+//                                            which includes <wbxmlparser.iby>
+//                                            which includes <stdlib.iby>
+#include <ceddump.iby>
+#include <certman.iby>
+//                                            which includes <secutil.iby>
+//                                            which includes <sectcbutil.iby>
+//                                            which includes <ocspconfig.iby>
+#include <cflog.iby>
+#include <cfrtp.iby>
+//                                            which includes <rtpcore.iby>
+#include <charconv_all_plugins.iby>
+//                                            which includes <charconv_chinese_simplfied.iby>
+//                                            which includes <charconv_chinese_traditional.iby>
+//                                            which includes <charconv_japanese.iby>
+//                                            which includes <charconv_japanese_docomo.iby>
+//                                            which includes <charconv_iso8859x.iby>
+//                                            which includes <charconv_codepage.iby>
+//                                            which includes <charconv_sms7bit.iby>
+//                                            which includes <charconv_gsm7_turkish.iby>
+//                                            which includes <charconv_spanish_smsencoding.iby>
+//                                            which includes <charconv_portuguese_smsencoding.iby>
+//                                            which includes <charconv_s60.iby>
+//**#include <charconv_gsm7_turkish_Variant.iby>
+
+#include <charconv_japanese_kddiau.iby>
+#include <charconv_japanese_s60.iby>
+#include <chtmltocrtconverter.iby>
+//**#include <cinidata.iby>
+#include <cmncustomcmds.iby>
+#include <commonengine.iby>
+#include <commonengineresources.iby>
+#include <commsbufs.iby>
+#include <commsbufskern.iby>
+#include <commslog.iby>
+//                                            which includes <commsrootserver.iby>
+#include <conditionevaluator.iby>
+#include <cone.iby>
+//**#include <connect-gt.iby>
+#include <connectivity_securebackupengine.iby>
+#include <coredumpscriptconfig.iby>
+#include <coredumpserver.iby>
+#include <coredumpserverstub.iby>
+#include <coredumpui.iby>
+#include <coreproviders.iby>
+#include <coreprovidersecom.iby>
+#include <csc_plugin.iby>
+
+#include <ctsy.iby> // builds in phonetsy.tsy which relies on licenseetsy.dll 
+//                                            which includes <ctsysystemstateplugin.iby>
+//#include <customcmds.iby>
+#include <DEBUG.iby>
+#include <devsoundadaptationinfo.iby>
+#include <devsound_pluginsupport.iby>
+//#include <devsound_refplugin.iby> // clashes with core/mw/mmfaudioconnectioncontroller.iby
+#include <DevVideo.iby>
+#include <dexcformatter.iby>
+
+#include <dial.iby>
+#include <directgdi.iby>
+//                                            which includes <graphicsresource.iby>
+//                                            which includes <graphicsresourceadapter.iby>
+//                                            which includes <graphicsresourceadapter_sw.iby>
+//                                            which includes <surfacemanager.iby>
+//                                            which includes <surfacemanager_omap.iby>
+//                                            which includes <directgdiadapter.iby>
+//                                            which includes <directgdiadapter_sw.iby>
+//#include <directgdiadapter_vg.iby>
+//                                            which includes <openvg.iby>
+//                                            which includes <openvg_sw.iby>
+#include <dnd.iby>
+#include <dnsproxy.iby>
+#include <dnsproxyupdateif.iby>
+#include <dptestcons.oby>
+#include <ecam.iby>
+//                                            which includes <ecam_stubplugin.iby>
+//#include <econs_wserv.iby>
+#include <ecuart.iby>
+//#include <egl.iby>
+//                                            which includes <egl_ref.iby>
+#include <egul.iby>
+#include <elements.iby>
+//                                            which includes <NodeMessages.iby>
+//                                            which includes <MeshMachine.iby>
+#include <emime.iby>
+#include <eon_font.iby>
+#include <epos_omasuplposmessageplugin.iby>
+#include <epos_omasuplposmsgpluginimpl.iby>
+#include <ESHELL.iby>
+#include <esockmessageintercept.iby>
+
+#include <etelisv.iby>
+#include <etelpckt.iby>
+#include <etelsat.iby>
+
+#include <ether802.iby>
+#include <euserhl.iby>
+#include <exifutility.iby>
+#include <ezlib.iby>
+//                                            which includes <openenv.iby>
+//                                            which includes <timezonelocalization.iby>
+//                                            which includes <TimeZoneServer.iby>
+//                                            which includes <stdcpp.iby>
+//                                            which includes <oelibrt.iby>
+//                                            which includes <openenv.iby>
+#include <fatcharsetconv.iby>
+#include <fbserv.iby>
+//                                            which includes <fbsrasterizer_stub.iby>
+#include <fdf.iby>
+#include <featmgr.iby>
+#include <featreg.iby>
+#include <fepbase.iby>
+#include <filetokens.iby>
+#include <filewriter.iby>
+#include <fmtx_hwrm.iby>
+#include <fntstore.iby>
+
+#include <freetype.iby>
+//                                            which includes <freetype.hby>
+#include <ftp_e.iby>
+#include <gdi.iby>
+//                                            which includes <palette.iby>
+#include <genericscprparams.iby>
+#include <gfxtranseffect.iby>
+#include <gifscaler.iby>
+#include <gmxml.iby>
+#include <gpssetclock.iby>
+//#include <graphicsresourceadapter_mbx.iby>
+//#include <graphicsresourceadapter_sgx.iby>
+#include <gtbioengmtm.iby>
+#include <gtbiomessaging.iby>
+//#include <gtemailmtm.hby>
+
+#include <gtmessaging.iby>
+//                                            which includes <sendas2.iby>
+//                                            which includes <gtmtur.iby>
+//                                            which includes <msgurlhandler.iby>
+#include <guqos.iby>
+#include <hciproxy.iby>
+#include <hci_initialisor_ti.iby>
+#include <hctl_ti.iby>
+#include <hctl_uart_original.iby>
+
+#include <hlpmodel.iby>
+#include <http.iby>
+//                                            which includes <httpcore.iby>
+//                                            which includes <InetProtUtil.iby>
+//                                            which includes <GtEmailMtm.iby>
+//                                            which includes <transporthandler.iby>
+#include <hwresourcemanager.iby>
+#include <hwrmuiplugin.iby>
+#include <iclcodecs.iby>
+//                                            which includes <JpegYuvDecoder.iby>
+
+#include <iculayoutengine.iby>
+#include <imageconversion.iby>
+#include <imagedisplay.iby>
+//                                            which includes <MngImageDisplay.iby>
+//                                            which includes <IclWrapperImageDisplay.iby>
+#include <imageprocessor.iby>
+#include <imagetransform.iby>
+
+#include <ineturilist.iby>
+#include <iniparser.iby>
+
+//#include <integrationtest.iby> // integrationtest.dll is not getting built
+//                                            which includes <testexecute.iby>
+//                                            which includes <testexecutelogger.iby>
+//                                            which includes <RFilelogger.iby>
+#include <ipaddrinfoparams.iby>
+#include <ipeventfactory.iby>
+#include <ipeventnotifier.iby>
+//                                            which includes <ipeventtypes.iby>
+//                                            which includes <netmeta.iby>
+//                                            which includes <netsubscribe.iby>
+//                                            which includes <netmeta.iby>
+#include <ipproto.iby>
+#include <ipsec.iby>
+//                                            which includes <ipsec6.iby>
+//                                            which includes <ipseccrypto.iby>
+#include <iptransport.iby>
+//                                            which includes <mobilitycoreproviders.iby>
+//**#include <ipupsdialog.iby>
+#include <irda.iby>
+//                                            which includes <obexprotocol.iby>
+
+
+#include <kerneltrace.oby>
+#include <lafshutdowneventobserveradaptor.iby>
+#include <lbs.iby>
+#include <lbsadatacache.iby>
+#include <lbsadmin.iby>
+//                                            which includes <lbsassistancedata.iby>
+//                                            which includes <lbslocmonclient.iby>
+//                                            which includes <lbsloccommon.iby>
+//                                            which includes <LbsLocDataSource.iby>
+//                                            which includes <lbsinternalapi.iby>
+//                                            which includes <lbsnetprotocol.iby>
+//                                            which includes <lbspartnercommon.iby>
+//                                            which includes <lbsnetinternalapi.iby>
+//                                            which includes <lbsagpsngmsgs.iby>
+//                                            which includes <lbscommoninternaldatatypes.iby>
+//                                            which includes <lbsnetregstatusint.iby>
+//                                            which includes <lbsngnlmint.iby>
+//                                            which includes <lbsnrhngmsgs.iby>
+//                                            which includes <lbsreffnpint.iby>
+//                                            which includes <lbssymmetryint.iby>
+//                                            which includes <lbsroot.iby>
+//                                            which includes <lbsrootapi.iby>
+//                                            which includes <lbsloggerapi.iby>
+//                                            which includes <lbsdebug.iby>
+//                                            which includes <lbslocsettings.iby>
+//                                            which includes <lbslocindicatorlib.iby>
+//                                            which includes <lbsmlfwutils.iby>
+#include <lbsagpslocmanager.iby>
+#include <lbsbtgpspsy.iby>
+#include <lbsdefaultpsy.iby>
+#include <lbsgpsagpspsy.iby>
+#include <lbslocationmonitor.iby>
+
+#include <lbslocserver.iby>
+//                                            which includes <lbslocutils.iby>
+//                                            which includes <lbsqualityprofileapi.iby>
+#include <lbsnetgateway.iby>
+#include <lbsnetpsy.iby>
+#include <lbsnetsim.iby>
+#include <lbsnetworklocationmanager.iby>
+#include <lbsnetworkprivacy.iby>
+#include <lbsnetworkrequesthandler.iby>
+//                                            which includes <lbsx3p.iby>
+//                                            which includes <lbsprivacycontroller.iby>
+//                                            which includes <lbsprivacyexnotifiers.iby>
+//                                            which includes <lbsprivacydatatypes.iby>
+//                                            which includes <lbsqueryandnotification.iby>
+#include <lbsnetworktest.iby>
+//                                            which includes <lbsprotocolmodule.iby>
+//                                            which includes <suplasn1.iby>
+//                                            which includes <lbssupltestmodule.iby>
+#include <lbspospluginfw.iby>
+#include <lbsprivacyprotocolmodule.iby>
+#include <lbsprivacyrequest.iby>
+#include <lbspsytester.iby>
+#include <lbssimulationpsy.iby>
+#include <lbssuplsmstrigger.iby>
+#include <lbssuplwappush.iby>
+#include <lbs_privacyprotocolmodule.iby>
+#include <loadlafshutdown.iby>
+#include <loopback.iby>
+#include <mbmsparams.iby>
+#include <mdf.iby>
+#include <MESON.iby>
+//                                            which includes <Store.iby>
+//                                            which includes <EText.iby>
+//                                            which includes <Form.iby>
+//                                            which includes <print.iby>
+//                                            which includes <PwrCli.iby>
+//                                            which includes <Bafl.iby>
+//                                            which includes <NumberConversion.iby>
+#include <MESON.iby>
+#include <Midi.iby>
+#include <milif.iby>
+#include <miscpushutils.iby>
+#include <mmcommon.iby>
+#include <mmf.iby>
+//                                            which includes <mmfEffect.iby>
+//                                            which includes <MmfDrmPlugin.iby>
+//                                            which includes <mmf_plugin.iby>
+
+#include <mmssettings.iby>
+#include <mmtsy.iby>
+
+#include <msfdc.iby>
+//**#include <mtp_backupnrestoredp.iby>
+//                                            which includes <mtp_framework.iby>
+//                                            which includes <mtp_devicedp.iby>
+#include <mtp_filedp.iby>
+#include <mtp_ptpip.iby>
+#include <mtp_usbsic.iby>
+#include <multipartparser.iby>
+#include <napt.iby>
+
+#include <netcfgextnmip.iby>
+//                                            which includes <netstsrv.iby>
+//                                            which includes <NetCfgExtnBase.iby>
+//                                            which includes <netstsrv.iby>
+
+#include <netups.iby>
+//                                            which includes <ups.iby>
+//                                            which includes <ups_config.iby>
+#include <network.iby>
+//                                            which includes <simpleselectorbase.iby>
+//                                            which includes <upscoreproviders.iby>
+//                                            which includes <tls.iby>
+//                                            which includes <ocsp.iby>
+//                                            which includes <tlsprovider.iby>
+//                                            which includes <tlsproviderconfig.iby>
+//                                            which includes <CSD.IBY>
+//                                            which includes <psdagt.iby>
+//                                            which includes <nullagt.iby>
+//                                            which includes <ppp.iby>
+//                                            which includes <PREDCOMP.IBY>
+//                                            which includes <rawipnif.iby>
+//                                            which includes <packetlogger.iby>
+//                                            which includes <rawipnif.iby>
+//                                            which includes <DHCPServ.iby>
+//                                            which includes <umtsif.iby>
+//                                            which includes <pfqoslib.iby>
+//                                            which includes <qos.iby>
+//                                            which includes <qoslib.iby>
+//                                            which includes <qosextnapi.iby>
+//                                            which includes <qos3gpp.iby>
+//                                            which includes <pdp.iby>
+//                                            which includes <QosIPSCPR.iby>
+//                                            which includes <networking_dnsproxy.iby>
+
+//**#include <ntras-plugin.iby>
+
+#include <nvgrenderstage.iby>
+#include <obex.iby>
+#include <OBEYFILE.iby>
+// #include <oggvorbis.iby> // relies on oggvorbisint/floatutil.dll, but our source only builds .libs
+#include <omxilcomp.iby>
+#include <omxilcompref.iby>
+#include <omxilcore.iby>
+#include <opengles.iby>
+//                                            which includes <opengles_sw.iby>
+//#include <openwfc_ref.iby>
+//                                            which includes <openwfc_support.iby>
+#include <pagedrom.oby>
+#include <pagedrom_functional.oby>
+#include <pagedrom_stressed.oby>
+#include <panorama.iby>
+#include <pbap.iby>
+#include <pdrstore.iby>
+#include <phbksync.iby>
+#include <pkcs12.iby>
+#include <pkcs7.iby>
+#include <PlatSec.oby>
+#include <PlatSecDiagnostics.oby>
+#include <PlatSecEnforcement.oby>
+//**#include <plpremotelink.iby>
+//                                            which includes <plpvariant.iby>
+
+#include <printers.iby>
+#include <punycodeconverter.iby>
+
+#include <recognisers.iby>
+#include <refacladaptation.iby>
+#include <refmmrc.iby>
+
+//**#include <rfs_variant.iby>
+#include <richtexttohtmlconv.iby>
+#include <rohandler.iby>
+#include <rpnp.iby>
+//**#include <rta.iby>
+#include <rtp.iby>
+//                                            which includes <shimrtp.iby>
+//**#include <rtpamr.iby>
+//**#include <S60CenRep_variant.iby>
+//#include <S60Macros.iby>
+#include <scs.iby>
+#include <securitycommonutils.iby>
+#include <security_ups_utils.iby>
+#include <setcap.iby>
+#include <sfopenvg.iby>
+
+#include <shma.iby>
+#include <sipdummyprt.iby>
+#include <siph2lanbearermonitor.iby>
+#include <sipproviders.iby>
+#include <sipstatemachine.iby>
+#include <sipsw.iby>
+//#include <sislwappush.iby> // mutually exclusive with S60SislWapPush
+#include <sqlite3.iby>
+#include <ssma.iby>
+//                                            which includes <ssmcmn.iby>
+//                                            which includes <ssmcmd.iby>
+//                                            which includes <ssmserver.iby>
+//                                            which includes <ssmss.iby>
+//                                            which includes <ssmdomainpolicy.iby>
+//#include <ssmclayer.iby>
+//#include <ssplugins.iby>
+//                                            which includes <sspluginsadaptation.iby>
+//                                            which includes <sspluginsgsa.iby>
+#include <stat.iby>
+//                                            which includes <statcommon.iby>
+
+#include <subtitle.iby>
+//#include <surfacemanager_ref.iby>
+#include <surfaceupdate.iby>
+//                                            which includes <surfaceupdate_ref.iby>
+#include <swi.iby>
+//                                            which includes <swiconfig.iby>
+#include <symbianelfformatter.iby>
+
+#include <sysawatcher.iby>
+//                                            which includes <telwatcher.iby>
+#include <sysstart.iby>
+#include <sysstartconfig.iby>
+#include <tefcleanup.iby>
+#include <tefutilityserver.iby>
+#include <telephony.iby>
+#include <telnetd.iby>
+#include <telnet_e.iby>
+#include <testbed.iby>
+#include <testexecutepipslogger.iby>
+#include <testexecutepipsloggerclient.iby>
+//#include <testlocale.iby> // clashes with language\mw\elocl.iby
+#include <tiger.iby>
+#include <traces.iby>
+#include <tzlocalizationrscfactory.iby>
+#include <ucc.iby>
+#include <uikon.iby>
+//                                            which includes <uiklaf.iby>
+#include <ulogger.iby>
+#include <uloggerclttool.iby>
+// #include <usbhostmsmm.iby> // need to find how to build this
+#include <Version_Variant.iby>
+#include <versitrecognizer.iby>
+#include <videorenderer.iby>
+
+#include <wapurilookup.iby>
+#include <wfcinterop_tests.iby>
+#include <wrapperutilsplugin.iby>
+//#undef SYMBIAN_GRAPHICS_USE_GCE // for graphics_adaptation.hby
+#include <wserv.iby>
+//                                            which includes <wserv_std_plugins.iby>
+//                                            which includes <openwfc.iby>
+//#define SYMBIAN_GRAPHICS_USE_GCE // for graphics_adaptation.hby
+
+#include <wslog.iby>
+
+#include <xmlengine.iby>
+#include <xmlenginedom.iby>
+//                                            which includes <xmlengineutils.iby>
+#include <xmlenginesaxplugin.iby>
+#include <xmlengineserializer.iby>
+#include <zsh.iby>
+
+
+// manually copied into place
+#include <fontutils.iby>
+
+#include <core\stubs\srsfenginestub.iby> // exported when this module is correctly built
+
+
+// IBY files to not include.
+// This is achieved by defining the IBY's gating define.
+//
+
+#define FBSRASTERIZER_IBY // to stop core/mw/fbsrasterizer.iby getting included 
+//#define __NETWORKING_TEST_IBY__ // don't pull in networktest.iby
+//#define __BASE_SYBORG_IBY__ // we are using Zoom2
+//#define SWITEXTSHELL // switextshell.iby
+
+// fixups
+
+//file=ABI_DIR\BUILD_DIR\vimpstsettings.dll				SHARED_LIB_DIR\vimpstsettings.dll
+
+file=ABI_DIR\BUILD_DIR\LICENSEETSY_STUB.DLL        Sys\Bin\licenseetsy.dll /* needed by phonetsy.tsy */
+file=ABI_DIR\BUILD_DIR\SIMATKTSY_STUB.DLL        Sys\Bin\simatktsy.dll /* needed by licenseetsy_stub.dll */
+//file=ABI_DIR\BUILD_DIR\usbcsc.ldd        SHARED_LIB_DIR\usbcsc.ldd /* needed by msfs_db.fsy */
+
+//extension[VARID]=KERNEL_DIR\BUILD_DIR\display.ldd        \Sys\Bin\display0.ldd /* needed for the graphics composition */
+
+
+file=ABI_DIR\BUILD_DIR\tvoutconfig.dll        Sys\Bin\tvoutconfig.dll /* can't find a .iby that includes this */
+file=ABI_DIR\BUILD_DIR\ddc_access.dll        Sys\Bin\ddc_access.dll /* can't find a .iby that includes this */
+file=ABI_DIR\BUILD_DIR\power_save_display_mode_stub.dll        Sys\Bin\power_save_display_mode.dll /* can't find a .iby that includes this */
+file=ABI_DIR\BUILD_DIR\usbcsc_bil.dll        Sys\Bin\usbcsc_bil.dll /* can't find a .iby that includes this */
+file=ABI_DIR\BUILD_DIR\fmradiotunercontrol.dll        Sys\Bin\fmradiotunercontrol.dll /* can't find a .iby that includes this */
+file=ABI_DIR\BUILD_DIR\usbclasscontroller.dll        Sys\Bin\usbclasscontroller.dll /* added normally via usbmanbin.iby */
+
+file=ABI_DIR\BUILD_DIR\cnvshiftjisdirectmap.dll        Sys\Bin\cnvshiftjisdirectmap.dll /* comes from the Japanese charconv IBYs */
+
+file=ABI_DIR\BUILD_DIR\libegl_sw.dll        Sys\Bin\libegl_sw.dll /* */
+file=ABI_DIR\BUILD_DIR\libopenvg_sw.dll        Sys\Bin\libopenvg_sw.dll /* */
+file=ABI_DIR\BUILD_DIR\libopenvgu_sw.dll        Sys\Bin\libopenvgu_sw.dll /* */
+file=ABI_DIR\BUILD_DIR\libgles_cm.dll        Sys\Bin\libgles_cm.dll /* */
+file=ABI_DIR\BUILD_DIR\libglesv1_cm.dll        Sys\Bin\libglesv1_cm.dll /* */
+
+
+//file=ABI_DIR\BUILD_DIR\atextclient.dll        Sys\Bin\atextclient.dll /*required for dunatext.dll, but not referenced by an IBY file I could see */
+//file=ABI_DIR\BUILD_DIR\atextcommon.dll        Sys\Bin\atextcommon.dll /*required for dunatext.dll, but not referenced by an IBY file I could see */
+//file=ABI_DIR\BUILD_DIR\asrsttshwdevice_stub.dll        Sys\Bin\asrsttshwdevice.dll /*required for nss* */
+//file=ABI_DIR\BUILD_DIR\atextcommon.dll        Sys\Bin\atextcommon.dll /*required for dunatext.dll, but not referenced by an IBY file I could see */
+#ifdef _FULL_DEBUG
+file=ABI_DIR\BUILD_DIR\mullogging.dll        Sys\Bin\mullogging.dll /* needs forcing in for the debug build */
+#endif
+
+
+
+
+file=\epoc32\release\armv5\urel\elocl.01 	"sys\bin\elocl.01"
+file=\epoc32\release\armv5\urel\elocl.37 	"sys\bin\elocl.37"
+file=\epoc32\release\armv5\urel\elocl.42 	"sys\bin\elocl.42"
+file=\epoc32\release\armv5\urel\elocl.25 	"sys\bin\elocl.25"
+file=\epoc32\release\armv5\urel\elocl.07 	"sys\bin\elocl.07"
+file=\epoc32\release\armv5\urel\elocl.03 	"sys\bin\elocl.03"
+file=\epoc32\release\armv5\urel\elocl.54 	"sys\bin\elocl.54"
+file=\epoc32\release\armv5\urel\elocl.10 	"sys\bin\elocl.10"
+file=\epoc32\release\armv5\urel\elocl.04 	"sys\bin\elocl.04"
+file=\epoc32\release\armv5\urel\elocl.49 	"sys\bin\elocl.49"
+file=\epoc32\release\armv5\urel\elocl.09 	"sys\bin\elocl.09"
+file=\epoc32\release\armv5\urel\elocl.51 	"sys\bin\elocl.51"
+file=\epoc32\release\armv5\urel\elocl.02 	"sys\bin\elocl.02"
+file=\epoc32\release\armv5\urel\elocl.57 	"sys\bin\elocl.57"
+file=\epoc32\release\armv5\urel\elocl.45 	"sys\bin\elocl.45"
+file=\epoc32\release\armv5\urel\elocl.17 	"sys\bin\elocl.17"
+file=\epoc32\release\armv5\urel\elocl.59 	"sys\bin\elocl.59"
+file=\epoc32\release\armv5\urel\elocl.15 	"sys\bin\elocl.15"
+file=\epoc32\release\armv5\urel\elocl.05 	"sys\bin\elocl.05"
+file=\epoc32\release\armv5\urel\elocl.32 	"sys\bin\elocl.32"
+file=\epoc32\release\armv5\urel\elocl.68 	"sys\bin\elocl.68"
+file=\epoc32\release\armv5\urel\elocl.67 	"sys\bin\elocl.67"
+file=\epoc32\release\armv5\urel\elocl.70 	"sys\bin\elocl.70"
+file=\epoc32\release\armv5\urel\elocl.18 	"sys\bin\elocl.18"
+file=\epoc32\release\armv5\urel\elocl.08 	"sys\bin\elocl.08"
+file=\epoc32\release\armv5\urel\elocl.27 	"sys\bin\elocl.27"
+file=\epoc32\release\armv5\urel\elocl.76 	"sys\bin\elocl.76"
+file=\epoc32\release\armv5\urel\elocl.13 	"sys\bin\elocl.13"
+file=\epoc32\release\armv5\urel\elocl.78 	"sys\bin\elocl.78"
+file=\epoc32\release\armv5\urel\elocl.16 	"sys\bin\elocl.16"
+file=\epoc32\release\armv5\urel\elocl.26 	"sys\bin\elocl.26"
+file=\epoc32\release\armv5\urel\elocl.28 	"sys\bin\elocl.28"
+file=\epoc32\release\armv5\urel\elocl.79 	"sys\bin\elocl.79"
+file=\epoc32\release\armv5\urel\elocl.06 	"sys\bin\elocl.06"
+file=\epoc32\release\armv5\urel\elocl.33 	"sys\bin\elocl.33"
+file=\epoc32\release\armv5\urel\elocl.39 	"sys\bin\elocl.39"
+file=\epoc32\release\armv5\urel\elocl.14 	"sys\bin\elocl.14"
+file=\epoc32\release\armv5\urel\elocl.93 	"sys\bin\elocl.93"
+file=\epoc32\release\armv5\urel\elocl.96 	"sys\bin\elocl.96"
+file=\epoc32\release\armv5\urel\elocl.31 	"sys\bin\elocl.31"
+file=\epoc32\release\armv5\urel\elocl.30 	"sys\bin\elocl.30"
\ No newline at end of file
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/zoom2/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/zoom2/group/bld.inf	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,22 @@
+/*
+* Copyright (c) 2010 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:
+*
+*/
+
+PRJ_PLATFORMS
+ARMV5
+
+PRJ_EXPORTS
+../bigrom.oby                 /epoc32/rom/config/zoom2/
+../image_conf_zoom2.mk        /epoc32/rom/config/zoom2/
\ No newline at end of file
diff -r 2ca1b6591d14 -r 351aac5b2f34 sf_config/rombuild/zoom2/image_conf_zoom2.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sf_config/rombuild/zoom2/image_conf_zoom2.mk	Tue Mar 30 19:42:01 2010 +0100
@@ -0,0 +1,32 @@
+# needs override.pm in \epoc32\tools\
+# needs s60ibymacros.pm, plugincommon.pm obyparse.pm rom\include\symbian_os_romdefs.hby rom\variant\s60macros.iby tools\localise.pm, localise_all_resources.pm
+
+PRODUCT_NAME =zoom2
+PLATFORM_NAME =zoom2
+BUILD =armv5
+ROMMEGS =71
+ROMDATE =abcd 
+USE_FLOAT =0
+USE_VERGEN =1
+USE_ROFS =0
+USE_PAGING =0
+USE_PLATSEC =0
+USE_ROMFILE =1
+COREPLAT_OPT =
+CORE_OBY     = $(E32ROM)/config/zoom2/bigrom.oby $(CORE_PREFIX)_core_generated.oby
+
+CORE_OBYGEN =\
+  geniby | $(CORE_PREFIX)_core_generated.oby |\
+    $(E32ROMINC)/core/app \
+	$(E32ROMINC)/core/mw \
+	$(E32ROMINC)/core/os \
+	$(E32ROMINC)/core/stubs \
+   $(call select,$(TYPE),prd,,$(E32ROMINC)/core/tools) | *.iby | \#include "%3" | end
+
+CORE_OPT = -keepgoing $(BLDROM_OPT) -D_EABI=$(ARM_VERSION) -D$(call ucase,$(PRODUCT_NAME)) -I\epoc32\rom\include\core\mw -I\epoc32\rom\include\core\app -I\epoc32\rom\include\core\os -es60ibymacros -elocalise -D_FULL_DEBUG
+#	$(E32ROMINC)/language/app \
+#	$(E32ROMINC)/language/mw \
+#	$(E32ROMINC)/language/os \
+#	$(E32ROMINC)/customer/app \
+#	$(E32ROMINC)/customer/mw \
+#	$(E32ROMINC)/customer/os \
diff -r 2ca1b6591d14 -r 351aac5b2f34 symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml
--- a/symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml	Tue Mar 23 19:05:50 2010 +0000
+++ b/symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml	Tue Mar 30 19:42:01 2010 +0100
@@ -4,7 +4,7 @@
 <Schedule12 Schema="2.0.0" 
 	Status="DRAFT" 
 	OS_version="tb101sf" Release_type="Update" 
-	DocVersion="$Change: 1759077 $ $DateTime: 2010/01/29 13:01:47 $ $Id: //SSS/release/sf/tb92/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml#23 $" >
+	DocVersion="$Change: 1764305 $ $DateTime: 2010/03/01 17:32:46 $ $Id: //SSS/release/sf/tb92/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml#63 $" >
 <OR name="Alarm Server">
 	Maintains a queue of all system-wide alarms and provides APIs to manage alarms
 	<system_model entry="Alarm Server"/>
diff -r 2ca1b6591d14 -r 351aac5b2f34 symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml
--- a/symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml	Tue Mar 23 19:05:50 2010 +0000
+++ b/symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml	Tue Mar 30 19:42:01 2010 +0100
@@ -4,7 +4,7 @@
 <Schedule12 Schema="2.0.0" 
 	Status="DRAFT" 
 	OS_version="tb101sf" Release_type="Update" 
-	DocVersion="$Change: 1759077 $ $DateTime: 2010/01/29 13:01:47 $ $Id: //SSS/release/sf/tb92/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml#23 $" >
+	DocVersion="$Change: 1764305 $ $DateTime: 2010/03/01 17:32:46 $ $Id: //SSS/release/sf/tb92/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml#63 $" >
 <OR name="Alarm Server">
 	Maintains a queue of all system-wide alarms and provides APIs to manage alarms
 	<system_model entry="Alarm Server"/>
diff -r 2ca1b6591d14 -r 351aac5b2f34 symbianosbld/cedarutils/Symbian_OS_vtb92sf.xml
--- a/symbianosbld/cedarutils/Symbian_OS_vtb92sf.xml	Tue Mar 23 19:05:50 2010 +0000
+++ b/symbianosbld/cedarutils/Symbian_OS_vtb92sf.xml	Tue Mar 30 19:42:01 2010 +0100
@@ -40,9 +40,10 @@
 	<SetEnv Order="19" Name="MWLD" Value="%MWROOT%\Symbian_Tools\Command_Line_Tools\mwldsym2.exe"/> 
     <SetEnv Order="20" Name="PATH" Value="%MWROOT%\Symbian_Tools\Command_Line_Tools;%PATH%"/>
     <SetEnv Order="21" Name="PATH" Value="%PATH%;C:\Apps\Python24"/>
-    <SetEnv Order="22" Name="PATH" Value="%EPOCROOT%SBSv2\bin;%PATH%"/>
+	<!-- %SBS_LOCAL_BIN% is required to support the optional use of a locally installed Raptor -->
+    <SetEnv Order="22" Name="PATH" Value="%SBS_LOCAL_BIN%%EPOCROOT%SBSv2\bin;%PATH%"/>
     <SetEnv Order="23" Name="SBS_SRC" Value="%EPOCROOT%tools\sbs"/>
-	<SetEnv Order="24" Name="SBS_HOME" Value="%EPOCROOT%SBSv2"/>
+	<SetEnv Order="24" Name="SBS_ROOT" Value="%EPOCROOT%SBSv2"/>
     <SetEnv Order="25" Name="SOURCEROOT" Value="%SourceDir%"/> 
     <SetEnv Order="26" Name="SBS_VERSION" Value="1"/>
 	<SetEnv Order="27" Name="PATH" Value="%BuildDir%\reltools;%EPOCROOT%epoc32\tools;%EPOCROOT%epoc32\gcc\bin;%PATH%;%EPOCROOT%epoc32\rom\include;%EPOCROOT%epoc32\include;"/>
@@ -64,14 +65,14 @@
 	<!-- Install cbr tools from latest green tcl build by sf zip package  -->
 	<Execute Component="Make temporary epoc32/relinfo Dir" Cwd="%BuildDir%" CommandLine="mkdir %EPOCROOT%epoc32\relinfo"/>
     <Execute Component="Get TCL sfreltools.ini" Cwd="%BuildDir%" CommandLine="copy %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\TCL_Support\sfreltools.ini %EPOCROOT%epoc32\relinfo\reltools.ini"/>
-    <Execute Component="Unzip zip package of cbr tools" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\unzip_cbr_tools.pl -tcl_delta_cache %TCLDeltaCache% -log_dir %LogsDir% -product dp -number 11 -version DP00572"/>
+    <Execute Component="Unzip zip package of cbr tools" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\unzip_cbr_tools.pl -tcl_delta_cache %TCLDeltaCache% -log_dir %LogsDir% -product dp -number 11"/>
 	<Execute Component="Copy cbr tools to own directory" Cwd="%BuildDir%" CommandLine="xcopy &quot;cbr tools&quot; \reltools\ /E /R /Y"/>
 	<Execute Component="Remove cbr tools directory" Cwd="%BuildDir%" CommandLine="rd &quot;cbr tools&quot; /s /q"/>
     <Execute Component="Publish cbrtools_unzip.log" Cwd="%LogsDir%" CommandLine="copy cbrtools_unzip.log %PublishLocation%\%Type%\%BuildNumber%\logs\"/>
 	
     <!-- Install SBSv2 -->
-    <Execute Component="Get Raptor related components" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -c dev_build_sbsv2_raptor -c dev_build_sbsv2_cpp-raptor -c dev_hostenv_dist_cygwin-1.5.25 -c dev_hostenv_dist_mingw-5.1.4 -c dev_hostenv_pythontoolsplat_python-2.5.2 -bv DP00572_DeveloperProduct -o %LogsDir%\raptor_version.txt"/>
-    <Execute Component="Copy SBSv2 to own directory" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\bxcopy.pl  -s %SBS_SRC%  -t %SBS_HOME%"/>
+    <Execute Component="Get Raptor related components" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -c dev_build_sbsv2_raptor -c dev_build_sbsv2_cpp-raptor -c dev_hostenv_dist_cygwin-1.5.25 -c dev_hostenv_dist_mingw-5.1.4 -c dev_hostenv_pythontoolsplat_python-2.5.2 -bv green -o %LogsDir%\raptor_version.txt"/>
+    <Execute Component="Copy SBSv2 to own directory" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\bxcopy.pl  -s %SBS_SRC%  -t %SBS_ROOT%"/>
     <Execute Component="Remove Raptor related components" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\RmInstalledEnv.pl -x  %LogsDir%\raptor_version.txt"/>
 	<Execute Component="Remove epoc32 directory" Cwd="%BuildDir%" CommandLine="rd %EPOCROOT%epoc32 /s /q"/>
 	
@@ -240,23 +241,23 @@
     <Execute Component="e32toolp Build" Cwd="%BuildDir%" CommandLine="sbs --filters=FilterSquashlog  -t 3 -j %MAX_CONCURRENT% -k -m %EPOCROOT%epoc32\build\Makefile_e32toolp -f %LogsDir%\sbs_e32toolp_log.xml.log -b %SourceDir%\os\buildtools\sbsv1_os\e32toolp\group\bld.inf -c tools2_rel.vtb92.whatlog -i > %LogsDir%\e32toolp.log 2>&amp;1"/>
     <Execute Component="Generate html log for e32toolp" Cwd="%EPOCROOT%tools" CommandLine="perl %EPOCROOT%tools\sbsv2htmlscanlog.pl -l %LogsDir%\sbs_e32toolp_log.xml.log  -o %LogsDir%\sbs_e32toolp_log.html -v -v "/>
     <Execute Component="Copy TCL reltools.ini to get rcomp" Cwd="%BuildDir%" CommandLine="copy %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\TCL_Support\sfreltools.ini %EPOCROOT%epoc32\relinfo\reltools.ini"/>
-    <Execute Component="Get latest Rcomp component from TCL" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -s -c dev_build_bintools_rcomp -bv DP00572_DeveloperProduct -o %LogsDir%\rcomp_version.txt 2>&amp;1"/>
-    <Execute Component="Get Latest Green Trace Compiler from TCL" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -c osttracecompiler -bv DP00572_DeveloperProduct -o %LogsDir%\tracecompiler_version.txt 2>&amp;1"/>    
+    <Execute Component="Get latest Rcomp component from TCL" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -s -c dev_build_bintools_rcomp -bv green -o %LogsDir%\rcomp_version.txt 2>&amp;1"/>
+    <Execute Component="Get Latest Green Trace Compiler from TCL" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -c osttracecompiler -bv green -o %LogsDir%\tracecompiler_version.txt 2>&amp;1"/>    
     <Execute Component="Copy OS Reltools.ini to epoc32/relinfo" Cwd="%BuildDir%" CommandLine="copy %CleanSourceDir%\os\deviceplatformrelease\symbianosbld\productionbldcbrconfig\%BuildShortName%\reltools.ini %EPOCROOT%epoc32\relinfo\toreltools.ini"/>
-    <Execute Component="Push the latest Rcomp to OS" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\pushComp.pl -c dev_build_bintools_rcomp -r %EPOCROOT%epoc32\relinfo\toreltools.ini -version DP00572"/>
-    <Execute Component="Push the Latest Green Trace Compiler to OS Archive" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\pushComp.pl -c osttracecompiler -r %EPOCROOT%epoc32\relinfo\toreltools.ini -version DP00572"/>
+    <Execute Component="Push the latest Rcomp to OS" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\pushComp.pl -c dev_build_bintools_rcomp -r %EPOCROOT%epoc32\relinfo\toreltools.ini -g"/>
+    <Execute Component="Push the Latest Green Trace Compiler to OS Archive" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\pushComp.pl -c osttracecompiler -r %EPOCROOT%epoc32\relinfo\toreltools.ini -g"/>
 	 <!-- "DS.1756" changes bootstrapping components from TCL  START -->
- 	 <Execute Component="Get latest dev_build_imgtools_romtools component from TCL" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -s -c dev_build_imgtools_romtools -bv DP00572_DeveloperProduct -o %LogsDir%\dev_build_imgtools_romtools_version.txt 2>&amp;1"/>
-     <Execute Component="Push the latest dev_build_imgtools_romtools to OS" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\pushComp.pl -c dev_build_imgtools_romtools -r %EPOCROOT%epoc32\relinfo\toreltools.ini -version DP00572"/>
+ 	 <Execute Component="Get latest dev_build_imgtools_romtools component from TCL" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -s -c dev_build_imgtools_romtools -bv green -o %LogsDir%\dev_build_imgtools_romtools_version.txt 2>&amp;1"/>
+     <Execute Component="Push the latest dev_build_imgtools_romtools to OS" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\pushComp.pl -c dev_build_imgtools_romtools -r %EPOCROOT%epoc32\relinfo\toreltools.ini -g"/>
      
-     <Execute Component="Get latest dev_build_imgtools_buildrom component from TCL" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -s -c dev_build_imgtools_buildrom -bv DP00572_DeveloperProduct -o %LogsDir%\dev_build_imgtools_buildrom_version.txt 2>&amp;1"/>
-     <Execute Component="Push the latest dev_build_imgtools_buildrom to OS" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\pushComp.pl -c dev_build_imgtools_buildrom -r %EPOCROOT%epoc32\relinfo\toreltools.ini -version DP00572"/>
+     <Execute Component="Get latest dev_build_imgtools_buildrom component from TCL" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -s -c dev_build_imgtools_buildrom -bv green -o %LogsDir%\dev_build_imgtools_buildrom_version.txt 2>&amp;1"/>
+     <Execute Component="Push the latest dev_build_imgtools_buildrom to OS" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\pushComp.pl -c dev_build_imgtools_buildrom -r %EPOCROOT%epoc32\relinfo\toreltools.ini -g"/>
  
-     <Execute Component="Get latest dev_build_imgtools_imglib component from TCL" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -s -c dev_build_imgtools_imglib -bv DP00572_DeveloperProduct -o %LogsDir%\dev_build_imgtools_imglib_version.txt 2>&amp;1"/>
-     <Execute Component="Push the latest dev_build_imgtools_imglib to OS" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\pushComp.pl -c dev_build_imgtools_imglib -r %EPOCROOT%epoc32\relinfo\toreltools.ini -version DP00572"/>
+     <Execute Component="Get latest dev_build_imgtools_imglib component from TCL" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -s -c dev_build_imgtools_imglib -bv green -o %LogsDir%\dev_build_imgtools_imglib_version.txt 2>&amp;1"/>
+     <Execute Component="Push the latest dev_build_imgtools_imglib to OS" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\pushComp.pl -c dev_build_imgtools_imglib -r %EPOCROOT%epoc32\relinfo\toreltools.ini -g"/>
  
-     <Execute Component="Get latest dev_build_imgtools_sisutils component from TCL" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -s -c dev_build_imgtools_sisutils -bv DP00572_DeveloperProduct -o %LogsDir%\dev_build_imgtools_sisutils_version.txt 2>&amp;1"/>
-     <Execute Component="Push the latest dev_build_imgtools_sisutils to OS" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\pushComp.pl -c dev_build_imgtools_sisutils -r %EPOCROOT%epoc32\relinfo\toreltools.ini -version DP00572"/>
+     <Execute Component="Get latest dev_build_imgtools_sisutils component from TCL" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -s -c dev_build_imgtools_sisutils -bv green -o %LogsDir%\dev_build_imgtools_sisutils_version.txt 2>&amp;1"/>
+     <Execute Component="Push the latest dev_build_imgtools_sisutils to OS" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\pushComp.pl -c dev_build_imgtools_sisutils -r %EPOCROOT%epoc32\relinfo\toreltools.ini -g"/>
       <!-- "DS.1756" changes bootstrapping components from TCL  END -->
 
  <!-- Retrieve S60 binaries which remoteconn is dependent on -->
@@ -395,7 +396,7 @@
 
     <!--Prep for CBR -->
     <Execute Component="CBR Copy Clean Src" Cwd="%BuildDir%\CBRTV" CommandLine="xcopy %CleanSourceDir% %BuildDir%\CBRTV\sf /E /Z /I /Q"/>
-    <Execute Component="Run sbsv2cache tool" Cwd="%BuildDir%" CommandLine="%SBS_HOME%\win32\python252\python.exe %SBS_HOME%\bin\sbsv2cache.py -v -s -o %ABLDCACHE% -l %LogsDir%\sbs_e32toolp_log.xml.log -l %LogsDir%\sbs_GT_log.xml.log -l %LogsDir%\sbs_TV_log.xml.log -l %LogsDir%\sbs_tools_log.xml.log -l %LogsDir%\sbs_tools2_rel_log.xml.log -l %LogsDir%\sbs_tools2_deb_log.xml.log > %LogsDir%\sbs_sbsv2cache.log 2>&amp;1"/>
+    <Execute Component="Run sbsv2cache tool" Cwd="%BuildDir%" CommandLine="%SBS_ROOT%\win32\python252\python.exe %SBS_ROOT%\bin\sbsv2cache.py -v -s -o %ABLDCACHE% -l %LogsDir%\sbs_e32toolp_log.xml.log -l %LogsDir%\sbs_GT_log.xml.log -l %LogsDir%\sbs_TV_log.xml.log -l %LogsDir%\sbs_tools_log.xml.log -l %LogsDir%\sbs_tools2_rel_log.xml.log -l %LogsDir%\sbs_tools2_deb_log.xml.log > %LogsDir%\sbs_sbsv2cache.log 2>&amp;1"/>
     <Execute Component="Publish Raptor Cache Log"    Cwd="%BuildDir%" CommandLine="copy %LogsDir%\sbs_sbsv2cache.log %PublishLocation%\%Type%\%BuildNumber%\logs\sbs_sbsv2cache.log"/>
 
 	<!-- Cleanup unnecessary files  to remove warnings -->
@@ -442,7 +443,7 @@
     <!-- GET IMGCHECK component  --> 
     <Execute Component="Imgcheck  Make Dir relinfo" Cwd="%BuildDir%" CommandLine="mkdir %BuildDir%\epoc32\relinfo\"/>
     <Execute Component="Get TCL sfreltools.ini" Cwd="%BuildDir%" CommandLine="copy %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\TCL_Support\sfreltools.ini %BuildDir%\epoc32\relinfo\reltools.ini"/>
-    <Execute Component="Obtain IMGCHECK component" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -c dev_build_imgtools_imgcheck -bv DP00572_DeveloperProduct -o %LogsDir%\imgcheck_version.txt"/>    
+    <Execute Component="Obtain IMGCHECK component" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -c dev_build_imgtools_imgcheck -bv green -o %LogsDir%\imgcheck_version.txt"/>    
     
     <!-- USE IMGCHECK to create SID, VID reports for these ROM images -->
     <Execute Component="Run IMGCHECK" Cwd="%BuildDir%" CommandLine="%BuildDir%\epoc32\tools\imgcheck.exe --e32input --sid --vid  --verbose M:\epoc32\release\armv5\urel\ -x -o=%LogsDir%\SIDVID.xml -a 2>&amp;1"/> 
@@ -460,7 +461,7 @@
     <Execute Component="Make Dir relinfo" Cwd="%BuildDir%" CommandLine="mkdir %BuildDir%\epoc32\relinfo\"/>
     <Execute Component="Get TCL sfreltools.ini" Cwd="%BuildDir%" CommandLine="copy %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\TCL_Support\sfreltools.ini %EPOCROOT%epoc32\relinfo\reltools.ini"/>
           
-    <Execute Component="Obtain CDB tools" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -c ana_compatanamdw_apicompatanamdw_cdb -bv DP00572_DeveloperProduct -o %LogsDir%\cdb_version.txt"/>          
+    <Execute Component="Obtain CDB tools" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -c ana_compatanamdw_apicompatanamdw_cdb -bv green -o %LogsDir%\cdb_version.txt"/>