minor build tweaks.
--- a/build/s60/3rd_edition/platform.mmh Thu Oct 28 16:54:54 2010 +0100
+++ b/build/s60/3rd_edition/platform.mmh Thu Oct 28 21:02:49 2010 +0100
@@ -18,7 +18,7 @@
#define FSHELL_CORE_SUPPORT_USB_ICON "ACM::1"
-#define FSHELL_PERL_SUPPORT
+//#define FSHELL_PERL_SUPPORT
#define FSHELL_NO_BTRACE_SUPPORT
#define FSHELL_NO_DYNAMICDFC_SUPPORT
#define FSHELL_NO_PIPS_SUPPORT
--- a/build/s60/5th_edition/platform.mmh Thu Oct 28 16:54:54 2010 +0100
+++ b/build/s60/5th_edition/platform.mmh Thu Oct 28 21:02:49 2010 +0100
@@ -16,6 +16,7 @@
#include <fshell/platform_generic.mmh>
#endif
+#define FSHELL_CORE_SUPPORT_USB_ICON "ACM::1"
#define FSHELL_NO_PIPS_SUPPORT // [TomS:] Does 5th ed have pips?
#define FSHELL_NO_DOBJECTIX_SUPPORT
--- a/commands/fed/src/screenmngr.cpp Thu Oct 28 16:54:54 2010 +0100
+++ b/commands/fed/src/screenmngr.cpp Thu Oct 28 21:02:49 2010 +0100
@@ -17,7 +17,6 @@
const TInt KCmdWndMinHeight = 3;
const TInt KCmdWndMinWidth = 20;
-const TInt KRM = 1000; //const multiplication to avoid inexact calculations on small numbers
void CScreenManager::ResizeScreenL(const TWindow& aWindow)
{
--- a/commands/pubsub/pubsub.mmp Thu Oct 28 16:54:54 2010 +0100
+++ b/commands/pubsub/pubsub.mmp Thu Oct 28 21:02:49 2010 +0100
@@ -27,6 +27,8 @@
library iocli.lib
library QR3.lib
library ltkutils.lib
+
+#ifdef FSHELL_TRACE_SUPPORT
library btrace_parser.lib
FSHELL_TRACE_CONTROL_LIBRARY
-
+#endif
--- a/commands/wslog/wslog.cpp Thu Oct 28 16:54:54 2010 +0100
+++ b/commands/wslog/wslog.cpp Thu Oct 28 21:02:49 2010 +0100
@@ -118,14 +118,14 @@
if (BaflUtils::FileExists(FsL(), KCWsIniFile))
{
Printf(_L("C drive wsini log lines:\r\n"));
- CmdL(_L("fshell.exe"), _L("-e 'cat c:\\system\\data\\wsini.ini | grep LOG*'"));
+ CmdL(_L("fshell.exe"), _L("-e 'cat c:\\system\\data\\wsini.ini | match LOG*'"));
}
else
{
Printf(_L("(No C drive wsini)\r\n"));
}
Printf(_L("Z drive wsini log lines:\r\n"));
- CmdL(_L("fshell.exe"), _L("-e 'cat z:\\system\\data\\wsini.ini | grep LOG*'"));
+ CmdL(_L("fshell.exe"), _L("-e 'cat z:\\system\\data\\wsini.ini | match LOG*'"));
Printf(_L("Possible logging DLLs (none means logging probably not enabled):\r\n"));
CmdL(_L("kerninfo.exe"), _L("codeseg -m DLOG*"));
--- a/libraries/spcre/grep/Grep.cif Thu Oct 28 16:54:54 2010 +0100
+++ b/libraries/spcre/grep/Grep.cif Thu Oct 28 21:02:49 2010 +0100
@@ -49,63 +49,63 @@
The copyright notice for the PCRE library follows:
- Copyright (c) 1997-2008 University of Cambridge
+ Copyright (c) 1997-2008 University of Cambridge
- -----------------------------------------------------------------------------
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
+ -----------------------------------------------------------------------------
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
- * Neither the name of the University of Cambridge nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
+ * Neither the name of the University of Cambridge nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
- -----------------------------------------------------------------------------
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ -----------------------------------------------------------------------------
The copyright notice for the C++ wrappers to PCRE library follows:
- Copyright (c) 2005 - 2006, Google Inc.
- All rights reserved.
+ Copyright (c) 2005 - 2006, Google Inc.
+ All rights reserved.
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with the
- distribution.
- * Neither the name of Google Inc. nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following disclaimer
+ in the documentation and/or other materials provided with the
+ distribution.
+ * Neither the name of Google Inc. nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.