# HG changeset patch
# User Tom Sutcliffe <thomas.sutcliffe@accenture.com>
# Date 1283036961 -3600
# Node ID 54effef9f73df6e37dcefb61ef3c3814a4708cd2
# Parent  4df672617228c7023a9bab6815596618c353931a
Fixed the new definition of FSHELL_REPLACE_ECONS

diff -r 4df672617228 -r 54effef9f73d build/common/fsh_rombuild_defs.iby
--- a/build/common/fsh_rombuild_defs.iby	Sat Aug 28 17:51:00 2010 +0100
+++ b/build/common/fsh_rombuild_defs.iby	Sun Aug 29 00:09:21 2010 +0100
@@ -22,7 +22,7 @@
 
 #define FSHELL_DATA_FILE(fileNameFrom, fileNameTo) data=##fileNameFrom fileNameTo
 #define FSHELL_EXECUTABLE_FILE(fileName) file=\epoc32\release\##MAIN##\##BUILD##\##fileName sys\bin\##fileName
-#define FSHELL_EXECUTABLE_AS_DATA(fileNameFrom, fileNameTo) data=\epoc32\release\##MAIN##\##BUILD##\fileNameFrom sys\bin\fileNameTo
+#define FSHELL_EXECUTABLE_AS_DATA(fileNameFrom, fileNameTo) data=\epoc32\release\##MAIN##\##BUILD##\fileNameFrom sys\bin\##fileNameTo
 #define FSHELL_DEBUG_EXECUTABLE_FILE(fileName) file=\epoc32\release\##MAIN##\##BUILD##\##fileName sys\bin\##fileName
 #define FSHELL_RENAMED_EXECUTABLE_FILE(fileNameFrom, fileNameTo) file=\epoc32\release\##MAIN##\##BUILD##\##fileNameFrom sys\bin\##fileNameTo
 #define FSHELL_DEBUG_RENAMED_EXECUTABLE_FILE(fileNameFrom, fileNameTo) file=\epoc32\release\##MAIN##\##BUILD##\##fileNameFrom sys\bin\##fileNameTo
@@ -46,7 +46,7 @@
 
 #define FSHELL_DATA_FILE(fileNameFrom, fileNameTo) data=##fileNameFrom fileNameTo
 #define FSHELL_EXECUTABLE_FILE(fileName) file=##ABI_DIR##\##DEBUG_DIR##\##fileName sys\bin\##fileName
-#define FSHELL_EXECUTABLE_AS_DATA(fileNameFrom, fileNameTo) file=##ABI_DIR##\##DEBUG_DIR##\fileNameFrom sys\bin\fileNameTo
+#define FSHELL_EXECUTABLE_AS_DATA(fileNameFrom, fileNameTo) file=##ABI_DIR##\##DEBUG_DIR##\fileNameFrom sys\bin\##fileNameTo
 #define FSHELL_DEBUG_EXECUTABLE_FILE(fileName) file=##ABI_DIR##\##DEBUG_DIR##\##fileName sys\bin\##fileName
 #define FSHELL_RENAMED_EXECUTABLE_FILE(fileNameFrom, fileNameTo) file=##ABI_DIR##\##BUILD_DIR\##fileNameFrom sys\bin\##fileNameTo
 #define FSHELL_DEBUG_RENAMED_EXECUTABLE_FILE(fileNameFrom, fileNameTo) file=##ABI_DIR##\##DEBUG_DIR\##fileNameFrom sys\bin\##fileNameTo
diff -r 4df672617228 -r 54effef9f73d build/sf/3tshell/fshell_platform.iby
--- a/build/sf/3tshell/fshell_platform.iby	Sat Aug 28 17:51:00 2010 +0100
+++ b/build/sf/3tshell/fshell_platform.iby	Sun Aug 29 00:09:21 2010 +0100
@@ -21,6 +21,8 @@
 
 #else
 
+#define FSHELL_REPLACE_ECONS
+
 // The minimum that fshell requires to rombuild successfully
 
 // Don't ask me...
diff -r 4df672617228 -r 54effef9f73d core/group/fshell_core.iby
--- a/core/group/fshell_core.iby	Sat Aug 28 17:51:00 2010 +0100
+++ b/core/group/fshell_core.iby	Sun Aug 29 00:09:21 2010 +0100
@@ -170,19 +170,16 @@
 #endif
 
 #ifdef FSHELL_REPLACE_ECONS
-//FSHELL_RENAMED_EXECUTABLE_FILE(iocons.dll, econs.dll)
-// New method that doesn't involve removing other occurences of econs.dll from your IBYs. See TODO
-FSHELL_EXECUTABLE_AS_DATA(iocons.dll, iocons.dll)
+FSHELL_EXECUTABLE_AS_DATA(iocons.dll,iocons.dll)
 
 #ifdef FSHELL_USE_BLUETOOTH_CONSOLE
-FSHELL_DATA_FILE(ZSYSTEM\console\iosrv.ini.bluetooth, system\console\iosrv.ini)
+FSHELL_DATA_FILE(ZSYSTEM\console\iosrv.ini.bluetooth,system\console\iosrv.ini)
 #else
-//TomS: I don't think this should be here any more - the VT100 consoles don't need it and I get by quite happily without it
-//FSHELL_DATA_FILE(ZSYSTEM\console\iosrv.ini.econs_fb, system\console\iosrv.ini)
+FSHELL_DATA_FILE(ZSYSTEM\console\iosrv.ini.econs_fb,system\console\iosrv.ini)
 #ifdef FSHELL_WSERV_SUPPORT
-FSHELL_RENAMED_EXECUTABLE_FILE(econseik.dll, econs_fb.dll)
+FSHELL_RENAMED_EXECUTABLE_FILE(econseik.dll,econs_fb.dll)
 #else
-FSHELL_RENAMED_EXECUTABLE_FILE(econs.dll, econs_fb.dll)
+FSHELL_RENAMED_EXECUTABLE_FILE(econs.dll,econs_fb.dll)
 #endif
 #endif // FSHELL_USE_BLUETOOTH_CONSOLE