Mercurial Mercurial > oss > FCL > sf > os > fshell / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from SFTP.
authorTom Sutcliffe <thomas.sutcliffe@accenture.com>
Thu, 29 Jul 2010 19:16:52 +0100
changeset 20 75412e452636
parent 13 eb50996ae8a8 (diff)
parent 19 cb341c55f6e8 (current diff)
child 21 7b569e2061c7
Merge from SFTP. Removed the --diag-supress ifdef, as it was only due to me not being able to spell --diag_suppress! (which is supported on all versions of RVCT)
build/common/common.mmh file | annotate | diff | comparison | revisions
documentation/change_history.pod file | annotate | diff | comparison | revisions
documentation/common_mmh.pod file | annotate | diff | comparison | revisions
libraries/spcre/libpcre/group/libpcre.mmp file | annotate | diff | comparison | revisions 
--- a/build/common/common.mmh	Thu Jul 29 14:11:57 2010 +1000
+++ b/build/common/common.mmh	Thu Jul 29 19:16:52 2010 +0100
@@ -91,9 +91,6 @@
 #ifndef FSHELL_NO_SPCRE_SUPPORT
 #define FSHELL_SPCRE_SUPPORT
 #endif
-#ifndef FSHELL_NO_ARMCC_DIAG_SUPPRESS_SUPPORT
-#define FSHELL_ARMCC_DIAG_SUPPRESS_SUPPORT
-#endif
 
 //
 // PlatSec.
--- a/build/common/release.src	Thu Jul 29 14:11:57 2010 +1000
+++ b/build/common/release.src	Thu Jul 29 19:16:52 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 19:16:52 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 19:16:52 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 19:16:52 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	Thu Jul 29 14:11:57 2010 +1000
+++ b/commands/group/bld.inf	Thu Jul 29 19:16:52 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	Thu Jul 29 14:11:57 2010 +1000
+++ b/documentation/change_history.pod	Thu Jul 29 19:16:52 2010 +0100
@@ -24,15 +24,13 @@
 
 =item *
 
-More build fixes. Changed the documentation builder to automatically prepend C<%EPOCROOT%> (converted to a path relative form) to pre-processor include path options that start with F<epoc32>. Prevously C<$(EPOCROOT)> was prepended in the makefile, which broke the documentation build because the pre-processor will only accecpt relative path include options.
+More build fixes. Changed the documentation builder to automatically prepend C<%EPOCROOT%> (converted to a path relative form) to pre-processor include path options that start with F<epoc32>. Prevously C<$(EPOCROOT)> was prepended in the makefile, which broke the documentation build because the pre-processor will only accept relative path include options.
 
-=back
+=item *
 
-=head2 Release 000.3
+Added C<--codesegs> option to C<ps>.
 
-Build fixes.
-
-=head2 Release 000.2
+=head2 Release 000.2, 000.3
 
 Build fixes.
 
--- a/documentation/common_mmh.pod	Thu Jul 29 14:11:57 2010 +1000
+++ b/documentation/common_mmh.pod	Thu Jul 29 19:16:52 2010 +0100
@@ -218,10 +218,6 @@
 
 The TestExecute APIs are available.
 
-=item FSHELL_[NO_]ARMCC_DIAG_SUPPRESS_SUPPORT
-
-Defines whether ARM's RVCT compiler supports a C<--diag-supress> option (older versions appear not to), and hence whether fshell's build will try to use it.
-
 =back
 
 A couple of further macros follow - these are specifically for platforms that provide an custom implementation of the relevant command rather than using fshell's built-in version.
--- a/libraries/spcre/libpcre/group/libpcre.mmp	Thu Jul 29 14:11:57 2010 +1000
+++ b/libraries/spcre/libpcre/group/libpcre.mmp	Thu Jul 29 19:16:52 2010 +0100
@@ -63,10 +63,8 @@
 library         euser.lib
 library         estlib.lib
 
-#ifdef FSHELL_ARMCC_DIAG_SUPPRESS_SUPPORT
 // Remove some of the many warnings that armcc doesn't like
 // 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
-#endif
\ No newline at end of file
+option ARMCC --diag_suppress 1134,2874,546
FCL/sf/os/fshell