# HG changeset patch
# User Tom Sutcliffe <thomas.sutcliffe@accenture.com>
# Date 1288009293 -3600
# Node ID 2f382fb2036c588ae4bbe75974523e55ff6057d8
# Parent  6bffbe8be6654c9984fa47d26c313b4426639f77
Fixes for S60 5th platform.

Also changed default config for S60 3rd and 5th to use Open Signed.

diff -r 6bffbe8be665 -r 2f382fb2036c build/common/fsh_system_include.mmh
--- a/build/common/fsh_system_include.mmh	Mon Oct 25 10:37:01 2010 +0100
+++ b/build/common/fsh_system_include.mmh	Mon Oct 25 13:21:33 2010 +0100
@@ -10,10 +10,10 @@
 // Accenture - Initial contribution
 //
 #include <fshell/common.mmh>
-#if defined(FSHELL_PLATFORM_FOUNDATION) || defined(FSHELL_PLATFORM_SYMTB)
+#if defined(FSHELL_PLATFORM_FOUNDATION) || defined(FSHELL_PLATFORM_SYMTB) || FSHELL_PLATFORM_S60 == 5
 #define FSHELL_USING_PLATFORM_PATHS
 #include <platform_paths.hrh>
-#elif FSHELL_PLATFORM_S60 >= 5
+#elif FSHELL_PLATFORM_S60 > 5
 #define FSHELL_USING_PLATFORM_PATHS
 #include <domain/osextensions/platform_paths.hrh>
 #endif
@@ -24,7 +24,7 @@
 systeminclude	\epoc32\include
 #endif
 
-#if !defined(FSHELL_USING_PLATFORM_PATHS) || (FSHELL_PLATFORM_S60 <= 5 && !defined(FSHELL_PLATFORM_SYMTB)) || defined(SYMBIAN_OLD_EXPORT_LOCATION)
+#if !defined(FSHELL_USING_PLATFORM_PATHS) || (FSHELL_PLATFORM_S60 < 5 && !defined(FSHELL_PLATFORM_SYMTB)) || defined(SYMBIAN_OLD_EXPORT_LOCATION)
 #define FSHELL_NETWORKING_SYSTEMINCLUDE \epoc32\include\networking
 #define FSHELL_HTTP_SYSTEMINCLUDE \epoc32\include\http
 #else
diff -r 6bffbe8be665 -r 2f382fb2036c build/s60/3rd_edition/platform.mmh
--- a/build/s60/3rd_edition/platform.mmh	Mon Oct 25 10:37:01 2010 +0100
+++ b/build/s60/3rd_edition/platform.mmh	Mon Oct 25 13:21:33 2010 +0100
@@ -32,6 +32,7 @@
 #define FSHELL_NO_MD4_SUPPORT
 
 #define FSHELL_PLATFORM_S60 3
+#define FSHELL_OPEN_SIGNED
 
 #endif // FSHELL_PLATFORM_MMH
 
diff -r 6bffbe8be665 -r 2f382fb2036c build/s60/5th_edition/platform.mmh
--- a/build/s60/5th_edition/platform.mmh	Mon Oct 25 10:37:01 2010 +0100
+++ b/build/s60/5th_edition/platform.mmh	Mon Oct 25 13:21:33 2010 +0100
@@ -17,8 +17,10 @@
 #endif
 
 #define FSHELL_NO_PIPS_SUPPORT // [TomS:] Does 5th ed have pips?
+#define FSHELL_NO_DOBJECTIX_SUPPORT
 
 #define FSHELL_PLATFORM_S60 5
+#define FSHELL_OPEN_SIGNED
 
 #endif // FSHELL_PLATFORM_MMH
 
diff -r 6bffbe8be665 -r 2f382fb2036c build/s60/platform_generic.mmh
--- a/build/s60/platform_generic.mmh	Mon Oct 25 10:37:01 2010 +0100
+++ b/build/s60/platform_generic.mmh	Mon Oct 25 13:21:33 2010 +0100
@@ -12,10 +12,6 @@
 #ifndef FSHELL_PLATFORM_GENERIC_MMH
 #define FSHELL_PLATFORM_GENERIC_MMH
 
-#ifndef FSHELL_OPEN_SIGNED
-#define FSHELL_CAP_ALL
-#define FSHELL_PROTECTED_UIDS
-#endif
 
 // Note FSHELL_PLATFORM_S60 is defined in the 3rd or 5th ed platform.mmh
 
diff -r 6bffbe8be665 -r 2f382fb2036c build/s60/tb92/platform.mmh
--- a/build/s60/tb92/platform.mmh	Mon Oct 25 10:37:01 2010 +0100
+++ b/build/s60/tb92/platform.mmh	Mon Oct 25 13:21:33 2010 +0100
@@ -17,7 +17,9 @@
 #endif
 
 #define FSHELL_PLATFORM_SYMTB 92
-#define FSHELL_PLATFORM_S60 5
+#define FSHELL_PLATFORM_S60 6
+#define FSHELL_CAP_ALL
+#define FSHELL_PROTECTED_UIDS
 
 #define FSHELL_CORE_SUPPORT_USB_ICON "ACM::1"
 
diff -r 6bffbe8be665 -r 2f382fb2036c commands/screenmode/screenmode.cpp
--- a/commands/screenmode/screenmode.cpp	Mon Oct 25 10:37:01 2010 +0100
+++ b/commands/screenmode/screenmode.cpp	Mon Oct 25 13:21:33 2010 +0100
@@ -13,7 +13,7 @@
 #include <fshell/common.mmh>
 
 #if defined (FSHELL_PLATFORM_S60) && FSHELL_PLATFORM_S60 >= 5
-#include "AknCapServerClient.h"	//for screen orientation change
+#include <AknCapServerClient.h>	//for screen orientation change
 #endif
 
 #include <W32STD.H>
diff -r 6bffbe8be665 -r 2f382fb2036c documentation/change_history.pod
--- a/documentation/change_history.pod	Mon Oct 25 10:37:01 2010 +0100
+++ b/documentation/change_history.pod	Mon Oct 25 13:21:33 2010 +0100
@@ -24,6 +24,10 @@
 
 =item *
 
+Changed S60 3rd and 5th platforms to default to the Open Signed configuration, as that's what most people will be using.
+
+=item *
+
 Commands can now define a C<==smoke-test> section in their CIF files, which defines a snippet of fshell script that will be run as part of C<fshell smoketest> or by invoking L<ciftest|commands::ciftest> directly. See the ciftest documentation for more details.
 
 =item *
diff -r 6bffbe8be665 -r 2f382fb2036c libraries/extrabtrace/group/extrabtrace.iby
--- a/libraries/extrabtrace/group/extrabtrace.iby	Mon Oct 25 10:37:01 2010 +0100
+++ b/libraries/extrabtrace/group/extrabtrace.iby	Mon Oct 25 13:21:33 2010 +0100
@@ -14,7 +14,7 @@
 
 #include <fsh_config.iby>
 
-#ifdef FSHELL_TRACE_SUPPORT
+#ifdef FSHELL_EXTRABTRACE_SUPPORT
 
 FSHELL_EXECUTABLE_FILE(extrabtrace.dll)
 FSHELL_KERNEL_EXTENSION(extrabtracek.ldd)
diff -r 6bffbe8be665 -r 2f382fb2036c libraries/memoryaccess/MemoryAccess.cpp
--- a/libraries/memoryaccess/MemoryAccess.cpp	Mon Oct 25 10:37:01 2010 +0100
+++ b/libraries/memoryaccess/MemoryAccess.cpp	Mon Oct 25 13:21:33 2010 +0100
@@ -1775,7 +1775,7 @@
 		//Get the timer specific info
 		(*localInfoBuf)().iState = aTimer->iTimer.iState;
 		(*localInfoBuf)().iType = aTimer->iTimer.iType;
-#if FSHELL_PLATFORM_SYMTB >= 92 || FSHELL_PLATFORM_FOUNDATION >= 3
+#if FSHELL_PLATFORM_SYMTB >= 92 || FSHELL_PLATFORM_FOUNDATION >= 3 || (!defined(FSHELL_PLATFORM_FOUNDATION) && FSHELL_PLATFORM_S60 >= 5)
 		(*localInfoBuf)().iClientStatus = NULL; //TOMSCI TEMP
 #else
 		(*localInfoBuf)().iClientStatus = (TLinAddr)aTimer->iTimer.iStatus;
@@ -1841,7 +1841,7 @@
 		GetObjectInfo (aSession, (*localInfoBuf)());
 		//Get the session specific info
 		(*localInfoBuf)().iServer = (TUint8*)aSession->iServer;
-#if defined(FSHELL_PLATFORM_FOUNDATION) || defined(FSHELL_PLATFORM_SYMTB)
+#if defined(FSHELL_PLATFORM_FOUNDATION) || defined(FSHELL_PLATFORM_SYMTB) || FSHELL_PLATFORM_S60 >= 5
 		(*localInfoBuf)().iSessionPtr = (TAny*)aSession->iSessionCookie;
 #else
 		(*localInfoBuf)().iSessionPtr = (TAny*)aSession->iSessionPtr;