Tidied iocli exports, build macro tweaks.
Removed 4 overloads of CCommandBase::RunCommand[L] that are no longer used at all, and changed one more to not be exported as it's only used internally to iocli.dll.
fixed builds on platforms that don't support btrace or any form of tracing.
--- a/build/common/common.mmh Fri Jul 30 17:38:41 2010 +0100
+++ b/build/common/common.mmh Sat Jul 31 19:07:57 2010 +0100
@@ -156,9 +156,6 @@
// extrabtrace
//
-#ifdef FSHELL_CAP_ALL
-#define FSHELL_EXTRABTRACE_SUPPORT
-#endif
#if !defined(FSHELL_TRACE_SUPPORT) && defined(FSHELL_BTRACE_SUPPORT)
// FSHELL_TRACE_SUPPORT tells you that the BTraceX() functions are available, either via atrace or btrace,
@@ -166,6 +163,10 @@
#define FSHELL_TRACE_SUPPORT
#endif
+#if defined(FSHELL_TRACE_SUPPORT) && defined(FSHELL_CAP_ALL)
+#define FSHELL_EXTRABTRACE_SUPPORT
+#endif
+
// The FSHELL_TRACE_xyz macros must appear before any other systeminclude/#include/library statements in your MMP.
#ifndef FSHELL_TRACE_LIBRARY
#define FSHELL_D32BTRACE_HEADER <d32btrace.h>
--- a/build/s60/platform_generic.mmh Fri Jul 30 17:38:41 2010 +0100
+++ b/build/s60/platform_generic.mmh Sat Jul 31 19:07:57 2010 +0100
@@ -31,6 +31,4 @@
#define SYMBIAN_JAVA_NOT_INCLUDED
#endif
-#define FSHELL_TESTEXECUTE_SUPPORT
-
#endif // FSHELL_PLATFORM_GENERIC_MMH
--- a/build/s60/tb92/platform.mmh Fri Jul 30 17:38:41 2010 +0100
+++ b/build/s60/tb92/platform.mmh Sat Jul 31 19:07:57 2010 +0100
@@ -28,4 +28,6 @@
#define FSHELL_ARM11XX_SUPPORT
#define FSHELL_DYNAMICSTARTUP_SUPPORT
+#define FSHELL_TESTEXECUTE_SUPPORT
+
#endif // FSHELL_PLATFORM_MMH
--- a/libraries/btrace_parser/group/bld.inf Fri Jul 30 17:38:41 2010 +0100
+++ b/libraries/btrace_parser/group/bld.inf Sat Jul 31 19:07:57 2010 +0100
@@ -17,6 +17,8 @@
FSHELL_ROM_INCLUDE(btrace_parser.iby)
+#ifdef FSHELL_TRACE_SUPPORT
+
..\inc\btrace_parser.h fshell/btrace_parser.h
..\inc\btrace_parser_defs.h fshell/btrace_parser_defs.h
@@ -24,3 +26,4 @@
..\src\btrace_parser.mmp
+#endif
--- a/libraries/btrace_parser/group/btrace_parser.iby Fri Jul 30 17:38:41 2010 +0100
+++ b/libraries/btrace_parser/group/btrace_parser.iby Sat Jul 31 19:07:57 2010 +0100
@@ -12,6 +12,8 @@
#ifndef BTRACE_PARSER_IBY
#define BTRACE_PARSER_IBY
+#ifdef FSHELL_TRACE_SUPPORT
FSHELL_EXECUTABLE_FILE(btrace_parser.dll)
+#endif
#endif // BTRACE_PARSER_IBY
--- a/libraries/extrabtrace/group/bld.inf Fri Jul 30 17:38:41 2010 +0100
+++ b/libraries/extrabtrace/group/bld.inf Sat Jul 31 19:07:57 2010 +0100
@@ -17,6 +17,8 @@
FSHELL_ROM_INCLUDE(extrabtrace.iby)
+#ifdef FSHELL_EXTRABTRACE_SUPPORT
+
..\inc\extrabtrace.h \epoc32\include\fshell\extrabtrace.h
..\inc\extrabtracek.h \epoc32\include\fshell\extrabtracek.h
@@ -24,3 +26,5 @@
extrabtrace.mmp
extrabtracek.mmp
+
+#endif
--- a/libraries/extrabtrace/group/extrabtrace.iby Fri Jul 30 17:38:41 2010 +0100
+++ b/libraries/extrabtrace/group/extrabtrace.iby Sat Jul 31 19:07:57 2010 +0100
@@ -14,7 +14,11 @@
#include <fsh_config.iby>
+#ifdef FSHELL_TRACE_SUPPORT
+
FSHELL_EXECUTABLE_FILE(extrabtrace.dll)
FSHELL_KERNEL_EXTENSION(extrabtracek.ldd)
+#endif
+
#endif // EXTRABTRACE_IBY
--- a/libraries/iosrv/bwins/iocliu.def Fri Jul 30 17:38:41 2010 +0100
+++ b/libraries/iosrv/bwins/iocliu.def Sat Jul 31 19:07:57 2010 +0100
@@ -332,11 +332,11 @@
?Reset@CTextBuffer@IoUtils@@UAEXXZ @ 331 NONAME ; void IoUtils::CTextBuffer::Reset(void)
?Reset@CTextFormatter@IoUtils@@UAEXXZ @ 332 NONAME ; void IoUtils::CTextFormatter::Reset(void)
?Run@RChildProcess@IoUtils@@QAEXAAVTRequestStatus@@@Z @ 333 NONAME ; void IoUtils::RChildProcess::Run(class TRequestStatus &)
- ?RunCommand@CCommandBase@IoUtils@@QAEHAAVRIoSession@@AAVRIoReadHandle@@AAVRIoWriteHandle@@2PBVTDesC16@@PAVCEnvironment@2@@Z @ 334 NONAME ; int IoUtils::CCommandBase::RunCommand(class RIoSession &, class RIoReadHandle &, class RIoWriteHandle &, class RIoWriteHandle &, class TDesC16 const *, class IoUtils::CEnvironment *)
- ?RunCommand@CCommandBase@IoUtils@@QAEHPBVTDesC16@@PAVCEnvironment@2@@Z @ 335 NONAME ; int IoUtils::CCommandBase::RunCommand(class TDesC16 const *, class IoUtils::CEnvironment *)
- ?RunCommand@CCommandBase@IoUtils@@QAEHXZ @ 336 NONAME ; int IoUtils::CCommandBase::RunCommand(void)
- ?RunCommand@CCommandBase@IoUtils@@QAEXAAVRIoSession@@AAVRIoReadHandle@@AAVRIoWriteHandle@@2PBVTDesC16@@PAVCEnvironment@2@PAVMCommandBaseObserver@2@@Z @ 337 NONAME ; void IoUtils::CCommandBase::RunCommand(class RIoSession &, class RIoReadHandle &, class RIoWriteHandle &, class RIoWriteHandle &, class TDesC16 const *, class IoUtils::CEnvironment *, class IoUtils::MCommandBaseObserver *)
- ?RunCommandL@CCommandBase@IoUtils@@QAEXAAVRIoSession@@AAVRIoReadHandle@@AAVRIoWriteHandle@@2PBVTDesC16@@PAVCEnvironment@2@@Z @ 338 NONAME ; void IoUtils::CCommandBase::RunCommandL(class RIoSession &, class RIoReadHandle &, class RIoWriteHandle &, class RIoWriteHandle &, class TDesC16 const *, class IoUtils::CEnvironment *)
+ ?RunCommand@CCommandBase@IoUtils@@QAEHAAVRIoSession@@AAVRIoReadHandle@@AAVRIoWriteHandle@@2PBVTDesC16@@PAVCEnvironment@2@@Z @ 334 NONAME ABSENT ; int IoUtils::CCommandBase::RunCommand(class RIoSession &, class RIoReadHandle &, class RIoWriteHandle &, class RIoWriteHandle &, class TDesC16 const *, class IoUtils::CEnvironment *)
+ ?RunCommand@CCommandBase@IoUtils@@QAEHPBVTDesC16@@PAVCEnvironment@2@@Z @ 335 NONAME ABSENT ; int IoUtils::CCommandBase::RunCommand(class TDesC16 const *, class IoUtils::CEnvironment *)
+ ?RunCommand@CCommandBase@IoUtils@@QAEHXZ @ 336 NONAME ABSENT ; int IoUtils::CCommandBase::RunCommand(void)
+ ?RunCommand@CCommandBase@IoUtils@@QAEXAAVRIoSession@@AAVRIoReadHandle@@AAVRIoWriteHandle@@2PBVTDesC16@@PAVCEnvironment@2@PAVMCommandBaseObserver@2@@Z @ 337 NONAME ABSENT ; void IoUtils::CCommandBase::RunCommand(class RIoSession &, class RIoReadHandle &, class RIoWriteHandle &, class RIoWriteHandle &, class TDesC16 const *, class IoUtils::CEnvironment *, class IoUtils::MCommandBaseObserver *)
+ ?RunCommandL@CCommandBase@IoUtils@@QAEXAAVRIoSession@@AAVRIoReadHandle@@AAVRIoWriteHandle@@2PBVTDesC16@@PAVCEnvironment@2@@Z @ 338 NONAME ABSENT ; void IoUtils::CCommandBase::RunCommandL(class RIoSession &, class RIoReadHandle &, class RIoWriteHandle &, class RIoWriteHandle &, class TDesC16 const *, class IoUtils::CEnvironment *)
?RunCommandL@CCommandBase@IoUtils@@QAEXPBVTDesC16@@PAVCEnvironment@2@@Z @ 339 NONAME ; void IoUtils::CCommandBase::RunCommandL(class TDesC16 const *, class IoUtils::CEnvironment *)
?RunCommandL@CCommandBase@IoUtils@@QAEXXZ @ 340 NONAME ; void IoUtils::CCommandBase::RunCommandL(void)
?RunError@CCommandBase@IoUtils@@MAEHH@Z @ 341 NONAME ; int IoUtils::CCommandBase::RunError(int)
--- a/libraries/iosrv/client/command_base.cpp Fri Jul 30 17:38:41 2010 +0100
+++ b/libraries/iosrv/client/command_base.cpp Sat Jul 31 19:07:57 2010 +0100
@@ -1274,23 +1274,11 @@
// CCommandBase.
//
-EXPORT_C TInt CCommandBase::RunCommand()
- {
- TRAPD(err, RunCommandL());
- return err;
- }
-
EXPORT_C void CCommandBase::RunCommandL()
{
RunCommandL(NULL, NULL);
}
-EXPORT_C TInt CCommandBase::RunCommand(const TDesC* aCommandLine, CEnvironment* aEnv)
- {
- TRAPD(err, RunCommandL(aCommandLine, aEnv));
- return err;
- }
-
NONSHARABLE_CLASS(TExitController) : public MCommandBaseObserver
{
public:
@@ -1516,27 +1504,7 @@
}
}
-EXPORT_C TInt CCommandBase::RunCommand(RIoSession& aIoSession, RIoReadHandle& aStdin, RIoWriteHandle& aStdout, RIoWriteHandle& aStderr, const TDesC* aCommandLine, CEnvironment* aEnv)
- {
- TExitController exitController;
- RunCommand(aIoSession, aStdin, aStdout, aStderr, aCommandLine, aEnv, &exitController);
- if (exitController.IsComplete())
- {
- return exitController.CompletionError();
- }
- else
- {
- exitController.WaitForCompletion();
- return exitController.CompletionError();
- }
- }
-
-EXPORT_C void CCommandBase::RunCommandL(RIoSession& aIoSession, RIoReadHandle& aStdin, RIoWriteHandle& aStdout, RIoWriteHandle& aStderr, const TDesC* aCommandLine, CEnvironment* aEnv)
- {
- User::LeaveIfError(RunCommand(aIoSession, aStdin, aStdout, aStderr, aCommandLine, aEnv));
- }
-
-EXPORT_C void CCommandBase::RunCommand(RIoSession& aIoSession, RIoReadHandle& aStdin, RIoWriteHandle& aStdout, RIoWriteHandle& aStderr, const TDesC* aCommandLine, CEnvironment* aEnv, MCommandBaseObserver* aObserver)
+void CCommandBase::RunCommand(RIoSession& aIoSession, RIoReadHandle& aStdin, RIoWriteHandle& aStdout, RIoWriteHandle& aStderr, const TDesC* aCommandLine, CEnvironment* aEnv, MCommandBaseObserver* aObserver)
{
TRAPD(err, RunCommandL(aIoSession, aStdin, aStdout, aStderr, aCommandLine, aEnv, aObserver));
if (err)
--- a/libraries/iosrv/eabi/iocliu.def Fri Jul 30 17:38:41 2010 +0100
+++ b/libraries/iosrv/eabi/iocliu.def Sat Jul 31 19:07:57 2010 +0100
@@ -187,14 +187,14 @@
_ZN7IoUtils12CCommandBase10Extension_EjRPvS1_ @ 186 NONAME
_ZN7IoUtils12CCommandBase10HaveStaticEv @ 187 NONAME
_ZN7IoUtils12CCommandBase10PrintErrorEi11TRefByValueIK7TDesC16Ez @ 188 NONAME
- _ZN7IoUtils12CCommandBase10RunCommandEPK7TDesC16PNS_12CEnvironmentE @ 189 NONAME
- _ZN7IoUtils12CCommandBase10RunCommandER10RIoSessionR13RIoReadHandleR14RIoWriteHandleS6_PK7TDesC16PNS_12CEnvironmentE @ 190 NONAME
- _ZN7IoUtils12CCommandBase10RunCommandER10RIoSessionR13RIoReadHandleR14RIoWriteHandleS6_PK7TDesC16PNS_12CEnvironmentEPNS_20MCommandBaseObserverE @ 191 NONAME
- _ZN7IoUtils12CCommandBase10RunCommandEv @ 192 NONAME
+ _ZN7IoUtils12CCommandBase10RunCommandEPK7TDesC16PNS_12CEnvironmentE @ 189 NONAME ABSENT
+ _ZN7IoUtils12CCommandBase10RunCommandER10RIoSessionR13RIoReadHandleR14RIoWriteHandleS6_PK7TDesC16PNS_12CEnvironmentE @ 190 NONAME ABSENT
+ _ZN7IoUtils12CCommandBase10RunCommandER10RIoSessionR13RIoReadHandleR14RIoWriteHandleS6_PK7TDesC16PNS_12CEnvironmentEPNS_20MCommandBaseObserverE @ 191 NONAME ABSENT
+ _ZN7IoUtils12CCommandBase10RunCommandEv @ 192 NONAME ABSENT
_ZN7IoUtils12CCommandBase11DisplayHelpEv @ 193 NONAME
_ZN7IoUtils12CCommandBase11HandleLeaveEi @ 194 NONAME
_ZN7IoUtils12CCommandBase11RunCommandLEPK7TDesC16PNS_12CEnvironmentE @ 195 NONAME
- _ZN7IoUtils12CCommandBase11RunCommandLER10RIoSessionR13RIoReadHandleR14RIoWriteHandleS6_PK7TDesC16PNS_12CEnvironmentE @ 196 NONAME
+ _ZN7IoUtils12CCommandBase11RunCommandLER10RIoSessionR13RIoReadHandleR14RIoWriteHandleS6_PK7TDesC16PNS_12CEnvironmentE @ 196 NONAME ABSENT
_ZN7IoUtils12CCommandBase11RunCommandLEv @ 197 NONAME
_ZN7IoUtils12CCommandBase11StdinChangeEj @ 198 NONAME
_ZN7IoUtils12CCommandBase12GetHelpTextLEv @ 199 NONAME
--- a/libraries/iosrv/inc/ioutils.h Fri Jul 30 17:38:41 2010 +0100
+++ b/libraries/iosrv/inc/ioutils.h Sat Jul 31 19:07:57 2010 +0100
@@ -666,13 +666,9 @@
};
public:
IMPORT_C ~CCommandBase();
- IMPORT_C TInt RunCommand();
IMPORT_C void RunCommandL();
- IMPORT_C TInt RunCommand(const TDesC* aCommandLine, CEnvironment* aEnv);
IMPORT_C void RunCommandL(const TDesC* aCommandLine, CEnvironment* aEnv);
- IMPORT_C TInt RunCommand(RIoSession& aIoSession, RIoReadHandle& aStdin, RIoWriteHandle& aStdout, RIoWriteHandle& aStderr, const TDesC* aCommandLine, CEnvironment* aEnv);
- IMPORT_C void RunCommandL(RIoSession& aIoSession, RIoReadHandle& aStdin, RIoWriteHandle& aStdout, RIoWriteHandle& aStderr, const TDesC* aCommandLine, CEnvironment* aEnv);
- IMPORT_C void RunCommand(RIoSession& aIoSession, RIoReadHandle& aStdin, RIoWriteHandle& aStdout, RIoWriteHandle& aStderr, const TDesC* aCommandLine, CEnvironment* aEnv, MCommandBaseObserver* aObserver);
+ void RunCommand(RIoSession& aIoSession, RIoReadHandle& aStdin, RIoWriteHandle& aStdout, RIoWriteHandle& aStderr, const TDesC* aCommandLine, CEnvironment* aEnv, MCommandBaseObserver* aObserver);
IMPORT_C TUint Flags() const;
IMPORT_C void SetFlags(TUint aFlags);
IMPORT_C const RFs& Fs() const;