--- a/imgtools_os/romkiteka2/group/BLD.INF Mon May 03 13:35:09 2010 +0300
+++ b/imgtools_os/romkiteka2/group/BLD.INF Fri May 14 16:59:59 2010 +0300
@@ -75,6 +75,9 @@
// OBY file that builds a substantial Text Shell rom with no UI dependency
../include/textshell.oby /epoc32/rom/include/textshell.oby
+// OBY file that builds a substantial Text Shell rom with no UI dependency and works with the Chassis build for BATS testing
+../include/textshell_Chassis_BATS.oby /epoc32/rom/include/textshell_Chassis_BATS.oby
+
#if defined(SYMBIAN_FEATURE_MANAGER)
PRJ_PLATFORMS
TOOLS2
--- a/imgtools_os/romkiteka2/include/RemovableFeatures.iby Mon May 03 13:35:09 2010 +0300
+++ b/imgtools_os/romkiteka2/include/RemovableFeatures.iby Fri May 14 16:59:59 2010 +0300
@@ -17,30 +17,30 @@
#define __REMOVABLEFEATURES_IBY__
#define SYMBIAN_EXCLUDE_FAX
-#define SYMBIAN_EXCLUDE_PRINT
-#define SYMBIAN_EXCLUDE_MMC
+#undef __UPNP_PRINT_FRAMEWORK
+#undef __MMC
#define SYMBIAN_EXCLUDE_RTP_RTCP
#define SYMBIAN_EXCLUDE_PC_CONNECTIVITY_EXCEPT_SECURE_BACKUP
-#define SYMBIAN_EXCLUDE_INFRARED
-#define SYMBIAN_EXCLUDE_BLUETOOTH
+#undef __IRDA
+#undef __BT
#define SYMBIAN_EXCLUDE_OBEX
-#define SYMBIAN_EXCLUDE_USB
+#undef __USB
#define SYMBIAN_EXCLUDE_DRM_AGENT_PLUGINS
-#define SYMBIAN_EXCLUDE_IPSEC
+#undef __IPSEC
#define SYMBIAN_EXCLUDE_QOS_PROTPLUGINS
-#define SYMBIAN_EXCLUDE_DHCP
+#undef __DHCP
#define SYMBIAN_EXCLUDE_MOBILEIP
#define SYMBIAN_EXCLUDE_LOCATION
#define SYMBIAN_EXCLUDE_SIP
#define SYMBIAN_EXCLUDE_OFFLINE_MODE
-#define SYMBIAN_EXCLUDE_MTP
-#define SYMBIAN_EXCLUDE_VIBRA
-#define SYMBIAN_EXCLUDE_AMBIENT_LIGHT_SENSOR
-#define SYMBIAN_EXCLUDE_COVER_DISPLAY
-#define SYMBIAN_EXCLUDE_KEYPAD_NO_SLIDER
+#undef __MTP_PROTOCOL_SUPPORT
+#undef __VIBRA
+#undef __SERIES60_AMBIENT_LIGHT_SENSOR
+#undef __COVER_DISPLAY
+#undef __SERIES60_KEYPAD_NO_SLIDER
#define SYMBIAN_EXCLUDE_LOCATION_MANAGEMENT
-#define SYMBIAN_EXCLUDE_CS_VIDEO_TELEPHONY
-#define SYMBIAN_EXCLUDE_EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE
-#define SYMBIAN_EXCLUDE_DRIVE_MODE_CAN_RESTRICT_MT_CALLS
+#undef __CS_VIDEO_TELEPHONY
+#undef __COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE
+#undef __DRIVE_MODE
#endif
--- a/imgtools_os/romkiteka2/include/feature.iby Mon May 03 13:35:09 2010 +0300
+++ b/imgtools_os/romkiteka2/include/feature.iby Fri May 14 16:59:59 2010 +0300
@@ -24,35 +24,35 @@
FEATURE Fax
#endif
-#ifdef SYMBIAN_EXCLUDE_PRINT
+#ifndef __UPNP_PRINT_FRAMEWORK
EXCLUDE_FEATURE Print
#else
FEATURE Print
#endif
-#ifdef SYMBIAN_EXCLUDE_BLUETOOTH
+#ifndef __BT
EXCLUDE_FEATURE Bluetooth
#else
FEATURE Bluetooth
#endif
-#ifdef SYMBIAN_EXCLUDE_INFRARED
+#ifndef __IRDA
EXCLUDE_FEATURE Infrared
#else
FEATURE Infrared
#endif
-#ifdef SYMBIAN_EXCLUDE_MMC
+#ifndef __MMC
EXCLUDE_FEATURE Mmc
#else
FEATURE Mmc
#endif
-#ifdef SYMBIAN_EXCLUDE_USB
+#ifndef __USB
EXCLUDE_FEATURE Usb
#else
FEATURE Usb
@@ -89,7 +89,7 @@
#endif
-#ifdef SYMBIAN_EXCLUDE_IPSEC
+#ifndef __IPSEC
EXCLUDE_FEATURE IPSec
#else
FEATURE IPSec
@@ -97,7 +97,7 @@
-#ifdef SYMBIAN_EXCLUDE_DHCP
+#ifndef __DHCP
EXCLUDE_FEATURE Dhcp
#else
FEATURE Dhcp
@@ -112,50 +112,50 @@
#endif
-#ifdef SYMBIAN_EXCLUDE_MTP
+#ifndef __MTP_PROTOCOL_SUPPORT
EXCLUDE_FEATURE MTP
#else
FEATURE MTP
#endif
-#ifdef SYMBIAN_EXCLUDE_VIBRA
+#ifndef __VIBRA
EXCLUDE_FEATURE Vibra
#else
FEATURE Vibra
#endif
-#ifdef SYMBIAN_EXCLUDE_AMBIENT_LIGHT_SENSOR
+#ifndef __SERIES60_AMBIENT_LIGHT_SENSOR
EXCLUDE_FEATURE AmbientLightSensor
#else
FEATURE AmbientLightSensor
#endif
-#ifdef SYMBIAN_EXCLUDE_COVER_DISPLAY
+#ifndef __COVER_DISPLAY
EXCLUDE_FEATURE CoverDisplay
#else
FEATURE CoverDisplay
#endif
-#ifdef SYMBIAN_EXCLUDE_KEYPAD_NO_SLIDER
+#ifndef __SERIES60_KEYPAD_NO_SLIDER
EXCLUDE_FEATURE KeypadNoSlider
#else
FEATURE KeypadNoSlider
#endif
-#ifdef SYMBIAN_EXCLUDE_CS_VIDEO_TELEPHONY
+#ifndef __CS_VIDEO_TELEPHONY
EXCLUDE_FEATURE CsVideoTelephony
#else
FEATURE CsVideoTelephony
#endif
-#ifdef SYMBIAN_EXCLUDE_EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE
+#ifndef __COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE
EXCLUDE_FEATURE EmergencyCallsEnabledInOfflineMode
#else
FEATURE EmergencyCallsEnabledInOfflineMode
#endif
-#ifdef SYMBIAN_EXCLUDE_DRIVE_MODE_CAN_RESTRICT_MT_CALLS
+#ifndef __DRIVE_MODE
EXCLUDE_FEATURE DriveModeCanRestrictMtCalls
#else
FEATURE DriveModeCanRestrictMtCalls
--- a/imgtools_os/romkiteka2/include/featuredatabase.xml Mon May 03 13:35:09 2010 +0300
+++ b/imgtools_os/romkiteka2/include/featuredatabase.xml Fri May 14 16:59:59 2010 +0300
@@ -46,19 +46,19 @@
<hrhmacro exclude="SYMBIAN_EXCLUDE_FAX"/>
</feature>
<feature name="Print" statusflags="0x00000001" uid="0x000005FF">
- <hrhmacro exclude="SYMBIAN_EXCLUDE_PRINT"/>
+ <hrhmacro include="__UPNP_PRINT_FRAMEWORK"/>
</feature>
<feature name="Bluetooth" statusflags="0x00000001" uid="0x0000000C">
- <hrhmacro exclude="SYMBIAN_EXCLUDE_BLUETOOTH"/>
+ <hrhmacro include="__BT"/>
</feature>
<feature name="Infrared" statusflags="0x00000001" uid="0x0000000B">
- <hrhmacro exclude="SYMBIAN_EXCLUDE_INFRARED"/>
+ <hrhmacro include="__IRDA"/>
</feature>
<feature name="Mmc" statusflags="0x00000001" uid="0x00000001">
- <hrhmacro exclude="SYMBIAN_EXCLUDE_MMC"/>
+ <hrhmacro include="__MMC"/>
</feature>
<feature name="Usb" statusflags="0x00000001" uid="0x0000000D">
- <hrhmacro exclude="SYMBIAN_EXCLUDE_USB"/>
+ <hrhmacro include="__USB"/>
</feature>
<feature name="Obex" statusflags="0x00000001" uid="0x1027980C">
<hrhmacro exclude="SYMBIAN_EXCLUDE_OBEX"/>
@@ -76,32 +76,32 @@
<hrhmacro exclude="SYMBIAN_EXCLUDE_QOS_PROTPLUGINS"/>
</feature>
<feature name="IPSec" statusflags="0x00000001" uid="0x00000066">
- <hrhmacro exclude="SYMBIAN_EXCLUDE_IPSEC"/>
+ <hrhmacro include="__IPSEC"/>
</feature>
<feature name="Dhcp" statusflags="0x00000001" uid="0x0000006B">
- <hrhmacro exclude="SYMBIAN_EXCLUDE_DHCP"/>
+ <hrhmacro include="__DHCP"/>
</feature>
<feature name="Connectivity" statusflags="0x00000001" uid="0x10279816">
<hrhmacro exclude="SYMBIAN_EXCLUDE_PC_CONNECTIVITY_EXCEPT_SECURE_BACKUP"/>
</feature>
<feature name="MTP" statusflags="0x00000001" uid="0x000001F8">
- <hrhmacro exclude="SYMBIAN_EXCLUDE_MTP"/>
+ <hrhmacro include="__MTP_PROTOCOL_SUPPORT"/>
</feature>
<feature name="Location" statusflags="0x00000001" uid="0x00000072"></feature>
<feature name="MobileIP" statusflags="0x00000001" uid="0x10281819"></feature>
<feature name="OfflineMode" statusflags="0x00000001" uid="0x00000007"></feature>
<feature name="DRM" statusflags="0x00000001" uid="0x0000005B"></feature>
<feature name="Vibra" statusflags="0x00000001" uid="0x0000019B">
- <hrhmacro exclude="SYMBIAN_EXCLUDE_VIBRA"/>
+ <hrhmacro include="__VIBRA"/>
</feature>
<feature name="AmbientLightSensor" statusflags="0x00000001" uid="0x000005F9">
- <hrhmacro exclude="SYMBIAN_EXCLUDE_AMBIENT_LIGHT_SENSOR"/>
+ <hrhmacro include="__SERIES60_AMBIENT_LIGHT_SENSOR"/>
</feature>
<feature name="CoverDisplay" statusflags="0x00000001" uid="0x00000003">
- <hrhmacro exclude="SYMBIAN_EXCLUDE_COVER_DISPLAY"/>
+ <hrhmacro include="__COVER_DISPLAY"/>
</feature>
<feature name="KeypadNoSlider" statusflags="0x00000001" uid="0x000003F5">
- <hrhmacro exclude="SYMBIAN_EXCLUDE_KEYPAD_NO_SLIDER"/>
+ <hrhmacro include="__SERIES60_KEYPAD_NO_SLIDER"/>
</feature>
<feature name="LocationManagement" statusflags="0x00000001" uid="0x10279818">
<hrhmacro exclude="SYMBIAN_EXCLUDE_LOCATION_MANAGEMENT"/>
@@ -110,7 +110,7 @@
<hrhmacro include="SYMBIAN_INCLUDE_LOCATION_API_VARIANT2"/>
</feature>
<feature name="BluetoothGPSPositioningPlugin" statusflags="0x00000000" uid="0x0000007A">
- <hrhmacro include="SYMBIAN_INCLUDE_BLUETOOTH_GPS_PM"/>
+ <hrhmacro include="__BLUETOOTHGPSPSY"/>
</feature>
<feature name="DefaultPositioningPlugin" statusflags="0x00000000" uid="0x10285D6B">
<hrhmacro include="SYMBIAN_INCLUDE_DEFAULT_PM"/>
@@ -125,16 +125,16 @@
<hrhmacro include="SYMBIAN_INCLUDE_LOCATION_ADVANCED_DIALOG"/>
</feature>
<feature name="CsVideoTelephony" statusflags="0x00000001" uid="0x00000059">
- <hrhmacro exclude="SYMBIAN_EXCLUDE_CS_VIDEO_TELEPHONY"/>
+ <hrhmacro include="__CS_VIDEO_TELEPHONY"/>
</feature>
<feature name="EmergencyCallsEnabledInOfflineMode" statusflags="0x00000001" uid="0x00000126">
- <hrhmacro exclude="SYMBIAN_EXCLUDE_EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE"/>
+ <hrhmacro include="__COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE"/>
</feature>
<feature name="DriveModeCanRestrictMtCalls" statusflags="0x00000001" uid="0x00000584">
- <hrhmacro exclude="SYMBIAN_EXCLUDE_DRIVE_MODE_CAN_RESTRICT_MT_CALLS"/>
+ <hrhmacro include="__DRIVE_MODE"/>
</feature>
<feature name="FmTx" statusflags="0x00000001" uid="0x000006A9">
- <hrhmacro exclude="SYMBIAN_EXCLUDE_FMTX"/>
+ <hrhmacro include="FF_FMTX"/>
</feature>
<!-- PREQ 2051 - Variation Support - Start -->
<feature name="Libxml2" statusflags="0x00000001" uid="0x10286747">
--- a/imgtools_os/romkiteka2/include/textshell.oby Mon May 03 13:35:09 2010 +0300
+++ b/imgtools_os/romkiteka2/include/textshell.oby Fri May 14 16:59:59 2010 +0300
@@ -24,7 +24,7 @@
#define NO_METROTRK_APP // don't want metrotrk application
#define HAS_ETHERNET // include etherDrv, ether802, DHCP
#define SYMBIAN_EXCLUDE_FAX
-#define SYMBIAN_EXCLUDE_IPSEC
+#undef __IPSEC
#define SYMBIAN_EXCLUDE_OBEX
#ifdef SYMBIAN_SYSTEM_STATE_MANAGEMENT
#define _SSMSTARTUPMODE 1 //for ssma boot up.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/imgtools_os/romkiteka2/include/textshell_chassis_bats.oby Fri May 14 16:59:59 2010 +0300
@@ -0,0 +1,204 @@
+#ifndef __TEXTSHELL_OBY__
+#define __TEXTSHELL_OBY__
+
+// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "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:
+// This OBY File is used to build Text Shell ROM Images.
+//
+//
+
+define OBEYFILE TextShell
+define ROMDATE ##TODAY##
+
+// Undefine things in global System Include that stops the SymTB textshell rom from working.
+#undef USE_CUSTOM_MMC_PARTITION
+#undef SYMBIAN_EXCLUDE_SCDV
+#undef SYMBIAN_GRAPHICS_USE_GCE
+#undef SYMBIAN_GRAPHICS_ADAPTATION
+#undef SGA_SW_NO_GRAPHICSRESOURCE
+#undef SYMBIAN_EXCLUDE_KEYMAP
+
+
+
+#define NO_METROTRK_APP // don't want metrotrk application
+#define HAS_ETHERNET // include etherDrv, ether802, DHCP
+#define SYMBIAN_EXCLUDE_FAX
+#undef __IPSEC
+#define SYMBIAN_EXCLUDE_OBEX
+#ifdef SYMBIAN_SYSTEM_STATE_MANAGEMENT
+#define _SSMSTARTUPMODE 1 //for ssma boot up.
+#else
+#define _STARTUPMODE1 // for sysstart.iby
+#endif
+
+// The following 3 macros need to be removed once LibXML2 is depended
+// by any of the component in textshell image.
+#define SYMBIAN_EXCLUDE_LIBXML2
+#define SYMBIAN_EXCLUDE_LIBXML2_SAX_CPARSER_PLUGIN
+#define SYMBIAN_EXCLUDE_LIBXML2_DOM_XPATH_API
+
+// Various workarounds to avoid dependencies on UIKON
+
+#define __TLS_IBY__ // exclude TLS
+#define __TLSPROVIDER_IBY__ // exclude TLSPROVIDER
+#define __OBEXPROTOCOL_IBY__ // exclude obex.dll etc
+#define __WLANEAPMETHODS_IBY__ // exclude eap_tls.msy & friends
+//
+
+#include <header.iby> /* ROM header definitions */
+#include <base.iby> /* The lowest-level of the operating system */
+
+#ifdef SYMBIAN_SYSTEM_STATE_MANAGEMENT
+
+#include <ssma.iby> /*System State Management Architecture*/
+#include <ssplugins.iby> /*System State Management Plugins*/
+
+//Include SSM optional components to enable teams to build a plain textshell rom (on the lines of DEF128306),
+//following removal of h4_textshell_rom.oby.
+#include <amastart.iby>
+#include <aplp.iby>
+#include <shma.iby>
+#include <ssrefplugins.iby>
+#else
+#include <sysstart.iby>
+#include <sysstartconfig.iby>
+#endif // SYMBIAN_SYSTEM_STATE_MANAGEMENT
+
+#include <debug.iby>
+file=ABI_DIR\DEBUG_DIR\RUNTESTS.EXE sys\bin\RUNTESTS.EXE
+
+
+file=ABI_DIR\DEBUG_DIR\EDISP.DLL sys\bin\EDISP.DLL
+
+
+#ifdef FULL_WINDOWSERVER
+ ERROR TextShell ROMs currently require the Text window server //#include <wserv.iby>
+#else
+ file=ABI_DIR\DEBUG_DIR\ewsrv.EXE sys\bin\EWSRV.EXE fixed
+ file=ABI_DIR\DEBUG_DIR\ECONS.DLL sys\bin\ECONS.DLL
+#endif
+
+#include <eshell.iby>
+
+#if !defined(FULL_WINDOWSERVER)
+#include <graphics_textshell.iby>
+#endif
+
+#include <centralrepository.iby>
+ file=ABI_DIR\BUILD_DIR\abclient.dll sys\bin\abclient.dll
+
+#include <crypto.iby>
+
+#include <c32.iby>
+#include <ecuart.iby>
+#include <irda.iby>
+// #include <bluetooth.iby>
+#include <stdlib.iby>
+#include <gdi.iby>
+#include <fntstore.iby>
+#include <fbserv.iby>
+#include <bitgdi.iby>
+#include <iculayoutengine.iby>
+#include <freetype.iby>
+#include <opengles.iby>
+
+#include <printers.iby>
+
+// include enough multimedia components to keep cone happy. includes symbian optional, reference and replacable components
+//#include <mmf.iby>
+//#include <mmcommon.iby>
+//#include <mdf.iby>
+//#include <devvideo.iby>
+//#include <devsound_pluginsupport.iby>
+//#include <devsound_refplugin.iby>
+//#ifdef SYMBIAN_MULTIMEDIA_A3FDEVSOUND
+//#include <acf.iby>
+//#include <a3fdevsound.iby>
+//#include <acl.iby>
+//#include <devsoundadaptationinfo.iby>
+//#include <refacladaptation.iby>
+//#include <refmmrc.iby>
+//#include <a3fserverstart.iby>
+//#endif // SYMBIAN_MULTIMEDIA_A3FDEVSOUND
+
+#include <traces.iby>
+//#include <mmf_plugin.iby>
+//#include <omxilcompref.iby>
+//#include <omxilcomp.iby>
+//#include <omxilcore.iby>
+
+ #include <inetprotutil.iby> /* needed for mmfcontrollerframework.dll */
+ #include <caf.iby> /* needed for mediaclientutils.dll */
+
+
+#include <sysagent.iby>
+
+#include <network.iby>
+ #include <dial.iby> // needed by commsdat
+
+#include <etel.iby>
+#include <smsstack.iby>
+
+#include <etelmm.iby>
+#include <etelpckt.iby>
+#include <mmtsy.iby>
+#include <etelsat.iby>
+#include <sysawatcher.iby>
+
+#include <bafl.iby>
+#include <ecom.iby>
+#include <store.iby>
+#include <dbms.iby>
+#include <pwrcli.iby>
+#include <xml.iby>
+#include <ups.iby>
+#include <securitycommonutils.iby>
+
+/* Feature Management run-time */
+#ifdef SYMBIAN_FEATURE_MANAGER
+
+// Include both old and new components when Feature Manager enabled
+#include <featmgr.iby>
+#include <featreg.iby>
+
+#else
+
+// Include only the original Feature Registry otherwise
+#include <featreg.iby>
+#ifndef ROM_FEATURE_MANAGEMENT
+/* Provide a default configuration file for the feature registry */
+data=EPOCROOT##epoc32\data\config\featreg_default.cfg private\102744CA\featreg.cfg
+#endif
+#endif
+
+#include <testexecute.iby> // Test Execute framework
+
+// Major unwanted extras needed to make the image link correctly
+
+#ifndef __APPARC_IBY__
+REM Satisfy unwanted references to appgrfx.dll
+#include <apparc.iby> /* Application architecture DLLs */
+ #include <emime.iby> /* Mime recognition */
+#endif
+
+//#ifndef __CONE_IBY__
+REM Satisfy unwanted reference to cone.dll, usually for CCoeEnv::Static()
+//#include <cone.iby>
+// file=ABI_DIR\BUILD_DIR\viewcli.dll sys\bin\viewcli.dll
+// file=ABI_DIR\BUILD_DIR\viewsrv.dll sys\bin\viewsrv.dll
+// #include <egul.iby>
+// #include <numberconversion.iby>
+//#endif
+
+#endif
--- a/sbsv1_os/e32toolp/makmake/mmp.pm Mon May 03 13:35:09 2010 +0300
+++ b/sbsv1_os/e32toolp/makmake/mmp.pm Fri May 14 16:59:59 2010 +0300
@@ -1706,14 +1706,19 @@
next LINE;
}
if( /^PAGED$/o) {
- if ($CodePagingTargetMode == PAGED or $DataPagingTargetMode == PAGED) {
+ #revert "PAGED" keyword from code and data paged to code paged only
+ #if ($CodePagingTargetMode == PAGED or $DataPagingTargetMode == PAGED) {
+ if ($CodePagingTargetMode == PAGED) {
push @MmpWarn, "$CurFile($LineNum) : duplicate paging setting\n";
}
- if ($CodePagingTargetMode == UNPAGED or $DataPagingTargetMode == UNPAGED) {
+ #revert "PAGED" keyword from code and data paged to code paged only
+ #if ($CodePagingTargetMode == UNPAGED or $DataPagingTargetMode == UNPAGED) {
+ if ($CodePagingTargetMode == UNPAGED) {
push @MmpWarn, "$CurFile($LineNum) : conflict paging setting\n";
}
$CodePagingTargetMode = PAGED;
- $DataPagingTargetMode = PAGED;
+ #revert "PAGED" keyword from code and data paged to code paged only
+ #$DataPagingTargetMode = PAGED;
next LINE;
}
if( /^UNPAGED$/o) {