Added NCP platform. Build fixes.
authorTom Sutcliffe <thomas.sutcliffe@accenture.com>
Thu, 29 Jul 2010 18:50:12 +0100
changeset 13 eb50996ae8a8
parent 12 d0b16e01f384
child 20 75412e452636
Added NCP platform. Build fixes.
build/common/release.src
build/ncp/bld.inf
build/ncp/fshell_platform.iby
build/ncp/platform.mmh
commands/group/bld.inf
documentation/change_history.pod
libraries/spcre/bwins/spcreu.def
libraries/spcre/libpcre/group/libpcre.mmp
--- a/build/common/release.src	Wed Jul 28 18:43:53 2010 +0100
+++ b/build/common/release.src	Thu Jul 29 18:50:12 2010 +0100
@@ -2,10 +2,10 @@
 Joe Branton (joe.branton@accenture.com) or Tom Sutcliffe (thomas.sutcliffe@accenture.com)
 
 notesrc_release_reason
-See <a href="..\..\fshell/documentation\change_history.html">change history</a> for details of changes in this release.
+See <a href="../../documentation/fshell/change_history.html">change history</a> for details of changes in this release.
 
 notesrc_general_comments
-See this <a href="..\..\fshell/documentation\index.html">documentation</a> for installation and howto type information.
+See this <a href="../../documentation/fshell/index.html">documentation</a> for installation and howto type information.
 
 notesrc_known_deviations
 None known.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build/ncp/bld.inf	Thu Jul 29 18:50:12 2010 +0100
@@ -0,0 +1,26 @@
+// bld.inf
+// 
+// Copyright (c) 2010 Accenture. All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the "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:
+// Accenture - Initial contribution
+//
+PRJ_PLATFORMS
+WINSCW
+ARMV5
+ARMV5SMP
+
+#include "platform.mmh"
+#include "../common/common.mmh"
+
+PRJ_EXPORTS
+.\platform.mmh                /epoc32/include/fshell/platform.mmh
+FSHELL_ROM_INCLUDE2(platform.mmh, fshell\platform.mmh)
+FSHELL_ROM_INCLUDE(fshell_platform.iby)
+
+#include <../common/bld.inf>
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build/ncp/fshell_platform.iby	Thu Jul 29 18:50:12 2010 +0100
@@ -0,0 +1,28 @@
+// fshell_platform.iby
+// 
+// Copyright (c) 2010 Accenture. All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the "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:
+// Accenture - Initial contribution
+//
+#ifndef FSHELL_PLATFORM_IBY
+#define FSHELL_PLATFORM_IBY
+
+#ifdef FSHELL_MAKESIS
+
+;Unique Vendor Name
+:"Accenture"
+
+;localised vendor names 
+%{"Accenture"}
+
+HASH{"fshell (NCP)"},(FSHELL_UID_SIS),FSHELL_VERSION,0,FSHELL_TIMESTAMP,TYPE=SA
+
+#endif
+
+#endif // FSHELL_PLATFORM_IBY
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build/ncp/platform.mmh	Thu Jul 29 18:50:12 2010 +0100
@@ -0,0 +1,24 @@
+#ifndef FSHELL_PLATFORM_MMH
+#define FSHELL_PLATFORM_MMH
+
+#define FSHELL_CAP_ALL
+#define FSHELL_PROTECTED_UIDS
+
+#define FSHELL_PLATFORM_SYMTB 92
+
+#define FSHELL_NO_WSERV_SUPPORT
+#define FSHELL_NO_BLUETOOTH_SUPPORT
+#define FSHELL_NO_TELEPHONY_SUPPORT
+#define FSHELL_NO_AUDIO_SUPPORT
+#define FSHELL_NO_SQL_SUPPORT
+#define FSHELL_NO_PIPS_SUPPORT
+#define FSHELL_NO_LBS_SUPPORT
+#define FSHELL_NO_DOBJECTIX_SUPPORT
+#define FSHELL_NO_EGL_SUPPORT
+#define FSHELL_NO_OPENVG_SUPPORT
+#define FSHELL_NO_ANALYSEHEAP_SUPPORT
+#define FSHELL_NO_APPARC_SUPPORT
+#define FSHELL_FLEXIBLEMM_AWARE
+#define FSHELL_ARM11XX_SUPPORT
+
+#endif // FSHELL_PLATFORM_MMH
--- a/commands/group/bld.inf	Wed Jul 28 18:43:53 2010 +0100
+++ b/commands/group/bld.inf	Thu Jul 29 18:50:12 2010 +0100
@@ -448,7 +448,7 @@
 
 #ifdef FSHELL_TESTEXECUTE_SUPPORT
 PRJ_EXPORTS
-..\testexecute\testexecute.mmp
+..\testexecute\testexecute.cif           z:\resource\cif\fshell\testexecute.cif
 PRJ_MMPFILES
-..\testexecute\testexecute.cif           z:\resource\cif\fshell\testexecute.cif
+..\testexecute\testexecute.mmp
 #endif
--- a/documentation/change_history.pod	Wed Jul 28 18:43:53 2010 +0100
+++ b/documentation/change_history.pod	Thu Jul 29 18:50:12 2010 +0100
@@ -14,11 +14,11 @@
 
 =head1 FShell Change History
 
-=head2 Release 000.3
+=head2 Release 000.4
 
-Build fixes.
+Added C<--codesegs> option to C<ps>. Build fixes.
 
-=head2 Release 000.2
+=head2 Release 000.2, 000.3
 
 Build fixes.
 
--- a/libraries/spcre/bwins/spcreu.def	Wed Jul 28 18:43:53 2010 +0100
+++ b/libraries/spcre/bwins/spcreu.def	Thu Jul 29 18:50:12 2010 +0100
@@ -31,8 +31,8 @@
 	?FullMatchL@CRegEx@@QBEHABVTDesC8@@@Z @ 30 NONAME ; int CRegEx::FullMatchL(class TDesC8 const &) const
 	??0TRegExArg@@QAE@PAK@Z @ 31 NONAME ABSENT ; TRegExArg::TRegExArg(unsigned long *)
 	?PartialMatchL@CRegEx@@QBEHABVTDesC8@@ABVTRegExArg@@111@Z @ 32 NONAME ; int CRegEx::PartialMatchL(class TDesC8 const &, class TRegExArg const &, class TRegExArg const &, class TRegExArg const &, class TRegExArg const &) const
-	??0TRegExArg@@QAE@PAIP6AHABVTDesC8@@PAX@Z@Z @ 33 NONAME ; TRegExArg::TRegExArg(unsigned int *, int (*)(class TDesC8 const &, void *))
-	??0TRegExArg@@QAE@PANP6AHABVTDesC8@@PAX@Z@Z @ 34 NONAME ; TRegExArg::TRegExArg(double *, int (*)(class TDesC8 const &, void *))
+	??0TRegExArg@@QAE@PAIP6AHABVTDesC8@@PAX@Z@Z @ 33 NONAME ABSENT ; TRegExArg::TRegExArg(unsigned int *, int (*)(class TDesC8 const &, void *))
+	??0TRegExArg@@QAE@PANP6AHABVTDesC8@@PAX@Z@Z @ 34 NONAME ABSENT ; TRegExArg::TRegExArg(double *, int (*)(class TDesC8 const &, void *))
 	?ParseTReal64@TRegExArg@@CAHABVTDesC8@@PAX@Z @ 35 NONAME ; int TRegExArg::ParseTReal64(class TDesC8 const &, void *)
 	?ParseTUint16Octal@TRegExArg@@SAHABVTDesC8@@PAX@Z @ 36 NONAME ; int TRegExArg::ParseTUint16Octal(class TDesC8 const &, void *)
 	?PartialMatchL@CRegEx@@QBEHABVTDesC8@@ABVTRegExArg@@1@Z @ 37 NONAME ; int CRegEx::PartialMatchL(class TDesC8 const &, class TRegExArg const &, class TRegExArg const &) const
@@ -76,7 +76,7 @@
 	?ConsumeL@CRegEx@@QBEHAAVTDes8@@ABVTRegExArg@@@Z @ 75 NONAME ; int CRegEx::ConsumeL(class TDes8 &, class TRegExArg const &) const
 	?ParseTUint8Radix@TRegExArg@@CAHABVTDesC8@@PAXW4TRadix@@@Z @ 76 NONAME ; int TRegExArg::ParseTUint8Radix(class TDesC8 const &, void *, enum TRadix)
 	?ParseTUint32Hex@TRegExArg@@SAHABVTDesC8@@PAX@Z @ 77 NONAME ; int TRegExArg::ParseTUint32Hex(class TDesC8 const &, void *)
-	??0TRegExArg@@QAE@PAH@Z @ 78 NONAME ; TRegExArg::TRegExArg(int *)
+	??0TRegExArg@@QAE@PAH@Z @ 78 NONAME ABSENT ; TRegExArg::TRegExArg(int *)
 	?ConsumeL@CRegEx@@QBEHAAVTDes8@@@Z @ 79 NONAME ; int CRegEx::ConsumeL(class TDes8 &) const
 	?ParseTUint16Hex@TRegExArg@@SAHABVTDesC8@@PAX@Z @ 80 NONAME ; int TRegExArg::ParseTUint16Hex(class TDesC8 const &, void *)
 	??0TRegExArg@@QAE@PA_J@Z @ 81 NONAME ABSENT ; TRegExArg::TRegExArg(long long *)
--- a/libraries/spcre/libpcre/group/libpcre.mmp	Wed Jul 28 18:43:53 2010 +0100
+++ b/libraries/spcre/libpcre/group/libpcre.mmp	Thu Jul 29 18:50:12 2010 +0100
@@ -67,4 +67,4 @@
 // Warning:  #546-D: transfer of control bypasses initialization of:
 // Warning:  #1134-D: literal treated as "long long"
 // Warning: C2874W: othercase may be used before being set
-option ARMCC --diag-supress 1134,2874,546
+option ARMCC --diag_suppress 1134,2874,546