FCL/interim/sftools/linux_build: cross-plat-dev-utils/patch-files/diffs/patch-0f5e3a7fb6af.patch@787612182dd0 (annotated)

2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1	## diff generated by diff_upstream.pl
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/checklib/library/library.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/library/library.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/checklib/library/library.cpp 2010-05-10 19:22:09.012618252 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	4	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/library/library.cpp 2010-05-08 15:37:06.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	5	@@ -25,6 +25,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	6	#include <iostream>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	7	#include <iomanip>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	8	#include <cstdlib>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	9	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	10
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	11	namespace
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	12	{
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	13	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/checklib/main.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/main.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	14	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/checklib/main.cpp 2010-05-10 19:22:09.012618252 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	15	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/main.cpp 2010-05-08 15:36:26.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	16	@@ -22,6 +22,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	17	#include <sstream>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	18	#include <iostream>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	19	#include <stdexcept>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	20	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	21
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	22
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	23	const char SELF_NAME[] = "checklib";
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	24	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/checklib/object/coff_object.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/object/coff_object.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	25	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/checklib/object/coff_object.cpp 2010-05-10 19:22:09.012618252 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	26	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/object/coff_object.cpp 2010-05-08 15:38:08.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	27	@@ -21,6 +21,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	28
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	29	#include <algorithm>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	30	#include <functional>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	31	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	32
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	33	Coff_object::Coff_object(const char* p1, const char* p2)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	34	{
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	35	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/checklib/object/elf_object.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/object/elf_object.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	36	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/checklib/object/elf_object.cpp 2010-05-10 19:22:09.016622392 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	37	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/checklib/object/elf_object.cpp 2010-05-08 15:37:34.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	38	@@ -22,6 +22,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	39
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	40	#include <algorithm>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	41	#include <functional>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	42	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	43
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	44	Elf_object::Elf_object(const char* p1, const char* p2)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	45	{
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	46	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/localise.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/localise.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	47	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/localise.cpp 2010-05-10 19:22:09.052619146 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	48	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/localise.cpp 2010-05-08 15:38:52.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	49	@@ -27,9 +27,11 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	50	#pragma warning( disable : 4530 ) // function not inlined.
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	51	#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	52
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	53	-#include <stdio.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	54	+#include <cstdio>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	55	#include <iostream>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	56	#include "ERRORHAN.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	57	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	58	+#include <cstdlib>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	59
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	60	#if defined(__MSVCDOTNET__) \|\| defined(__TOOLS2__)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	61	using std::ifstream;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	62	@@ -1787,8 +1789,16 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	63	const char * fileName = SourceFileName.GetAssertedNonEmptyBuffer();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	64	ifstream iFile(fileName);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	65
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	66	+#ifdef __LINUX__
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	67	+ char LocalisationOutputFileName[sizeof("/tmp/rcomp_temp_XXXXXX")];
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	68	+ strcpy(LocalisationOutputFileName,"/tmp/rcomp_temp_XXXXXX");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	69	+ int fd = mkstemp(LocalisationOutputFileName); close(fd);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	70	+#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	71	+#ifdef WIN32
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	72	char * LocalisationOutputFileName;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	73	LocalisationOutputFileName = tmpnam(NULL);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	74	+#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	75	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	76	ofstream outputFile(LocalisationOutputFileName);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	77
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	78	String fileLine("");
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	79	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/rcomp.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/rcomp.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	80	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/rcomp.cpp 2010-05-10 19:22:09.056620563 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	81	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/rcomp.cpp 2010-05-08 15:41:18.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	82	@@ -90,8 +90,8 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	83	#pragma warning( disable : 4244 ) // C4244: '=' : conversion from 'int' to 'short', possible loss of data
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	84	#endif //__VC32__
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	85
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	86	-#include "resource.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	87	-#include "parser.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	88	+#include "RESOURCE.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	89	+#include "Parser.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	90
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	91	int yylex();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	92	void yyerror(const char* string, ...);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	93	@@ -100,14 +100,14 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	94	extern int yylineno;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	95
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	96	#include "rcomp.hpp"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	97	-#include "datatype.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	98	-#include "mem.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	99	-#include "rcbinstr.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	100	-#include "rcscan.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	101	-#include "errorhan.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	102	-#include "fileacc.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	103	-#include "version.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	104	-#include "ctable.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	105	+#include "DATATYPE.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	106	+#include "MEM.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	107	+#include "RCBINSTR.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	108	+#include "RCSCAN.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	109	+#include "ERRORHAN.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	110	+#include "FILEACC.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	111	+#include "VERSION.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	112	+#include "CTABLE.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	113	#include "localise.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	114	#include "main.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	115
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	116	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/rcompl.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/rcompl.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	117	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/rcompl.cpp 2010-05-10 19:22:09.056620563 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	118	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/rcompl.cpp 2010-05-08 15:40:00.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	119	@@ -662,8 +662,8 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	120	#include <limits.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	121	#include <string.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	122	#include "main.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	123	-#include "structst.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	124	-#include "parser.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	125	+#include "STRUCTST.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	126	+#include "Parser.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	127	#include "localise.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	128
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	129	#define YY_SKIP_YYWRAP 1
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	130	@@ -696,7 +696,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	131	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	132
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	133	#include "rcomp.hpp"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	134	-#include "fileline.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	135	+#include "FILELINE.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	136
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	137	#define VALUE_LEN (1024*8) // must match sizeof(YYSTYPE.Value)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	138	char buf[VALUE_LEN];
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	139	@@ -734,7 +734,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	140	#pragma warning( disable : 4505 )
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	141	#endif //__VC32__
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	142
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	143	-#include "errorhan.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	144	+#include "ERRORHAN.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	145
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	146	#define REGISTER_LINE ErrorHandler::Register(pFileLineHandler->GetCurrentFile(), pFileLineHandler->GetErrorLine(* pCurrentLineNumber))
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	147
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	148	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/RCOMP.LEX /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/RCOMP.LEX
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	149	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/RCOMP.LEX 2010-05-10 19:22:09.048617870 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	150	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/RCOMP.LEX 2010-05-08 15:45:48.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	151	@@ -20,9 +20,9 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	152	#include <limits.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	153	#include <string.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	154	#include "main.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	155	-#include "structst.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	156	-#include "parser.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	157	-#include "localise.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	158	+#include "STRUCTST.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	159	+#include "PARSER.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	160	+#include "LOCALISE.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	161
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	162	#define YY_SKIP_YYWRAP 1
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	163	#define YY_NEVER_INTERACTIVE 1
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	164	@@ -92,7 +92,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	165	#pragma warning( disable : 4505 )
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	166	#endif //__VC32__
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	167
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	168	-#include "errorhan.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	169	+#include "ERRORHAN.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	170
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	171	#define REGISTER_LINE ErrorHandler::Register(pFileLineHandler->GetCurrentFile(), pFileLineHandler->GetErrorLine(* pCurrentLineNumber))
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	172
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	173	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/RCOMP.YACC /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/RCOMP.YACC
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	174	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/RCOMP.YACC 2010-05-10 19:22:09.048617870 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	175	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/bintools/rcomp/src/RCOMP.YACC 2010-05-08 15:47:00.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	176	@@ -35,8 +35,8 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	177	#pragma warning( disable : 4244 ) // C4244: '=' : conversion from 'int' to 'short', possible loss of data
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	178	#endif //__VC32__
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	179
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	180	-#include "resource.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	181	-#include "parser.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	182	+#include "RESOURCE.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	183	+#include "PARSER.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	184
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	185	int yylex();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	186	void yyerror(const char* string, ...);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	187	@@ -45,14 +45,14 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	188	extern int yylineno;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	189
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	190	#include "rcomp.hpp"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	191	-#include "datatype.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	192	-#include "mem.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	193	-#include "rcbinstr.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	194	-#include "rcscan.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	195	-#include "errorhan.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	196	-#include "fileacc.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	197	-#include "version.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	198	-#include "ctable.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	199	+#include "DATATYPE.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	200	+#include "MEM.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	201	+#include "RCBINSTR.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	202	+#include "RSCAN.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	203	+#include "ERRORHAN.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	204	+#include "FILEACC.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	205	+#include "VERSION.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	206	+#include "CTABLE.H"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	207	#include "localise.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	208	#include "main.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	209
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	210	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/buildtoolguides/romtoolsguide/group/bld.inf /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/buildtoolguides/romtoolsguide/group/bld.inf
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	211	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/buildtoolguides/romtoolsguide/group/bld.inf 2010-05-10 19:22:12.052626200 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	212	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/buildtoolguides/romtoolsguide/group/bld.inf 2010-05-08 15:41:44.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	213	@@ -1,3 +1,3 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	214
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	215	PRJ_EXPORTS
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	216	-../com.nokia.rombuild_0.1.jar /plugins/com.nokia.rombuild_0.1.jar
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	217	\ No newline at end of file
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	218	+../com.nokia.rombuild_0.1.jar ../../plugins/com.nokia.rombuild_0.1.jar
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	219	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/buildtoolguides/sbsv2guide/group/bld.inf /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/buildtoolguides/sbsv2guide/group/bld.inf
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	220	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/buildtoolguides/sbsv2guide/group/bld.inf 2010-05-10 19:22:12.056620772 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	221	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/buildtoolguides/sbsv2guide/group/bld.inf 2010-05-08 15:42:04.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	222	@@ -1,3 +1,3 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	223
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	224	PRJ_EXPORTS
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	225	-../com.nokia.sysbuild_0.1.jar /plugins/com.nokia.sysbuild_0.1.jar
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	226	\ No newline at end of file
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	227	+../com.nokia.sysbuild_0.1.jar ../../plugins/com.nokia.sysbuild_0.1.jar
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	228	Only in /home/imk/symbian/epocroot-pdk-3.0.h/linux_build: deleteme.txt
787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	229	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/e32lib/e32image/deflate/deflate.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/e32lib/e32image/deflate/deflate.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	230	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/e32lib/e32image/deflate/deflate.cpp 2010-05-10 19:22:12.064620322 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	231	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/e32lib/e32image/deflate/deflate.cpp 2010-05-08 14:35:02.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	232	@@ -87,7 +87,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	233
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	234	inline HDeflateHash* HDeflateHash::NewLC(TInt aLinks)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	235	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	236	- return new(HMem::Alloc(0,_FOFF(HDeflateHash,iOffset[Min(aLinks,KDeflateMaxDistance)]))) HDeflateHash;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	237	+ return new(HMem::Alloc(0,_FOFF(HDeflateHash,iOffset[0]) + (sizeof(TOffset) * Min(aLinks,KDeflateMaxDistance)))) HDeflateHash;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	238	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	239
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	240	inline TInt HDeflateHash::Hash(const TUint8* aPtr)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	241	Only in /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/e32lib/e32image: Makefile.elftran.bak
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	242	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/e32lib/group/seclib.mmp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/e32lib/group/seclib.mmp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	243	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/e32lib/group/seclib.mmp 2010-05-10 19:22:12.068618177 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	244	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/e32lib/group/seclib.mmp 2010-05-08 14:34:04.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	245	@@ -45,8 +45,11 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	246	userinclude ../setcap
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	247	userinclude ../../e32lib/e32image/inc
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	248	systeminclude /epoc32/include
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	249	+systeminclude /epoc32/include/platform
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	250
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	251	OPTION GCC -w
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	252	+option GCC -w
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	253	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	254
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	255	//macro __PLACEMENT_NEW_INLINE
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	256	//macro __PLACEMENT_VEC_NEW_INLINE
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	257	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/group/elf2e32.mmp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/group/elf2e32.mmp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	258	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/group/elf2e32.mmp 2010-05-10 19:22:12.072624202 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	259	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/group/elf2e32.mmp 2010-05-08 14:17:32.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	260	@@ -28,7 +28,9 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	261	source byte_pair.cpp pagedcompress.cpp checksum.cpp stdexe_target.cpp
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	262
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	263	systeminclude /epoc32/include /epoc32/include/tools
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	264	+systeminclude /epoc32/include/platform
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	265	userinclude ../source ../include
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	266	+userinclude ../../../bintools/elftools/inc
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	267
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	268	option GCC -w
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	269
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	270	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/deffile.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/deffile.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	271	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/deffile.cpp 2010-05-10 19:22:12.072624202 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	272	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/deffile.cpp 2010-05-08 14:31:46.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	273	@@ -18,9 +18,11 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	274	//
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	275
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	276	//
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	277	-#include <stdio.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	278	+#include <cstdio>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	279	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	280	#include <iostream>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	281	-#include <stdlib.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	282	+#include <cstdlib>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	283	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	284
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	285	#include "pl_symbol.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	286	#include "deffile.h"
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	287	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/deflatecompress.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/deflatecompress.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	288	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/deflatecompress.cpp 2010-05-10 19:22:12.072624202 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	289	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/deflatecompress.cpp 2010-05-08 14:25:12.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	290	@@ -126,7 +126,8 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	291	inline HDeflateHash* HDeflateHash::NewLC(TInt aLinks)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	292	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	293	//return new(HMem::Alloc(0,_FOFF(HDeflateHash,iOffset[Min(aLinks,KDeflateMaxDistance)]))) HDeflateHash;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	294	- return new(new char[_FOFF(HDeflateHash,iOffset[Min(aLinks,KDeflateMaxDistance)])]) HDeflateHash;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	295	+ return new(new char[_FOFF(HDeflateHash,iOffset[0]) +
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	296	+ (sizeof(TOffset) * Min(aLinks,KDeflateMaxDistance))]) HDeflateHash;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	297	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	298
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	299	/**
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	300	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/e32exporttable.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/e32exporttable.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	301	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/e32exporttable.cpp 2010-05-10 19:22:12.076640076 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	302	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/e32exporttable.cpp 2010-05-08 14:18:16.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	303	@@ -18,6 +18,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	304	#include "pl_elfexports.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	305	#include "pl_dllsymbol.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	306	#include "pl_elflocalrelocation.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	307	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	308
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	309	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	310	Destructor for E32ExportTable class.
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	311	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/e32imagefile.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/e32imagefile.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	312	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/e32imagefile.cpp 2010-05-10 19:22:12.076640076 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	313	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/e32imagefile.cpp 2010-05-08 14:20:20.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	314	@@ -21,6 +21,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	315
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	316	// get E32ImageHeader class...
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	317	#define INCLUDE_E32IMAGEHEADER_IMPLEMENTATION
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	318	+#include <cstdio>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	319	#define RETURN_FAILURE(_r) return (fprintf(stderr, "line %d\n", __LINE__),_r)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	320	//#define E32IMAGEHEADER_TRACE(_t) printf _t
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	321	#include "e32imagefile.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	322	@@ -40,11 +41,9 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	323	#include <iostream>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	324	#ifndef __LINUX__
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	325	#include <io.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	326	-#else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	327	- #include <time.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	328	#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	329	-#include <time.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	330	-#include <stdio.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	331	+#include <ctime>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	332	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	333
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	334	using namespace std;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	335
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	336	@@ -365,7 +364,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	337	iImportSectionSize = aTotalSize;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	338	iImportSection = (uint32 *)new char[aTotalSize];
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	339	memset(iImportSection, 0, aTotalSize);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	340	- memcpy(iImportSection, aImportSection.begin(), aImportSectionSize);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	341	+ memcpy(iImportSection, &*aImportSection.begin(), aImportSectionSize);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	342	char * strTab = ((char *)iImportSection) + aImportSectionSize;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	343	memcpy(strTab, aStrTab.data(), aStrTab.size());
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	344
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	345	@@ -1922,7 +1921,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	346	memcpy(aInfo, (void*)&aSymInf, sizeof(aSymInf));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	347
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	348	TUint aPos = aSymInf.iSymbolTblOffset;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	349	- memcpy(aInfo+aPos, iSymAddrTab.begin(), iSymAddrTab.size()*sizeof(uint32));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	350	+ memcpy(aInfo+aPos, &iSymAddrTab.begin(), iSymAddrTab.size()sizeof(uint32));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	351
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	352	aPos += iSymAddrTab.size()*aSizeofNames;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	353	aPos += iSymNameOffTab.size()*aSizeofNames;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	354	@@ -1933,13 +1932,13 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	355	if(aSymInf.iFlags & 1)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	356	aOffLen=4;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	357	while(Iter != iSymNameOffTab.end()){
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	358	- memcpy( ((void)(aInfo+aPos)), ((void)Iter), aOffLen);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	359	+ memcpy( ((void)(aInfo+aPos)), &Iter, aOffLen);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	360	aPos += aOffLen;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	361	Iter++;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	362	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	363
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	364	aPos = aSymInf.iStringTableOffset;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	365	- memcpy(aInfo+aPos, iSymbolNames.begin(), iSymbolNames.size());
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	366	+ memcpy(aInfo+aPos, &*iSymbolNames.begin(), iSymbolNames.size());
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	367
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	368	// At the end, the dependencies are listed. They remain zeroes and shall be fixed up
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	369	// while relocating.
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	370	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/elffilesupplied.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/elffilesupplied.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	371	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/elffilesupplied.cpp 2010-05-10 19:22:12.076640076 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	372	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/elffilesupplied.cpp 2010-05-08 14:22:14.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	373	@@ -25,7 +25,15 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	374
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	375	#include <algorithm>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	376	#include <iostream>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	377	-#include<hash_set>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	378	+#if __GNUC__ < 4
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	379	+ #include <ext/hash_set>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	380	+ #define SET_TYPE __gnu_cxx::hash_set
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	381	+ #define HASH_FUN __gnu_cxx::hash
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	382	+#else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	383	+ #include <unordered_set>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	384	+ #define SET_TYPE std::unordered_set
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	385	+ #define HASH_FUN std::hash
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	386	+#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	387
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	388	using namespace std;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	389
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	390	@@ -638,7 +646,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	391	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	392	int ElfFileSupplied::UnWantedSymbolp(const char * aSymbol)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	393	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	394	- static hash_set<const char, hash<const char>, eqstr> aSymbolSet;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	395	+ static SET_TYPE<const char, HASH_FUN<const char>, eqstr> aSymbolSet;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	396	int symbollistsize=sizeof(Unwantedruntimesymbols)/sizeof(Unwantedruntimesymbols[0]);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	397	static bool FLAG=false;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	398	while(!FLAG)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	399	@@ -649,7 +657,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	400	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	401	FLAG=true;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	402	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	403	- hash_set<const char, hash<const char>, eqstr>::const_iterator it
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	404	+ SET_TYPE<const char, HASH_FUN<const char>, eqstr>::const_iterator it
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	405	= aSymbolSet.find(aSymbol);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	406	if(it != aSymbolSet.end())
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	407	return 1;
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	408	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/errorhandler.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/errorhandler.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	409	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/errorhandler.cpp 2010-05-10 19:22:12.076640076 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	410	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/errorhandler.cpp 2010-05-08 14:24:02.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	411	@@ -26,7 +26,9 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	412	#include "errorhandler.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	413	#include "messagehandler.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	414	#include <iostream>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	415	-#include <stdio.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	416	+#include <cstdio>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	417	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	418	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	419	using std::cerr;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	420	using std::endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	421
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	422	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/huffman.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/huffman.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	423	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/huffman.cpp 2010-05-10 19:22:12.085117410 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	424	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/huffman.cpp 2010-05-08 14:25:08.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	425	@@ -22,6 +22,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	426	#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	427
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	428	#include <cassert>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	429	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	430	#include "huffman.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	431	#include "errorhandler.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	432	#include "farray.h"
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	433	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/h_utl.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/h_utl.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	434	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/h_utl.cpp 2010-05-10 19:22:12.085117410 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	435	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/h_utl.cpp 2010-05-08 14:33:02.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	436	@@ -17,8 +17,9 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	437	//
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	438	//
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	439
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	440	-#include <stdlib.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	441	-#include <stdio.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	442	+#include <cstdlib>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	443	+#include <cstdio>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	444	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	445	#include "h_utl.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	446
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	447	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	448	Only in /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source: h_utl.h.bak
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	449	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/inflate.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/inflate.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	450	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/inflate.cpp 2010-05-10 19:22:12.085117410 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	451	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/inflate.cpp 2010-05-08 14:25:46.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	452	@@ -23,6 +23,8 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	453	#include "farray.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	454	#include "errorhandler.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	455	#include<iostream>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	456	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	457	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	458	using std::cout;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	459
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	460	/*
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	461	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/messageimplementation.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/messageimplementation.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	462	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/messageimplementation.cpp 2010-05-10 19:22:12.089117220 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	463	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/messageimplementation.cpp 2010-05-08 14:33:34.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	464	@@ -23,7 +23,8 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	465	#include<iostream>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	466	#include<stdarg.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	467	#include<string>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	468	-#include <stdio.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	469	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	470	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	471
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	472	using std::endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	473	using std::cout;
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	474	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/parametermanager.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/parametermanager.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	475	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/parametermanager.cpp 2010-05-10 19:22:12.089117220 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	476	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/parametermanager.cpp 2010-05-08 14:29:50.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	477	@@ -2247,7 +2247,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	478	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	479	int len = nq;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	480	symbol = new char[len+1];
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	481	- memcpy(symbol, p, len);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	482	+ memcpy(symbol, &*p, len);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	483	symbol[len] = 0;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	484	q = nq+1;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	485
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	486	@@ -2387,7 +2387,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	487	if (e == '-' \|\| e == '+') break;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	488	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	489	if (e != b)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	490	- ParseCapability1(b, e, aCapabilities, invert);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	491	+ ParseCapability1(&b, &e, aCapabilities, invert);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	492
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	493	b = e;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	494
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	495	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_elfexecutable.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfexecutable.h
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	496	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_elfexecutable.h 2010-05-10 19:22:12.093117728 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	497	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfexecutable.h 2010-05-08 14:31:06.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	498	@@ -22,13 +22,19 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	499
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	500	#include "pl_common.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	501	#include <list>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	502	-#include <hash_map>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	503	+#if __GNUC__ < 4
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	504	+ #include <ext/hash_map>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	505	+ #define MAP_TYPE __gnu_cxx::hash_map
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	506	+#else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	507	+ #include <unordered_map>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	508	+ #define MAP_TYPE std::unordered_map
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	509	+#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	510	#include "pl_elfimports.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	511	#include "pl_elfrelocations.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	512	#include "pl_elfexports.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	513
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	514	using std::list;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	515	-using std::hash_map;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	516	+using MAP_TYPE;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	517
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	518	class DllSymbol;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	519	class Symbol;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	520	@@ -122,7 +128,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	521	* The dynamic symbol array.
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	522	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	523	Elf32_Sym *iElfDynSym;//The ELF symbol
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	524	- hash_map<PLUINT32, DllSymbol*> iSymbolTable; //The representation
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	525	+ MAP_TYPE<PLUINT32, DllSymbol*> iSymbolTable; //The representation
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	526
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	527	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	528	* The static symbol table.
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	529	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_elfexports.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfexports.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	530	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_elfexports.cpp 2010-05-10 19:22:12.093117728 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	531	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfexports.cpp 2010-05-08 14:20:44.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	532	@@ -20,6 +20,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	533	#include "pl_elfexports.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	534	#include "pl_elfexecutable.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	535	#include "pl_dllsymbol.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	536	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	537
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	538	using std::set_difference;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	539
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	540	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_elfimports.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfimports.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	541	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_elfimports.cpp 2010-05-10 19:22:12.093117728 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	542	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfimports.cpp 2010-05-08 14:32:18.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	543	@@ -19,6 +19,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	544
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	545	#include "pl_elfimports.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	546	#include "pl_elfimportrelocation.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	547	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	548
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	549	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	550	Constructor for class ElfImports
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	551	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_elfproducer.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfproducer.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	552	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_elfproducer.cpp 2010-05-10 19:22:12.097117747 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	553	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_elfproducer.cpp 2010-05-08 14:23:30.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	554	@@ -22,6 +22,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	555	#include <stdio.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	556	#include <string>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	557	#include "errorhandler.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	558	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	559
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	560	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	561	* Following array is indexed on the SECTION_INDEX enum
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	562	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_symbol.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_symbol.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	563	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_symbol.cpp 2010-05-10 19:22:12.097117747 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	564	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/e32tools/elf2e32/source/pl_symbol.cpp 2010-05-08 14:18:40.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	565	@@ -18,6 +18,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	566	//
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	567
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	568	#include "pl_symbol.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	569	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	570
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	571
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	572	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	573	Only in /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/buildrom/tools: cdf.dtd.bak
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	574	Only in /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/buildrom/tools: featuredatabase.dtd.bak
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	575	Only in /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/buildrom/tools: featureuids.dtd.bak
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	576	Only in /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/buildrom/tools: imageContent.dtd.bak
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	577	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/group/bld.inf /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/group/bld.inf
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	578	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/group/bld.inf 2010-05-10 19:22:12.133117501 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	579	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/group/bld.inf 2010-05-08 15:25:20.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	580	@@ -21,8 +21,10 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	581
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	582	// These libraries needs to be exported
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	583	PRJ_EXPORTS
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	584	+#ifndef TOOLS2_LINUX
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	585	../libxml/lib/libxml2.a /epoc32/release/tools2/rel/libxml2.a
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	586	../libxml/lib/libxml2.a /epoc32/release/tools2/deb/libxml2.a
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	587	+#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	588	../src/imgcheck.xsl /epoc32/tools/imgcheck.xsl
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	589	./imgcheck.pl /epoc32/tools/imgcheck.pl
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	590	./imgcheck.cmd /epoc32/tools/imgcheck.cmd
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	591	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/group/imgcheck.mmp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/group/imgcheck.mmp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	592	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/group/imgcheck.mmp 2010-05-10 19:22:12.133117501 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	593	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/group/imgcheck.mmp 2010-05-08 17:31:00.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	594	@@ -25,17 +25,24 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	595	SOURCE exceptionimplementation.cpp exceptionreporter.cpp
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	596	SOURCE cmdlinewriter.cpp xmlwriter.cpp dbgflagchecker.cpp
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	597	USERINCLUDE ../libimgutils/inc ../inc ../../imglib/compress
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	598	+#ifndef TOOLS2_LINUX
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	599	USERINCLUDE ../../imglib/boostlibrary
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	600	+#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	601
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	602	OS_LAYER_SYSTEMINCLUDE_SYMBIAN
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	603	+#ifndef TOOLS2_LINUX
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	604	SYSTEMINCLUDE ../libxml ../
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	605	+#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	606
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	607	SYSTEMINCLUDE ../../imglib/inc ../../romtools/rofsbuild
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	608
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	609	-STATICLIBRARY imgutils xml2 wsock32 stlport.5.1 patchdataprocessor
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	610	#ifdef TOOLS2_LINUX
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	611	-STATICLIBRARY boost_thread-mgw34-mt-1_39_linux
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	612	-OPTION GCC -pthread -O2 -Wno-uninitialized
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	613	+STATICLIBRARY imgutils patchdataprocessor
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	614	+#else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	615	+STATICLIBRARY imgutils xml2 wsock32 patchdataprocessor
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	616	+#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	617	+#ifdef TOOLS2_LINUX
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	618	+OPTION GCC -pthread -O2 -Wno-uninitialized -isystem /usr/include/libxml2 -lxml2 -lboost_thread-mt
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	619	#else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	620	STATICLIBRARY boost_thread-mgw34-mt-1_39_win32
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	621	OPTION GCC -mthreads -O2 -Wno-uninitialized
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	622	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/cmdlinehandler.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/cmdlinehandler.h
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	623	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/cmdlinehandler.h 2010-05-10 19:22:13.089118113 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	624	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/cmdlinehandler.h 2010-05-08 15:31:40.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	625	@@ -120,7 +120,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	626	@internalComponent
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	627	@released
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	628	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	629	-typedef enum Suppress
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	630	+enum Suppress
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	631	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	632	EDep = 0x1,
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	633	ESid = 0x2,
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	634	@@ -136,7 +136,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	635	@internalComponent
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	636	@released
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	637	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	638	-typedef enum NumberOfValue
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	639	+enum NumberOfValue
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	640	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	641	ENone = 0x0,
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	642	ESingle = 0x1,
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	643	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/common.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/common.h
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	644	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/common.h 2010-05-10 19:22:13.089118113 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	645	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/common.h 2010-05-08 15:30:02.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	646	@@ -86,7 +86,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	647	@internalComponent
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	648	@released
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	649	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	650	-typedef enum ReturnType
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	651	+enum ReturnType
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	652	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	653	ESuccess = 0,
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	654	EQuit,
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	655	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/exceptionimplementation.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/exceptionimplementation.h
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	656	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/exceptionimplementation.h 2010-05-10 19:22:13.089118113 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	657	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/exceptionimplementation.h 2010-05-08 15:30:50.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	658	@@ -91,7 +91,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	659	struct Messages
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	660	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	661	int iIndex;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	662	- char* iMessage;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	663	+ char const * iMessage;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	664	};
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	665
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	666	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	667	@@ -110,7 +110,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	668	void Report(const String aMsg);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	669
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	670	private:
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	671	- ofstream iLogStream;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	672	+ Ofstream iLogStream;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	673	IndexVsMessageMap iMessage;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	674	unsigned int iMsgIndex;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	675	static unsigned int iCmdFlag;
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	676	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/xmlwriter.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/xmlwriter.h
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	677	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/xmlwriter.h 2010-05-10 19:22:13.093117295 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	678	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/inc/xmlwriter.h 2010-05-08 15:32:40.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	679	@@ -24,7 +24,12 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	680	#define XMLWRITER_H
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	681
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	682	#include "reportwriter.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	683	-#include "libxml/xmlwriter.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	684	+#if defined(__LINUX__)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	685	+ #include <libxml/xmlwriter.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	686	+#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	687	+#if defined(WIN32)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	688	+ #include "libxml/xmlwriter.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	689	+#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	690	#include "common.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	691
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	692	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	693	@@ -107,7 +112,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	694
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	695	private:
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	696	// File stream for xml output.
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	697	- ofstream iXmlFile;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	698	+ Ofstream iXmlFile;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	699	// Xml file name for output.
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	700	const String iXmlFileName;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	701	// Xml Buffer pointer.
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	702	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/libimgutils/inc/typedefs.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/libimgutils/inc/typedefs.h
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	703	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/libimgutils/inc/typedefs.h 2010-05-10 19:22:13.093117295 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	704	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/libimgutils/inc/typedefs.h 2010-05-08 15:36:00.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	705	@@ -28,8 +28,8 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	706
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	707	#undef _L
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	708
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	709	-#include <fstream.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	710	-#include <iostream.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	711	+#include <fstream>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	712	+#include <iostream>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	713	#include <list>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	714	#include <vector>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	715	#include <map>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	716	@@ -53,10 +53,10 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	717	@internalComponent
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	718	@released
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	719	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	720	-typedef ios Ios;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	721	+typedef std::ios Ios;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	722	typedef std::string String;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	723	-typedef ofstream Ofstream;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	724	-typedef ifstream Ifstream;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	725	+typedef std::ofstream Ofstream;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	726	+typedef std::ifstream Ifstream;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	727	typedef std::list<String> StringList;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	728	typedef std::map<unsigned int, String> UintVsString;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	729	typedef std::map<unsigned int, UintVsString> RomAddrVsExeName;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	730	@@ -95,7 +95,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	731	@internalComponent
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	732	@released
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	733	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	734	-typedef enum EImageType
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	735	+enum EImageType
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	736	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	737	EUnknownImage,
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	738	ERomImage,
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	739	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/libimgutils/src/dirreader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/libimgutils/src/dirreader.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	740	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/libimgutils/src/dirreader.cpp 2010-05-10 19:22:13.097117523 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	741	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/libimgutils/src/dirreader.cpp 2010-05-08 15:34:42.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	742	@@ -119,9 +119,9 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	743	void DirReader::ProcessImage()
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	744	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	745	char* cwd = new char[MAXPATHLEN];
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	746	- getcwd(cwd,MAXPATHLEN);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	747	+ char *cp = getcwd(cwd,MAXPATHLEN); (void)cp;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	748	ReadDir(iImgFileName);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	749	- chdir(cwd);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	750	+ int i = chdir(cwd); (void)i;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	751	if(cwd != NULL)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	752	delete [] cwd;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	753	cwd = 0;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	754	@@ -139,8 +139,11 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	755	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	756	void DirReader::ReadDir(String aPath)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	757	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	758	+#ifndef __LINUX__
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	759	int handle;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	760	int retVal = 0;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	761	+#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	762	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	763	E32Image* e32Image = KNull;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	764
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	765	#ifdef __LINUX__
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	766	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/libimgutils/src/romreader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/libimgutils/src/romreader.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	767	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/libimgutils/src/romreader.cpp 2010-05-10 19:22:13.097117523 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	768	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/libimgutils/src/romreader.cpp 2010-05-08 15:33:14.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	769	@@ -53,7 +53,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	770	RomReader::RomReader(const char* aFile, EImageType aImgType)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	771	: ImageReader(aFile), iImageHeader(0), iData(0), iImgType(aImgType)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	772	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	773	- iRomImageRootDirEntry = new RomImageDirEntry("");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	774	+ iRomImageRootDirEntry = new RomImageDirEntry(const_cast<char *>(""));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	775	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	776
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	777	/**
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	778	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/cmdlinehandler.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/cmdlinehandler.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	779	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/cmdlinehandler.cpp 2010-05-10 19:22:13.137118346 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	780	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/cmdlinehandler.cpp 2010-05-08 15:21:44.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	781	@@ -25,6 +25,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	782	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	783
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	784	#include "cmdlinehandler.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	785	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	786
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	787	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	788	Constructor initializes the iOptionMap with short and long option names as key and
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	789	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/cmdlinewriter.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/cmdlinewriter.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	790	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/cmdlinewriter.cpp 2010-05-10 19:22:13.137118346 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	791	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/cmdlinewriter.cpp 2010-05-08 15:22:18.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	792	@@ -24,6 +24,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	793	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	794
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	795	#include "cmdlinewriter.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	796	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	797
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	798	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	799	Constructor: CmdLineWriter class
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	800	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/exceptionimplementation.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/exceptionimplementation.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	801	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/exceptionimplementation.cpp 2010-05-10 19:22:13.137118346 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	802	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/exceptionimplementation.cpp 2010-05-08 15:24:58.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	803	@@ -187,7 +187,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	804
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	805	if(iCmdFlag & KVerbose)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	806	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	807	- cout << aMsg.c_str() << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	808	+ std::cout << aMsg.c_str() << std::endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	809	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	810	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	811
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	812	@@ -207,10 +207,10 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	813	iLogStream << aMsg.c_str() << "\n";
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	814	if(aMsg.find("Success") != String::npos)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	815	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	816	- cout << aMsg.c_str() << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	817	+ std::cout << aMsg.c_str() << std::endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	818	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	819	else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	820	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	821	- cerr << aMsg.c_str() << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	822	+ std::cerr << aMsg.c_str() << std::endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	823	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	824	}
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	825	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/sidchecker.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/sidchecker.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	826	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/sidchecker.cpp 2010-05-10 19:22:13.141117388 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	827	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/sidchecker.cpp 2010-05-08 15:24:08.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	828	@@ -249,8 +249,8 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	829	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	830	exeAtt->iAttStatus = KNull;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	831	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	832	- if((iAllExecutables
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	833	- \|\| (exeAtt->iAttStatus == KDuplicate)) && !exeAtt->iAttStatus.empty()
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	834	+ if(((iAllExecutables
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	835	+ \|\| (exeAtt->iAttStatus == KDuplicate)) && !exeAtt->iAttStatus.empty())
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	836	\|\| iNoCheck)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	837	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	838	aExeContainer->iExeAttList.push_back(exeAtt);
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	839	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/xmlwriter.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/xmlwriter.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	840	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/xmlwriter.cpp 2010-05-10 19:22:13.141117388 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	841	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imgcheck/src/xmlwriter.cpp 2010-05-09 13:32:35.689287000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	842	@@ -24,9 +24,10 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	843	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	844
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	845	#include "xmlwriter.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	846	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	847
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	848	#ifndef __LINUX__
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	849	- #include "/epoc32/gcc_mingw/include/windows.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	850	+ #include <windows.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	851	#endif //__LINUX__
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	852
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	853	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	854	@@ -99,7 +100,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	855	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	856	xslSourcePath.append(KXslFileName.c_str());
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	857
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	858	- ifstream xslSourceHandle;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	859	+ Ifstream xslSourceHandle;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	860	xslSourceHandle.open(xslSourcePath.c_str(), Ios::binary);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	861	if(!xslSourceHandle)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	862	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	863	@@ -116,7 +117,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	864	xslSourceHandle.read(filetocopy,fileSize);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	865	xslSourceHandle.close();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	866
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	867	- ofstream xslDestHandle(xslDestPath.c_str(), Ios::binary \| Ios::out);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	868	+ Ofstream xslDestHandle(xslDestPath.c_str(), Ios::binary \| Ios::out);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	869	if(!xslDestHandle)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	870	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	871	delete [] filetocopy;
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	872	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/boostlibrary/boost/thread/pthread/thread_data.hpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/boostlibrary/boost/thread/pthread/thread_data.hpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	873	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/boostlibrary/boost/thread/pthread/thread_data.hpp 2010-05-10 19:22:13.709117374 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	874	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/boostlibrary/boost/thread/pthread/thread_data.hpp 2010-05-09 13:34:57.929288000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	875	@@ -8,7 +8,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	876	#include <boost/thread/detail/config.hpp>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	877	#include <boost/thread/exceptions.hpp>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	878	#include <boost/shared_ptr.hpp>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	879	-#include <boost/enable_shared_from_this.hpp>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	880	+#include <boost/smart_ptr/enable_shared_from_this.hpp>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	881	#include <boost/thread/mutex.hpp>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	882	#include <boost/optional.hpp>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	883	#include <pthread.h>
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	884	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/e32image/deflate/deflate.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/e32image/deflate/deflate.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	885	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/e32image/deflate/deflate.cpp 2010-05-10 19:22:13.757117537 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	886	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/e32image/deflate/deflate.cpp 2010-05-08 14:38:16.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	887	@@ -20,6 +20,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	888	#include "deflate.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	889	#include "h_utl.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	890	#include "panic.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	891	+#define OFFSETOF(c,f) (((TInt)&(((c *)0x1000)->f))-0x1000)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	892
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	893	class HDeflateHash
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	894	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	895	@@ -89,7 +90,8 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	896
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	897	inline HDeflateHash* HDeflateHash::NewLC(TInt aLinks)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	898	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	899	- return new(HMem::Alloc(0,_FOFF(HDeflateHash,iOffset[Min(aLinks,KDeflateMaxDistance)]))) HDeflateHash;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	900	+ return new(new char[OFFSETOF(HDeflateHash,iOffset[0]) +
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	901	+ (sizeof(TOffset) * Min(aLinks,KDeflateMaxDistance))]) HDeflateHash;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	902	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	903
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	904	inline TInt HDeflateHash::Hash(const TUint8* aPtr)
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	905	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/e32image/deflate/panic.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/e32image/deflate/panic.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	906	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/e32image/deflate/panic.cpp 2010-05-10 19:22:13.761118115 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	907	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/e32image/deflate/panic.cpp 2010-05-08 14:37:24.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	908	@@ -21,7 +21,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	909	#include "h_utl.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	910	#include <stdlib.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	911
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	912	-char* HuffmanError[]= {
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	913	+char const * HuffmanError[]= {
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	914	"Huffman: Too many codes\n",
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	915	"Huffman: Invalid coding\n",
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	916	"Huffman: Buffer overflow\n",
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	917	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/e32uid/uidcrc.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/e32uid/uidcrc.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	918	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/e32uid/uidcrc.cpp 2010-05-10 19:22:13.761118115 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	919	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/e32uid/uidcrc.cpp 2010-05-08 14:36:56.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	920	@@ -55,7 +55,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	921
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	922	for (i=1; i<4; i++)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	923	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	924	- char* endptr = "failed";
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	925	+ char * endptr;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	926	uids[i] = strtoul(argv[i],&endptr,0);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	927	if (*endptr!='\0')
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	928	{
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	929	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/cluster.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/cluster.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	930	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/cluster.cpp 2010-05-10 19:22:13.769118155 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	931	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/cluster.cpp 2010-05-08 14:42:50.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	932	@@ -143,7 +143,9 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	933	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	934	if(iCurrentClusterNumber >= iTotalNumberOfClusters)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	935	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	936	- throw ErrorHandler(IMAGESIZETOOBIG,"Occupied number of clusters count exceeded than available clusters",__FILE__,__LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	937	+ throw ErrorHandler(IMAGESIZETOOBIG,
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	938	+ const_cast<char *>("Occupied number of clusters count exceeded than available clusters"),
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	939	+ const_cast<char *>(__FILE__),__LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	940	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	941	++iCurrentClusterNumber;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	942	}
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	943	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/dirregion.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/dirregion.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	944	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/dirregion.cpp 2010-05-10 19:22:13.769118155 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	945	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/dirregion.cpp 2010-05-08 14:47:44.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	946	@@ -49,7 +49,9 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	947	iClusterPtr = CCluster::Instance(iClusterSize,totalClusters);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	948	if(iClusterPtr == NULL)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	949	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	950	- throw ErrorHandler(CLUSTERERROR,"Instance creation error", __FILE__, __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	951	+ throw ErrorHandler(CLUSTERERROR,
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	952	+ const_cast<char *>("Instance creation error"),
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	953	+ const_cast<char *>( __FILE__), __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	954	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	955	iClusterSize = iClusterPtr->GetClusterSize();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	956	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	957	@@ -117,7 +119,8 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	958	aOutPutStream.flush();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	959	if(aOutPutStream.bad())
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	960	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	961	- throw ErrorHandler(FILEWRITEERROR, __FILE__, __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	962	+ throw ErrorHandler(FILEWRITEERROR, const_cast<char *>(__FILE__), __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	963	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	964	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	965	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	966
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	967	@@ -175,7 +178,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	968	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	969	else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	970	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	971	- throw ErrorHandler(EMPTYFILENAME, __FILE__, __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	972	+ throw ErrorHandler(EMPTYFILENAME, const_cast<char *>(__FILE__), __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	973	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	974	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	975
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	976	@@ -247,7 +250,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	977	if(tempString.length() == 0)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	978	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	979	tempString.erase();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	980	- throw ErrorHandler(EMPTYFILENAME, __FILE__, __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	981	+ throw ErrorHandler(EMPTYFILENAME, const_cast<char *>(__FILE__), __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	982	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	983	else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	984	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	985	@@ -314,7 +317,8 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	986	iInputStream.open(aEntry->GetFilePath().c_str(),Ios::binary);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	987	if(iInputStream.fail() == true )
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	988	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	989	- throw ErrorHandler(FILEOPENERROR,(char*)aEntry->GetFilePath().c_str(),__FILE__,__LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	990	+ throw ErrorHandler(FILEOPENERROR,const_cast<char *>(aEntry->GetFilePath().c_str()),
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	991	+ const_cast<char *>(__FILE__),__LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	992	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	993	else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	994	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	995	@@ -324,7 +328,8 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	996	char* dataBuffer = (char*)malloc((unsigned int)fileSize);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	997	if(dataBuffer == 0)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	998	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	999	- throw ErrorHandler(MEMORYALLOCATIONERROR, __FILE__, __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1000	+ throw ErrorHandler(MEMORYALLOCATIONERROR,
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1001	+ const_cast<char *>(__FILE__), __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1002	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1003	//Read the whole file in one short
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1004	iInputStream.read (dataBuffer,fileSize);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1005	@@ -332,7 +337,8 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1006	Long64 bytesRead = (unsigned int)iInputStream.tellg();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1007	if((iInputStream.bad()) \|\| (bytesRead != fileSize))
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1008	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1009	- throw ErrorHandler(FILEREADERROR,(char*)aEntry->GetFilePath().c_str(), __FILE__, __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1010	+ throw ErrorHandler(FILEREADERROR,const_cast<char *>(aEntry->GetFilePath().c_str()),
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1011	+ const_cast<char *>(__FILE__), __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1012	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1013	String clusterData(dataBuffer,(unsigned int)bytesRead);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1014	PushStringIntoClusterMap(iClusterPtr->GetCurrentClusterNumber(),clusterData,iClusterSize,aEntry->GetEntryAttribute());
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1015	@@ -544,12 +550,12 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1016	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1017	if(aNodeList.front()->GetEntryList()->size() <= 0)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1018	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1019	- throw ErrorHandler(NOENTRIESFOUND, __FILE__, __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1020	+ throw ErrorHandler(NOENTRIESFOUND, const_cast<char *>(__FILE__), __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1021	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1022	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1023	else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1024	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1025	- throw ErrorHandler(ROOTNOTFOUND, __FILE__, __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1026	+ throw ErrorHandler(ROOTNOTFOUND, const_cast<char *>(__FILE__), __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1027	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1028	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1029
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1030	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/errorhandler.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/errorhandler.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1031	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/errorhandler.cpp 2010-05-10 19:22:13.769118155 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1032	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/errorhandler.cpp 2010-05-08 14:42:14.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1033	@@ -22,9 +22,10 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1034
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1035	#include "errorhandler.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1036	#include "messagehandler.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1037	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1038
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1039	-char *errMssgPrefix="FileSystem : Error:";
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1040	-char *Gspace=" ";
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1041	+char const *errMssgPrefix="FileSystem : Error:";
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1042	+char const *Gspace=" ";
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1043
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1044	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1045	ErrorHandler constructor for doing common thing required for derived
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1046	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fat16bootsector.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat16bootsector.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1047	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fat16bootsector.cpp 2010-05-10 19:22:13.769118155 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1048	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat16bootsector.cpp 2010-05-08 14:43:40.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1049	@@ -21,6 +21,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1050	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1051
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1052	#include "fat16bootsector.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1053	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1054
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1055	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1056	Constructor of the fat16 boot sector class
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1057	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fat16filesystem.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat16filesystem.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1058	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fat16filesystem.cpp 2010-05-10 19:22:13.769118155 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1059	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat16filesystem.cpp 2010-05-08 14:45:06.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1060	@@ -21,7 +21,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1061	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1062
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1063	#include"fat16filesystem.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1064	-
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1065	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1066
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1067	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1068	Initializes the boot sector of a FAT 16 volume
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1069	@@ -76,45 +76,45 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1070	//copying of boot sector values in to the array
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1071	iData = new unsigned char[BytesPerSector];
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1072	unsigned int pos = 0;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1073	- memcpy(&iData[pos],JmpBoot,3);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1074	+ memmove(&iData[pos],JmpBoot,3);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1075	pos += 3;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1076	- memcpy(&iData[pos],OEMName,8);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1077	+ memmove(&iData[pos],OEMName,8);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1078	pos += 8;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1079	- memcpy(&iData[pos],&BytesPerSector,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1080	+ memmove(&iData[pos],&BytesPerSector,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1081	pos += 2;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1082	- memcpy(&iData[pos],&SectorsPerCluster,1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1083	+ memmove(&iData[pos],&SectorsPerCluster,1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1084	pos += 1;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1085	- memcpy(&iData[pos],&ReservedSectors,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1086	+ memmove(&iData[pos],&ReservedSectors,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1087	pos += 2;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1088	- memcpy(&iData[pos],&NumFats,1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1089	+ memmove(&iData[pos],&NumFats,1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1090	pos += 1;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1091	- memcpy(&iData[pos],&RootDirEntries,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1092	+ memmove(&iData[pos],&RootDirEntries,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1093	pos += 2;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1094	- memcpy(&iData[pos],&LowSectors,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1095	+ memmove(&iData[pos],&LowSectors,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1096	pos += 2;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1097	- memcpy(&iData[pos],&Media,1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1098	+ memmove(&iData[pos],&Media,1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1099	pos += 1;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1100	- memcpy(&iData[pos],&FatSectors,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1101	+ memmove(&iData[pos],&FatSectors,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1102	pos += 2;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1103	- memcpy(&iData[pos],&SectorPerTrack,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1104	+ memmove(&iData[pos],&SectorPerTrack,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1105	pos += 2;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1106	- memcpy(&iData[pos],&NumberOfHeads,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1107	+ memmove(&iData[pos],&NumberOfHeads,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1108	pos += 2;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1109	- memcpy(&iData[pos],&HiddenSectors,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1110	+ memmove(&iData[pos],&HiddenSectors,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1111	pos += 4;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1112	- memcpy(&iData[pos],&HighSectorsCount,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1113	+ memmove(&iData[pos],&HighSectorsCount,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1114	pos += 4;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1115	- memcpy(&iData[pos],&BootSectorDriveNumber,1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1116	+ memmove(&iData[pos],&BootSectorDriveNumber,1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1117	pos += 1;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1118	- memcpy(&iData[pos],&ReservedByte,1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1119	+ memmove(&iData[pos],&ReservedByte,1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1120	pos += 1;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1121	- memcpy(&iData[pos],&BootSignature,1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1122	+ memmove(&iData[pos],&BootSignature,1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1123	pos += 1;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1124	- memcpy(&iData[pos],&VolumeId,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1125	+ memmove(&iData[pos],&VolumeId,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1126	pos += 4;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1127	- memcpy(&iData[pos],VolumeLab,11);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1128	+ memmove(&iData[pos],VolumeLab,11);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1129	pos += 11;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1130	- memcpy(&iData[pos],FileSysType,8);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1131	+ memmove(&iData[pos],FileSysType,8);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1132	pos += 8;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1133	while(pos < BytesPerSector)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1134	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1135	@@ -133,7 +133,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1136	ComputeClusterSizeInBytes();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1137	ComputeRootDirSectors();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1138	ComputeBytesPerSector();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1139	- MessageHandler::ReportMessage (INFORMATION,BOOTSECTORCREATEMSG, "FAT16");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1140	+ MessageHandler::ReportMessage (INFORMATION,BOOTSECTORCREATEMSG, const_cast<char *>("FAT16"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1141	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1142
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1143	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1144	@@ -145,7 +145,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1145	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1146	void CFat16FileSystem::WriteBootSector(ofstream& aOutPutStream)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1147	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1148	- MessageHandler::ReportMessage (INFORMATION,BOOTSECTORWRITEMSG,"FAT16");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1149	+ MessageHandler::ReportMessage (INFORMATION,BOOTSECTORWRITEMSG,const_cast<char *>("FAT16"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1150	aOutPutStream.write(reinterpret_cast<char*>(&iData[0]),iFAT16BootSector.BytesPerSector());
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1151	aOutPutStream.flush();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1152	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1153	@@ -195,8 +195,8 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1154	// Each FAT16 entries occupies 2 bytes, hence multiply by 2
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1155	aFatString.append((totalFatEntries - clusterCounter)*2, 0);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1156	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1157	- MessageHandler::ReportMessage (INFORMATION,FATTABLEWRITEMSG,
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1158	- "FAT16");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1159	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1160	+ MessageHandler::ReportMessage (INFORMATION,FATTABLEWRITEMSG,const_cast<char *>("FAT16"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1161
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1162	// Write FAT table multiple times depending upon the No of FATS set.
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1163	unsigned int noOfFats = iFAT16BootSector.NumberOfFats();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1164	@@ -258,11 +258,15 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1165	iTotalClusters = iTotalDataSectors / iFAT16BootSector.SectorsPerCluster();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1166	if(iTotalClusters < KMinimumFat16Clusters)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1167	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1168	- throw ErrorHandler(BOOTSECTORERROR,"Low Partition Size",__FILE__,__LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1169	+ throw ErrorHandler(BOOTSECTORERROR,
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1170	+ const_cast<char *>("Low Partition Size"),
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1171	+ const_cast<char *>(__FILE__),__LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1172	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1173	if(iTotalClusters > KMaximumFat16Clusters)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1174	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1175	- throw ErrorHandler(BOOTSECTORERROR,"High Partition Size",__FILE__,__LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1176	+ throw ErrorHandler(BOOTSECTORERROR,
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1177	+ const_cast<char *>("High Partition Size"),
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1178	+ const_cast<char *>(__FILE__),__LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1179	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1180
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1181	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1182	@@ -313,6 +317,6 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1183	catch(...)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1184	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1185	delete dirRegionPtr;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1186	- throw ErrorHandler(UNKNOWNERROR, __FILE__, __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1187	+ throw ErrorHandler(UNKNOWNERROR, const_cast<char *>(__FILE__), __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1188	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1189	}
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1190	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fat32bootsector.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat32bootsector.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1191	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fat32bootsector.cpp 2010-05-10 19:22:13.769118155 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1192	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat32bootsector.cpp 2010-05-08 14:48:14.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1193	@@ -21,6 +21,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1194	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1195
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1196	#include "fat32bootsector.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1197	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1198
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1199	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1200	Constructor of the fat16 boot sector class
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1201	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fat32filesystem.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat32filesystem.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1202	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fat32filesystem.cpp 2010-05-10 19:22:13.769118155 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1203	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fat32filesystem.cpp 2010-05-08 14:41:04.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1204	@@ -21,6 +21,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1205	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1206
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1207	#include"fat32filesystem.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1208	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1209
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1210	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1211	Initializes the boot sector of a FAT 32 volume
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1212	@@ -90,59 +91,59 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1213	//copying of boot sector values in to the array
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1214	iData = new unsigned char[BytesPerSector];
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1215	unsigned int pos = 0;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1216	- memcpy(&iData[pos],JmpBoot,3);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1217	+ memmove(&iData[pos],JmpBoot,3);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1218	pos += 3;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1219	- memcpy(&iData[pos],OEMName,8);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1220	+ memmove(&iData[pos],OEMName,8);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1221	pos += 8;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1222	- memcpy(&iData[pos],&BytesPerSector,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1223	+ memmove(&iData[pos],&BytesPerSector,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1224	pos += 2;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1225	- memcpy(&iData[pos],&SectorsPerCluster,1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1226	+ memmove(&iData[pos],&SectorsPerCluster,1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1227	pos += 1;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1228	- memcpy(&iData[pos],&ReservedSectors,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1229	+ memmove(&iData[pos],&ReservedSectors,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1230	pos += 2;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1231	- memcpy(&iData[pos],&NumFats,1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1232	+ memmove(&iData[pos],&NumFats,1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1233	pos += 1;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1234	- memcpy(&iData[pos],&RootDirEntries,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1235	+ memmove(&iData[pos],&RootDirEntries,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1236	pos += 2;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1237	- memcpy(&iData[pos],&LowSectors,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1238	+ memmove(&iData[pos],&LowSectors,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1239	pos += 2;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1240	- memcpy(&iData[pos],&Media,1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1241	+ memmove(&iData[pos],&Media,1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1242	pos += 1;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1243	- memcpy(&iData[pos],&FatSectors,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1244	+ memmove(&iData[pos],&FatSectors,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1245	pos += 2;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1246	- memcpy(&iData[pos],&SectorPerTrack,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1247	+ memmove(&iData[pos],&SectorPerTrack,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1248	pos += 2;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1249	- memcpy(&iData[pos],&NumberOfHeads,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1250	+ memmove(&iData[pos],&NumberOfHeads,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1251	pos += 2;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1252	- memcpy(&iData[pos],&HiddenSectors,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1253	+ memmove(&iData[pos],&HiddenSectors,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1254	pos += 4;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1255	- memcpy(&iData[pos],&HighSectorsCount,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1256	+ memmove(&iData[pos],&HighSectorsCount,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1257	pos += 4;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1258	- memcpy(&iData[pos],&FatSectors32,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1259	+ memmove(&iData[pos],&FatSectors32,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1260	pos += 4;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1261	- memcpy(&iData[pos],&ExtFlags,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1262	+ memmove(&iData[pos],&ExtFlags,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1263	pos += 2;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1264	- memcpy(&iData[pos],&FileSystemVersion,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1265	+ memmove(&iData[pos],&FileSystemVersion,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1266	pos += 2;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1267	- memcpy(&iData[pos],&RootCluster,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1268	+ memmove(&iData[pos],&RootCluster,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1269	pos += 4;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1270	- memcpy(&iData[pos],&FSInfo,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1271	+ memmove(&iData[pos],&FSInfo,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1272	pos += 2;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1273	- memcpy(&iData[pos],&BackUpBootSector,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1274	+ memmove(&iData[pos],&BackUpBootSector,2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1275	pos += 2;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1276	- memcpy(&iData[pos],FutureReserved,12);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1277	+ memmove(&iData[pos],FutureReserved,12);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1278	pos += 12;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1279	- memcpy(&iData[pos],&BootSectorDriveNumber,1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1280	+ memmove(&iData[pos],&BootSectorDriveNumber,1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1281	pos += 1;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1282	- memcpy(&iData[pos],&ReservedByte,1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1283	+ memmove(&iData[pos],&ReservedByte,1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1284	pos += 1;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1285	- memcpy(&iData[pos],&BootSignature,1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1286	+ memmove(&iData[pos],&BootSignature,1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1287	pos += 1;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1288	- memcpy(&iData[pos],&VolumeId,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1289	+ memmove(&iData[pos],&VolumeId,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1290	pos += 4;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1291	- memcpy(&iData[pos],VolumeLab,11);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1292	+ memmove(&iData[pos],VolumeLab,11);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1293	pos += 11;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1294	- memcpy(&iData[pos],FileSystemType,8);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1295	+ memmove(&iData[pos],FileSystemType,8);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1296	pos += 8;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1297	while(pos < BytesPerSector)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1298	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1299	@@ -159,7 +160,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1300	ComputeClusterSizeInBytes();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1301	ComputeRootDirSectors();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1302	ComputeBytesPerSector();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1303	- MessageHandler::ReportMessage (INFORMATION,BOOTSECTORCREATEMSG, "FAT32");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1304	+ MessageHandler::ReportMessage (INFORMATION,BOOTSECTORCREATEMSG, const_cast<char *>("FAT32"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1305	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1306
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1307	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1308	@@ -172,7 +173,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1309	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1310	void CFat32FileSystem::WriteBootSector(ofstream& aOutPutStream)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1311	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1312	- MessageHandler::ReportMessage (INFORMATION,BOOTSECTORWRITEMSG, "FAT32");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1313	+ MessageHandler::ReportMessage (INFORMATION,BOOTSECTORWRITEMSG, const_cast<char *>("FAT32"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1314	aOutPutStream.write(reinterpret_cast<char*>(&iData[0]),iFAT32BootSector.BytesPerSector());
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1315	aOutPutStream.flush();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1316	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1317	@@ -228,8 +229,9 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1318	// Each FAT32 entries occupies 4 bytes, hence multiply by 4
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1319	aFatString.append((totalFatEntries - clusterCounter)*4, 0);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1320	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1321	- MessageHandler::ReportMessage (INFORMATION,FATTABLEWRITEMSG,
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1322	- "FAT32");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1323	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1324	+ MessageHandler::ReportMessage (INFORMATION,FATTABLEWRITEMSG,const_cast<char *>("FAT32"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1325	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1326	//Write FAT table multiple times depending on the value of No of FATS set.
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1327	unsigned int noOfFats = iFAT32BootSector.NumberOfFats();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1328	for(unsigned int i=0; i<noOfFats; i++)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1329	@@ -254,19 +256,19 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1330	unsigned int bytesPerSector = iFAT32BootSector.BytesPerSector();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1331	FSinfoData = new unsigned char[bytesPerSector];
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1332	iFSInfo.SetFSInfo();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1333	- memcpy(&FSinfoData[counter], &iFSInfo.FSI_LeadSign,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1334	+ memmove(&FSinfoData[counter], &iFSInfo.FSI_LeadSign,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1335	counter += 4;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1336	- memcpy(&FSinfoData[counter], &iFSInfo.FSI_Reserved,480);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1337	+ memmove(&FSinfoData[counter], &iFSInfo.FSI_Reserved,480);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1338	counter += 480;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1339	- memcpy(&FSinfoData[counter], &iFSInfo.FSI_StrucSig,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1340	+ memmove(&FSinfoData[counter], &iFSInfo.FSI_StrucSig,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1341	counter += 4;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1342	- memcpy(&FSinfoData[counter], &iFSInfo.FSI_Free_Count,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1343	+ memmove(&FSinfoData[counter], &iFSInfo.FSI_Free_Count,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1344	counter += 4;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1345	- memcpy(&FSinfoData[counter], &iFSInfo.FSI_Nxt_Free,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1346	+ memmove(&FSinfoData[counter], &iFSInfo.FSI_Nxt_Free,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1347	counter += 4;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1348	- memcpy(&FSinfoData[counter], &iFSInfo.FSI_Reserved2,12);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1349	+ memmove(&FSinfoData[counter], &iFSInfo.FSI_Reserved2,12);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1350	counter += 12;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1351	- memcpy(&FSinfoData[counter], &iFSInfo.FSI_TrailSig,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1352	+ memmove(&FSinfoData[counter], &iFSInfo.FSI_TrailSig,4);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1353	counter += 4;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1354	counter += (bytesPerSector-KSizeOfFatBootSector);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1355	aOutPutStream.write(reinterpret_cast<char*>(&FSinfoData[0]),counter);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1356	@@ -367,11 +369,15 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1357	iTotalClusters = totalDataSectors / iFAT32BootSector.SectorsPerCluster();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1358	if(iTotalClusters < KMinimumFat32Clusters)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1359	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1360	- throw ErrorHandler(BOOTSECTORERROR,"Low Partition Size",__FILE__, __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1361	+ throw ErrorHandler(BOOTSECTORERROR,
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1362	+ const_cast<char *>("Low Partition Size"),
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1363	+ const_cast<char *>(__FILE__), __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1364	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1365	else if(iTotalClusters > KMaximumFat32Clusters)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1366	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1367	- throw ErrorHandler(BOOTSECTORERROR,"high Partition Size",__FILE__, __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1368	+ throw ErrorHandler(BOOTSECTORERROR,
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1369	+ const_cast<char *>("high Partition Size"),
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1370	+ const_cast<char *>(__FILE__), __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1371	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1372	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1373	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1374	@@ -424,7 +430,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1375	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1376	delete dirRegionPtr;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1377	dirRegionPtr = NULL;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1378	- throw ErrorHandler(UNKNOWNERROR, __FILE__, __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1379	+ throw ErrorHandler(UNKNOWNERROR, const_cast<char *>(__FILE__), __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1380	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1381	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1382
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1383	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fatbasebootsector.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fatbasebootsector.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1384	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fatbasebootsector.cpp 2010-05-10 19:22:13.769118155 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1385	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/fatbasebootsector.cpp 2010-05-08 14:43:16.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1386	@@ -22,6 +22,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1387	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1388
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1389	#include "fatbasebootsector.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1390	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1391
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1392	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1393	Constructor of the base boot sector class
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1394	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/filesysteminterface.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/filesysteminterface.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1395	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/filesysteminterface.cpp 2010-05-10 19:22:13.773117267 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1396	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/filesysteminterface.cpp 2010-05-08 14:41:36.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1397	@@ -62,7 +62,9 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1398	iOutputStream.open(aImageFileName,ios::out\|ios::binary);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1399	if(iOutputStream.fail() == true )
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1400	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1401	- throw ErrorHandler(FILEOPENERROR,aImageFileName,__FILE__, __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1402	+ throw ErrorHandler(FILEOPENERROR,
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1403	+ const_cast<char *>(aImageFileName),
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1404	+ const_cast<char *>(__FILE__), __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1405	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1406	switch(aFileSystem)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1407	{
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1408	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/longname.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/longname.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1409	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/longname.cpp 2010-05-10 19:22:13.773117267 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1410	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/longname.cpp 2010-05-08 14:45:46.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1411	@@ -21,6 +21,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1412
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1413
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1414	#include "longname.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1415	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1416
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1417
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1418	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1419	@@ -48,7 +49,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1420	iLongNameLength = iLongName.length();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1421	if(iLongNameLength == 0)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1422	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1423	- throw ErrorHandler(EMPTYFILENAME, __FILE__, __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1424	+ throw ErrorHandler(EMPTYFILENAME, const_cast<char *>(__FILE__), __LINE__);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1425	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1426	FormatLongFileName(iLongName);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1427	iShortName = GetShortEntryName();
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1428	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/messageimplementation.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/messageimplementation.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1429	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/messageimplementation.cpp 2010-05-10 19:22:13.773117267 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1430	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/filesystem/source/messageimplementation.cpp 2010-05-08 14:49:08.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1431	@@ -23,15 +23,17 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1432
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1433	#include "messageimplementation.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1434	#include "errorhandler.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1435	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1436
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1437	using std::endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1438	using std::cout;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1439	typedef std::string String;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1440
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1441	-char *errorMssgPrefix="FileSystem : Error:";
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1442	-char *warnMssgPrefix="FileSystem : Warning:";
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1443	-char *infoMssgPrefix="FileSystem : Information:";
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1444	-char *Space=" ";
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1445	+char const *errorMssgPrefix="FileSystem : Error:";
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1446	+char const *warnMssgPrefix="FileSystem : Warning:";
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1447	+char const *infoMssgPrefix="FileSystem : Information:";
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1448	+char const *Space=" ";
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1449	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1450
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1451	enum MessageArraySize{MAX=16};
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1452
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1453	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/host/h_utl.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/host/h_utl.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1454	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/host/h_utl.cpp 2010-05-10 19:22:13.777117566 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1455	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/host/h_utl.cpp 2010-05-08 14:36:18.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1456	@@ -177,7 +177,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1457
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1458
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1459	TInt build=0;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1460	- memset(&aVersion, sizeof(TVersion), 0);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1461	+ memset(&aVersion, 0, sizeof(TVersion));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1462	TInt i;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1463	TInt len=strlen(str);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1464	for (i=0; i<len; i++)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1465	@@ -192,7 +192,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1466	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1467	cout << "\n Warning: major version must be in range 0 - 127 \n";
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1468	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1469	- char* pMinor = strchr(str, '.');
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1470	+ char const * pMinor = strchr(str, '.');
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1471	if (pMinor)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1472	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1473	pMinor++;
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1474	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/inc/h_utl.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/inc/h_utl.h
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1475	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/inc/h_utl.h 2010-05-10 19:22:13.777117566 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1476	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/inc/h_utl.h 2010-05-08 14:39:00.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1477	@@ -65,9 +65,6 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1478	#define _stricmp strcasecmp
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1479	#define strnicmp strncasecmp
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1480
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1481	-// to fix the linux problem: memcpy does not work with overlapped areas.
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1482	-#define memcpy memmove
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1483	-
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1484	// hand-rolled strupr function for converting a string to all uppercase
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1485	char* strupr(char *a);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1486
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1487	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/parameterfileprocessor/source/parameterfileprocessor.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/parameterfileprocessor/source/parameterfileprocessor.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1488	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/parameterfileprocessor/source/parameterfileprocessor.cpp 2010-05-10 19:22:13.781117167 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1489	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/imglib/parameterfileprocessor/source/parameterfileprocessor.cpp 2010-05-08 14:35:28.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1490	@@ -21,6 +21,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1491
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1492
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1493	#include "parameterfileprocessor.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1494	+#include <cstring>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1495
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1496
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1497	/**
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1498	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/group/BLD.INF /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/group/BLD.INF
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1499	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/group/BLD.INF 2010-05-10 19:22:13.781117167 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1500	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/group/BLD.INF 2010-04-29 15:03:58.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1501	@@ -15,13 +15,14 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1502	*
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1503	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1504
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1505	+#include <productvariant.hrh>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1506
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1507	PRJ_PLATFORMS
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1508	TOOLS2
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1509
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1510	PRJ_EXPORTS
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1511
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1512	-../maksym/fixupsym.bat /epoc32/tools/fixupsym.bat
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1513	+../maksym/fixupsym.bat EPOCROOT_EXPORT_PATH(epoc32/tools/fixupsym.bat)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1514	../maksym/hpsym.bat /epoc32/tools/hpsym.bat
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1515	../maksym/maksym.bat /epoc32/tools/maksym.bat
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1516	../maksym/maksymrofs.bat /epoc32/tools/maksymrofs.bat
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1517	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/group/readimage.mmp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/group/readimage.mmp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1518	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/group/readimage.mmp 2010-05-10 19:22:13.781117167 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1519	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/group/readimage.mmp 2010-05-08 14:49:50.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1520	@@ -45,15 +45,16 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1521	userinclude ..\..\imglib\compress
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1522	userinclude ..\..\imglib\patchdataprocessor\include
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1523	userinclude ..\..\sisutils\inc
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1524	+#ifndef TOOLS2_LINUX
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1525	userinclude ..\..\imglib\boostlibrary
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1526	+#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1527
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1528	USERINCLUDE ..\..\imglib\inc
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1529	OS_LAYER_SYSTEMINCLUDE_SYMBIAN
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1530
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1531	staticlibrary sisutils
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1532	#ifdef TOOLS2_LINUX
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1533	-STATICLIBRARY boost_thread-mgw34-mt-1_39_linux
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1534	-OPTION GCC -pthread -O2 -Wno-uninitialized
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1535	+OPTION GCC -pthread -O2 -Wno-uninitialized -lboost_thread-mt
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1536	#else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1537	STATICLIBRARY boost_thread-mgw34-mt-1_39_win32
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1538	OPTION GCC -mthreads -O2 -Wno-uninitialized
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1539	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/inc/common.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/inc/common.h
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1540	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/inc/common.h 2010-05-10 19:22:13.785117675 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1541	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/inc/common.h 2010-05-08 15:01:02.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1542	@@ -46,7 +46,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1543	#define DLL_UID1 10000079
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1544	#define EXE_UID1 1000007a
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1545
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1546	-typedef enum EImageType
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1547	+enum EImageType
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1548	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1549	EUNKNOWN_IMAGE,
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1550	EROM_IMAGE,
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1551	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/inc/image_reader.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/inc/image_reader.h
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1552	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/inc/image_reader.h 2010-05-10 19:22:13.789117416 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1553	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/inc/image_reader.h 2010-05-08 15:02:34.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1554	@@ -27,7 +27,19 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1555
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1556
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1557	#include "common.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1558	-#include <direct.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1559	+#if defined(WIN32)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1560	+ #include <direct.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1561	+ #define GETCWD _getcwd
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1562	+ #define CHDIR _chdir
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1563	+ #define MKDIR(dir) _mkdir(dir)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1564	+#elif defined(__LINUX__)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1565	+ #include <sys/stat.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1566	+ #include <unistd.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1567	+ #define GETCWD getcwd
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1568	+ #define CHDIR chdir
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1569	+ #define MKDIR(dir) mkdir((dir),S_IRWXU \| S_IRWXG \| S_IROTH \| S_IXOTH)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1570	+#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1571	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1572	#include <map>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1573
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1574	typedef struct tag_FILEINFO
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1575	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/inc/rofs_image_reader.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/inc/rofs_image_reader.h
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1576	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/inc/rofs_image_reader.h 2010-05-10 19:22:13.789117416 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1577	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/inc/rofs_image_reader.h 2010-05-08 15:01:40.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1578	@@ -65,7 +65,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1579	void DumpDirStructure();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1580	void DumpFileAttributes();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1581	void MarkNodes();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1582	- void SetSeek(streampos aOff, ios::seek_dir aStartPos=ios::beg);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1583	+ void SetSeek(streampos aOff, std::ios_base::seekdir aStartPos);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1584	void ExtractImageContents();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1585	void CheckFileExtension(char* aFileName,TRomBuilderEntry* aEntry,TRomNode* aNode,ofstream& aLogFile );
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1586	void GetCompleteNodePath(TRomNode* aNode,string& aName,char* aAppStr);
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1587	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/e32_image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/e32_image_reader.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1588	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/e32_image_reader.cpp 2010-05-10 19:22:13.789117416 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1589	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/e32_image_reader.cpp 2010-05-08 15:00:20.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1590	@@ -74,27 +74,27 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1591	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1592	bool aContinue = true;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1593
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1594	- DumpInHex("Size", aE32Image.iSize ) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1595	- DumpInHex("Uids",aE32Image.iOrigHdr->iUid1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1596	- DumpInHex(" ",aE32Image.iOrigHdr->iUid2, aContinue);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1597	- DumpInHex(" ",aE32Image.iOrigHdr->iUid3, aContinue);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1598	- DumpInHex(" ",aE32Image.iOrigHdr->iUidChecksum, aContinue) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1599	-
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1600	-
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1601	- DumpInHex("Entry point", aE32Image.iOrigHdr->iEntryPoint ) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1602	- DumpInHex("Code start addr" ,aE32Image.iOrigHdr->iCodeBase)<< endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1603	- DumpInHex("Data start addr" ,aE32Image.iOrigHdr->iDataBase) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1604	- DumpInHex("Text size" ,aE32Image.iOrigHdr->iTextSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1605	- DumpInHex("Code size" ,aE32Image.iOrigHdr->iCodeSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1606	- DumpInHex("Data size" ,aE32Image.iOrigHdr->iDataSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1607	- DumpInHex("Bss size" ,aE32Image.iOrigHdr->iBssSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1608	- DumpInHex("Total data size" ,(aE32Image.iOrigHdr->iBssSize + aE32Image.iOrigHdr->iDataSize)) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1609	- DumpInHex("Heap min" ,aE32Image.iOrigHdr->iHeapSizeMin) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1610	- DumpInHex("Heap max" ,aE32Image.iOrigHdr->iHeapSizeMax) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1611	- DumpInHex("Stack size" ,aE32Image.iOrigHdr->iStackSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1612	- DumpInHex("Export directory" ,aE32Image.iOrigHdr->iExportDirOffset) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1613	- DumpInHex("Export dir count" ,aE32Image.iOrigHdr->iExportDirCount) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1614	- DumpInHex("Flags" ,aE32Image.iOrigHdr->iFlags) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1615	+ DumpInHex(const_cast<char *>("Size"), aE32Image.iSize ) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1616	+ DumpInHex(const_cast<char *>("Uids"),aE32Image.iOrigHdr->iUid1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1617	+ DumpInHex(const_cast<char *>(" "),aE32Image.iOrigHdr->iUid2, aContinue);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1618	+ DumpInHex(const_cast<char *>(" "),aE32Image.iOrigHdr->iUid3, aContinue);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1619	+ DumpInHex(const_cast<char *>(" "),aE32Image.iOrigHdr->iUidChecksum, aContinue) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1620	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1621	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1622	+ DumpInHex(const_cast<char *>("Entry point"), aE32Image.iOrigHdr->iEntryPoint ) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1623	+ DumpInHex(const_cast<char *>("Code start addr") ,aE32Image.iOrigHdr->iCodeBase)<< endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1624	+ DumpInHex(const_cast<char *>("Data start addr") ,aE32Image.iOrigHdr->iDataBase) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1625	+ DumpInHex(const_cast<char *>("Text size") ,aE32Image.iOrigHdr->iTextSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1626	+ DumpInHex(const_cast<char *>("Code size") ,aE32Image.iOrigHdr->iCodeSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1627	+ DumpInHex(const_cast<char *>("Data size") ,aE32Image.iOrigHdr->iDataSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1628	+ DumpInHex(const_cast<char *>("Bss size") ,aE32Image.iOrigHdr->iBssSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1629	+ DumpInHex(const_cast<char *>("Total data size") ,(aE32Image.iOrigHdr->iBssSize + aE32Image.iOrigHdr->iDataSize)) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1630	+ DumpInHex(const_cast<char *>("Heap min") ,aE32Image.iOrigHdr->iHeapSizeMin) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1631	+ DumpInHex(const_cast<char *>("Heap max") ,aE32Image.iOrigHdr->iHeapSizeMax) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1632	+ DumpInHex(const_cast<char *>("Stack size") ,aE32Image.iOrigHdr->iStackSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1633	+ DumpInHex(const_cast<char *>("Export directory") ,aE32Image.iOrigHdr->iExportDirOffset) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1634	+ DumpInHex(const_cast<char *>("Export dir count") ,aE32Image.iOrigHdr->iExportDirCount) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1635	+ DumpInHex(const_cast<char *>("Flags") ,aE32Image.iOrigHdr->iFlags) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1636
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1637	TUint aHeaderFmt = E32ImageHeader::HdrFmtFromFlags(aE32Image.iOrigHdr->iFlags);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1638
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1639	@@ -105,10 +105,10 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1640	// because this is relied on by used by "Symbian Signed".
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1641	//
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1642	E32ImageHeaderV* v = aE32Image.iHdr;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1643	- DumpInHex("Secure ID", v->iS.iSecureId) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1644	- DumpInHex("Vendor ID", v->iS.iVendorId) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1645	- DumpInHex("Capability", v->iS.iCaps[1]);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1646	- DumpInHex(" ", v->iS.iCaps[0], aContinue) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1647	+ DumpInHex(const_cast<char *>("Secure ID"), v->iS.iSecureId) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1648	+ DumpInHex(const_cast<char *>("Vendor ID"), v->iS.iVendorId) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1649	+ DumpInHex(const_cast<char *>("Capability"), v->iS.iCaps[1]);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1650	+ DumpInHex(const_cast<char *>(" "), v->iS.iCaps[0], aContinue) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1651
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1652	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1653
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1654	@@ -119,15 +119,17 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1655	*out << "(" << dec << aE32Image.iOrigHdr->iToolsVersion.iBuild << ")" << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1656
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1657	*out << "Module Version.............." << dec << (aE32Image.iOrigHdr->iModuleVersion >> 16) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1658	- DumpInHex("Compression", aE32Image.iOrigHdr->iCompressionType) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1659	+ DumpInHex(const_cast<char *>("Compression"), aE32Image.iOrigHdr->iCompressionType) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1660
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1661	if( aHeaderFmt >= KImageHdrFmt_V )
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1662	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1663	E32ImageHeaderV* v = aE32Image.iHdr;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1664	- DumpInHex("Exception Descriptor", v->iExceptionDescriptor) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1665	- DumpInHex("Code offset", v->iCodeOffset) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1666	+ DumpInHex(const_cast<char *>("Exception Descriptor"), v->iExceptionDescriptor) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1667	+ DumpInHex(const_cast<char *>("Code offset"), v->iCodeOffset) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1668	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1669	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1670
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1671	*out << "Priority...................." << dec << aE32Image.iOrigHdr->iProcessPriority << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1672	- DumpInHex("Dll ref table size", aE32Image.iOrigHdr->iDllRefTableCount) << endl << endl << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1673	+ DumpInHex(const_cast<char *>("Dll ref table size"), aE32Image.iOrigHdr->iDllRefTableCount) << endl << endl << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1674	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1675	+
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1676	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/image_handler.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/image_handler.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1677	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/image_handler.cpp 2010-05-10 19:22:13.789117416 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1678	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/image_handler.cpp 2010-05-08 14:59:02.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1679	@@ -392,7 +392,8 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1680	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1681	if(iInputFileName.empty())
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1682	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1683	- throw SisUtilsException("Usage Error", "No SIS file passed");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1684	+ throw SisUtilsException(const_cast<char *>("Usage Error"),
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1685	+ const_cast<char *>("No SIS file passed"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1686	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1687
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1688	iSisUtils = new Sis2Iby((char*)iInputFileName.c_str());
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1689	@@ -409,7 +410,8 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1690	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1691	else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1692	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1693	- throw SisUtilsException("Error:", "Cannot create Sis2Iby object");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1694	+ throw SisUtilsException(const_cast<char *>("Error:"),
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1695	+ const_cast<char *>("Cannot create Sis2Iby object"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1696	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1697	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1698	}
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1699	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/image_reader.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1700	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/image_reader.cpp 2010-05-10 19:22:13.789117416 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1701	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/image_reader.cpp 2010-05-08 14:57:10.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1702	@@ -173,7 +173,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1703
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1704
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1705	// get the current working directory and store in buffer.
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1706	- if( _getcwd(currWorkingDir,_MAX_BUFFER_SIZE_) == NULL )
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1707	+ if( GETCWD(currWorkingDir,_MAX_BUFFER_SIZE_) == NULL )
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1708	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1709	// throw an exception if unable to get current working directory information.
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1710	throw ImageReaderException((char*)ImageReader::iImgFileName.c_str(), "Failed to get the current working directory");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1711	@@ -191,7 +191,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1712	changeToDrive.append(aDelimiter);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1713
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1714	// change the current working directory to the specified directory.
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1715	- if( _chdir(changeToDrive.c_str()) )
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1716	+ if( CHDIR(changeToDrive.c_str()) )
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1717	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1718	// throw an exception if unable to change the directory specified.
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1719	throw ImageReaderException((char*)ImageReader::iImgFileName.c_str(), "Failed to change to the directory specified");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1720	@@ -200,23 +200,23 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1721	else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1722	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1723	// if not,then create a cPtr directory.
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1724	- _mkdir(cPtr);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1725	+ MKDIR(cPtr);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1726	// change the current working directory to cPtr.
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1727	- _chdir(cPtr);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1728	+ int r = CHDIR(cPtr); (void)r;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1729	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1730	// repeat till cPtr is NULL.
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1731	while (cPtr!=NULL)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1732	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1733	- if (cPtr = strtok(NULL,aDelimiter))
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1734	+ if ((cPtr = strtok(NULL,aDelimiter)) != NULL)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1735	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1736	// create the directory.
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1737	- _mkdir(cPtr);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1738	+ MKDIR(cPtr);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1739	// change current working directory.
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1740	- _chdir(cPtr);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1741	+ int r = CHDIR(cPtr); (void)r;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1742	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1743	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1744	// revert back the working directory.
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1745	- _chdir(currWorkingDir);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1746	+ int r = CHDIR(currWorkingDir); (void)r;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1747	// replace the source path with the original path information.
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1748	strcpy(aSrcPath,origPath.c_str());
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1749	delete[] currWorkingDir;
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1750	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/rofs_image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/rofs_image_reader.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1751	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/rofs_image_reader.cpp 2010-05-10 19:22:13.789117416 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1752	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/rofs_image_reader.cpp 2010-05-08 14:58:12.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1753	@@ -42,7 +42,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1754	delete iImageReader;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1755	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1756
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1757	-void RofsImageReader::SetSeek(streampos aOff, ios::seek_dir aStartPos)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1758	+void RofsImageReader::SetSeek(streampos aOff, std::ios_base::seekdir aStartPos)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1759	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1760	if(!iInputFile)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1761	return;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1762	@@ -290,7 +290,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1763
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1764	out << "*******************************************************************" << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1765	iPath.assign((char*)aNode->iName);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1766	- GetCompleteNodePath(aNode,iPath,"/");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1767	+ GetCompleteNodePath(aNode,iPath,const_cast<char *>("/"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1768	*out << "File........................" << iPath.c_str() << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1769	if( aNode->iEntry->iExecutable )
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1770	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1771	@@ -417,7 +417,8 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1772	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1773	// get the complete path
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1774	path.assign( (char*)aNode->iName );
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1775	- GetCompleteNodePath( aNode, path, "\\\\" );
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1776	+ GetCompleteNodePath( aNode, path, const_cast<char *>("\\\\") );
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1777	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1778	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1779	else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1780	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1781	@@ -496,7 +497,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1782	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1783	// get the complete path
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1784	path.assign( (char*)aNode->iName );
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1785	- GetCompleteNodePath( aNode, path, "\\" );
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1786	+ GetCompleteNodePath( aNode, path, const_cast<char *>("\\") );
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1787	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1788	else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1789	{
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1790	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/rom_image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/rom_image_reader.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1791	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/rom_image_reader.cpp 2010-05-10 19:22:13.789117416 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	1792	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/readimage/src/rom_image_reader.cpp 2010-05-08 14:55:36.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1793	@@ -20,6 +20,12 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1794	#include <e32rom.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1795	#include "rom_image_reader.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1796	#include "r_rom.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1797	+#if defined(WIN32)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1798	+ #define ALLOCA _alloca
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1799	+#elif defined(__LINUX__)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1800	+ #include <alloca.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1801	+ #define ALLOCA alloca
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1802	+#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1803
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1804	void InflateUnCompress(unsigned char* source, int sourcesize, unsigned char* dest, int destsize);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1805	RomImageFSEntry::RomImageFSEntry (const char* aName) : iName(aName), iSibling(0), iChildren(0) {
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1806	@@ -86,59 +92,60 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1807
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1808	*out << endl << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1809
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1810	- DumpInHex("Timestamp", (iRomHdr->iTime >> 32)) ;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1811	- DumpInHex(" ", (iRomHdr->iTime &0xffffffff), aContinue) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1812	+ DumpInHex(const_cast<char *>("Timestamp"), (iRomHdr->iTime >> 32)) ;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1813	+ DumpInHex(const_cast<char *>(" "), (iRomHdr->iTime &0xffffffff), aContinue) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1814
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1815	- DumpInHex("RomBase", iRomHdr->iRomBase) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1816	+ DumpInHex(const_cast<char *>("RomBase"), iRomHdr->iRomBase) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1817
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1818	- DumpInHex("RomSize", iRomHdr->iRomSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1819	- DumpInHex("KernelDataAddress", iRomHdr->iKernDataAddress) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1820	- DumpInHex("KernelLimit", iRomHdr->iKernelLimit) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1821	- DumpInHex("PrimaryFile", iRomHdr->iPrimaryFile) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1822	- DumpInHex("SecondaryFile", iRomHdr->iSecondaryFile) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1823	- DumpInHex("CheckSum", iRomHdr->iCheckSum) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1824	- DumpInHex("Hardware", iRomHdr->iHardware) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1825	-
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1826	- DumpInHex("Language", (TUint)(iRomHdr->iLanguage >> 32));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1827	- DumpInHex(" ", ((TUint)(iRomHdr->iLanguage & 0xffffffff)), aContinue) <<endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1828	-
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1829	- DumpInHex("KernelConfigFlags", iRomHdr->iKernelConfigFlags) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1830	- DumpInHex("RomExceptionSearchTable", iRomHdr->iRomExceptionSearchTable) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1831	- DumpInHex("RomHeaderSize", iRomHdr->iRomHeaderSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1832	- DumpInHex("RomSectionHeader", iRomHdr->iRomSectionHeader) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1833	- DumpInHex("TotalSvDataSize", iRomHdr->iTotalSvDataSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1834	- DumpInHex("VariantFile", iRomHdr->iVariantFile) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1835	- DumpInHex("ExtensionFile", iRomHdr->iExtensionFile) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1836	- DumpInHex("RelocInfo", iRomHdr->iRelocInfo) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1837	- DumpInHex("OldTraceMask", iRomHdr->iOldTraceMask) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1838	- DumpInHex("UserDataAddress", iRomHdr->iUserDataAddress) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1839	- DumpInHex("TotalUserDataSize", iRomHdr->iTotalUserDataSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1840	- DumpInHex("DebugPort", iRomHdr->iDebugPort) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1841	-
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1842	- DumpInHex("Version", iRomHdr->iVersion.iMajor, false, 2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1843	- DumpInHex(".", iRomHdr->iVersion.iMinor, aContinue, 2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1844	- DumpInHex("(" ,iRomHdr->iVersion.iBuild, aContinue, 2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1845	+ DumpInHex(const_cast<char *>("RomSize"), iRomHdr->iRomSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1846	+ DumpInHex(const_cast<char *>("KernelDataAddress"), iRomHdr->iKernDataAddress) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1847	+ DumpInHex(const_cast<char *>("KernelLimit"), iRomHdr->iKernelLimit) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1848	+ DumpInHex(const_cast<char *>("PrimaryFile"), iRomHdr->iPrimaryFile) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1849	+ DumpInHex(const_cast<char *>("SecondaryFile"), iRomHdr->iSecondaryFile) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1850	+ DumpInHex(const_cast<char *>("CheckSum"), iRomHdr->iCheckSum) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1851	+ DumpInHex(const_cast<char *>("Hardware"), iRomHdr->iHardware) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1852	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1853	+ DumpInHex(const_cast<char *>("Language"), (TUint)(iRomHdr->iLanguage >> 32));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1854	+ DumpInHex(const_cast<char *>(" "), ((TUint)(iRomHdr->iLanguage & 0xffffffff)), aContinue) <<endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1855	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1856	+ DumpInHex(const_cast<char *>("KernelConfigFlags"), iRomHdr->iKernelConfigFlags) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1857	+ DumpInHex(const_cast<char *>("RomExceptionSearchTable"), iRomHdr->iRomExceptionSearchTable) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1858	+ DumpInHex(const_cast<char *>("RomHeaderSize"), iRomHdr->iRomHeaderSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1859	+ DumpInHex(const_cast<char *>("RomSectionHeader"), iRomHdr->iRomSectionHeader) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1860	+ DumpInHex(const_cast<char *>("TotalSvDataSize"), iRomHdr->iTotalSvDataSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1861	+ DumpInHex(const_cast<char *>("VariantFile"), iRomHdr->iVariantFile) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1862	+ DumpInHex(const_cast<char *>("ExtensionFile"), iRomHdr->iExtensionFile) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1863	+ DumpInHex(const_cast<char *>("RelocInfo"), iRomHdr->iRelocInfo) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1864	+ DumpInHex(const_cast<char *>("OldTraceMask"), iRomHdr->iOldTraceMask) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1865	+ DumpInHex(const_cast<char *>("UserDataAddress"), iRomHdr->iUserDataAddress) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1866	+ DumpInHex(const_cast<char *>("TotalUserDataSize"), iRomHdr->iTotalUserDataSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1867	+ DumpInHex(const_cast<char *>("DebugPort"), iRomHdr->iDebugPort) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1868	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1869	+ DumpInHex(const_cast<char *>("Version"), iRomHdr->iVersion.iMajor, false, 2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1870	+ DumpInHex(const_cast<char *>("."), iRomHdr->iVersion.iMinor, aContinue, 2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1871	+ DumpInHex(const_cast<char *>("(") ,iRomHdr->iVersion.iBuild, aContinue, 2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1872	*out << ")" << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1873
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1874	- DumpInHex("CompressionType", iRomHdr->iCompressionType) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1875	- DumpInHex("CompressedSize", iRomHdr->iCompressedSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1876	- DumpInHex("UncompressedSize", iRomHdr->iUncompressedSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1877	- DumpInHex("HcrFileAddress", iRomHdr->iHcrFileAddress) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1878	+ DumpInHex(const_cast<char *>("CompressionType"), iRomHdr->iCompressionType) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1879	+ DumpInHex(const_cast<char *>("CompressedSize"), iRomHdr->iCompressedSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1880	+ DumpInHex(const_cast<char *>("UncompressedSize"), iRomHdr->iUncompressedSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1881	+ DumpInHex(const_cast<char *>("HcrFileAddress"), iRomHdr->iHcrFileAddress) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1882
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1883	- DumpInHex("DisabledCapabilities", iRomHdr->iDisabledCapabilities[0]);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1884	- DumpInHex(" ", iRomHdr->iDisabledCapabilities[1], aContinue) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1885	+ DumpInHex(const_cast<char *>("DisabledCapabilities"), iRomHdr->iDisabledCapabilities[0]);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1886	+ DumpInHex(const_cast<char *>(" "), iRomHdr->iDisabledCapabilities[1], aContinue) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1887	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1888	+ DumpInHex(const_cast<char *>("TraceMask"), iRomHdr->iTraceMask[0]);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1889
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1890	- DumpInHex("TraceMask", iRomHdr->iTraceMask[0]);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1891	aPos = 1;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1892	while( aPos < (TUint)KNumTraceMaskWords)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1893	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1894	if(iRomHdr->iTraceMask[aPos])
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1895	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1896	- DumpInHex(" ", iRomHdr->iTraceMask[aPos++], aContinue);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1897	+ DumpInHex(const_cast<char *>(" "), iRomHdr->iTraceMask[aPos++], aContinue);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1898	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1899	else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1900	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1901	- DumpInHex(" ", iRomHdr->iTraceMask[aPos++], aContinue, 1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1902	+ DumpInHex(const_cast<char *>(" "), iRomHdr->iTraceMask[aPos++], aContinue, 1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1903	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1904
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1905	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1906	@@ -151,22 +158,22 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1907	*out << "Extension ROM Image" << endl << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1908	bool aContinue = true;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1909
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1910	- DumpInHex("Timestamp", (iExtRomHdr->iTime >> 32)) ;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1911	- DumpInHex(" ", (iExtRomHdr->iTime &0xffffffff), aContinue) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1912	+ DumpInHex(const_cast<char *>("Timestamp"), (iExtRomHdr->iTime >> 32)) ;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1913	+ DumpInHex(const_cast<char *>(" "), (iExtRomHdr->iTime &0xffffffff), aContinue) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1914
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1915	- DumpInHex("RomBase", iExtRomHdr->iRomBase) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1916	+ DumpInHex(const_cast<char *>("RomBase"), iExtRomHdr->iRomBase) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1917
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1918	- DumpInHex("RomSize", iExtRomHdr->iRomSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1919	- DumpInHex("CheckSum", iExtRomHdr->iCheckSum) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1920	+ DumpInHex(const_cast<char *>("RomSize"), iExtRomHdr->iRomSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1921	+ DumpInHex(const_cast<char *>("CheckSum"), iExtRomHdr->iCheckSum) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1922
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1923	- DumpInHex("Version", iExtRomHdr->iVersion.iMajor, false, 2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1924	- DumpInHex(".", iExtRomHdr->iVersion.iMinor, aContinue, 2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1925	- DumpInHex("(" ,iExtRomHdr->iVersion.iBuild, aContinue, 2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1926	+ DumpInHex(const_cast<char *>("Version"), iExtRomHdr->iVersion.iMajor, false, 2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1927	+ DumpInHex(const_cast<char *>("."), iExtRomHdr->iVersion.iMinor, aContinue, 2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1928	+ DumpInHex(const_cast<char *>("(") ,iExtRomHdr->iVersion.iBuild, aContinue, 2);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1929	*out << ")" << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1930
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1931	- DumpInHex("CompressionType", iExtRomHdr->iCompressionType) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1932	- DumpInHex("CompressedSize", iExtRomHdr->iCompressedSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1933	- DumpInHex("UncompressedSize", iExtRomHdr->iUncompressedSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1934	+ DumpInHex(const_cast<char *>("CompressionType"), iExtRomHdr->iCompressionType) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1935	+ DumpInHex(const_cast<char *>("CompressedSize"), iExtRomHdr->iCompressedSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1936	+ DumpInHex(const_cast<char *>("UncompressedSize"), iExtRomHdr->iUncompressedSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1937
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1938	*out << endl << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1939
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1940	@@ -495,7 +502,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1941
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1942	void RomImageReader::Name(string& aName, const wchar_t* aUnicodeName, TUint aLen)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1943	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1944	- char* temp = (char*)_alloca((aLen << 1) + 1) ;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1945	+ char* temp = (char*)ALLOCA((aLen << 1) + 1) ;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1946	size_t n = wcsrtombs(temp,&aUnicodeName,aLen,NULL);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1947	if(n == (size_t)-1){ // the unicode string can not be coverted.
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1948	aName = "???";
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1949	@@ -576,31 +583,31 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1950	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1951	bool aContinue = true;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1952
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1953	- DumpInHex("Load Address", aEntry->iTRomEntryPtr->iAddressLin) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1954	- DumpInHex("Size", aEntry->iTRomEntryPtr->iSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1955	+ DumpInHex(const_cast<char *>("Load Address"), aEntry->iTRomEntryPtr->iAddressLin) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1956	+ DumpInHex(const_cast<char *>("Size"), aEntry->iTRomEntryPtr->iSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1957
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1958	TRomImageHeader *aRomImgEntry = aEntry->ImagePtr.iRomFileEntry;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1959
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1960	if( !aRomImgEntry )
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1961	return;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1962	//UIDs
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1963	- DumpInHex("Uids", aRomImgEntry->iUid1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1964	- DumpInHex(" ", aRomImgEntry->iUid2, aContinue);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1965	- DumpInHex(" ", aRomImgEntry->iUid3, aContinue);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1966	- DumpInHex(" ", aRomImgEntry->iUidChecksum, aContinue) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1967	-
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1968	- DumpInHex("Entry point", aRomImgEntry->iEntryPoint) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1969	- DumpInHex("Code start addr", aRomImgEntry->iCodeAddress) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1970	- DumpInHex("Data start addr", aRomImgEntry->iDataAddress) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1971	- DumpInHex("DataBssLinearBase", aRomImgEntry->iDataBssLinearBase) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1972	- DumpInHex("Text size", aRomImgEntry->iTextSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1973	- DumpInHex("Code size", aRomImgEntry->iCodeSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1974	- DumpInHex("Data size", aRomImgEntry->iDataSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1975	- DumpInHex("Bss size", (aRomImgEntry->iBssSize)) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1976	- DumpInHex("Total data size", aRomImgEntry->iTotalDataSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1977	- DumpInHex("Heap min", aRomImgEntry->iHeapSizeMin) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1978	- DumpInHex("Heap max", aRomImgEntry->iHeapSizeMax) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1979	- DumpInHex("Stack size", aRomImgEntry->iStackSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1980	+ DumpInHex(const_cast<char *>("Uids"), aRomImgEntry->iUid1);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1981	+ DumpInHex(const_cast<char *>(" "), aRomImgEntry->iUid2, aContinue);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1982	+ DumpInHex(const_cast<char *>(" "), aRomImgEntry->iUid3, aContinue);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1983	+ DumpInHex(const_cast<char *>(" "), aRomImgEntry->iUidChecksum, aContinue) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1984	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1985	+ DumpInHex(const_cast<char *>("Entry point"), aRomImgEntry->iEntryPoint) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1986	+ DumpInHex(const_cast<char *>("Code start addr"), aRomImgEntry->iCodeAddress) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1987	+ DumpInHex(const_cast<char *>("Data start addr"), aRomImgEntry->iDataAddress) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1988	+ DumpInHex(const_cast<char *>("DataBssLinearBase"), aRomImgEntry->iDataBssLinearBase) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1989	+ DumpInHex(const_cast<char *>("Text size"), aRomImgEntry->iTextSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1990	+ DumpInHex(const_cast<char *>("Code size"), aRomImgEntry->iCodeSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1991	+ DumpInHex(const_cast<char *>("Data size"), aRomImgEntry->iDataSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1992	+ DumpInHex(const_cast<char *>("Bss size"), (aRomImgEntry->iBssSize)) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1993	+ DumpInHex(const_cast<char *>("Total data size"), aRomImgEntry->iTotalDataSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1994	+ DumpInHex(const_cast<char *>("Heap min"), aRomImgEntry->iHeapSizeMin) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1995	+ DumpInHex(const_cast<char *>("Heap max"), aRomImgEntry->iHeapSizeMax) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1996	+ DumpInHex(const_cast<char *>("Stack size"), aRomImgEntry->iStackSize) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1997
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1998	TDllRefTable *aRefTbl = NULL;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	1999
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2000	@@ -608,18 +615,18 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2001	TUint32 aOff = (TUint32)aRomImgEntry->iDllRefTable - iImageHeader->iRomHdr->iRomBase;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2002	aRefTbl = (TDllRefTable) ((char)iImageHeader->iRomHdr + aOff);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2003	TUint32 aVirtualAddr = (TUint32)aRefTbl->iEntry[0];
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2004	- DumpInHex("Dll ref table", aVirtualAddr) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2005	+ DumpInHex(const_cast<char *>("Dll ref table"), aVirtualAddr) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2006	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2007
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2008	- DumpInHex("Export directory", aRomImgEntry->iExportDir) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2009	- DumpInHex("Export dir count", aRomImgEntry->iExportDirCount) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2010	- DumpInHex("Hardware variant", aRomImgEntry->iHardwareVariant) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2011	- DumpInHex("Flags", aRomImgEntry->iFlags) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2012	- DumpInHex("Secure ID", aRomImgEntry->iS.iSecureId) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2013	- DumpInHex("Vendor ID", aRomImgEntry->iS.iVendorId) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2014	+ DumpInHex(const_cast<char *>("Export directory"), aRomImgEntry->iExportDir) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2015	+ DumpInHex(const_cast<char *>("Export dir count"), aRomImgEntry->iExportDirCount) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2016	+ DumpInHex(const_cast<char *>("Hardware variant"), aRomImgEntry->iHardwareVariant) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2017	+ DumpInHex(const_cast<char *>("Flags"), aRomImgEntry->iFlags) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2018	+ DumpInHex(const_cast<char *>("Secure ID"), aRomImgEntry->iS.iSecureId) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2019	+ DumpInHex(const_cast<char *>("Vendor ID"), aRomImgEntry->iS.iVendorId) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2020
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2021	- DumpInHex("Capability", aRomImgEntry->iS.iCaps[1]);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2022	- DumpInHex(" ", aRomImgEntry->iS.iCaps[0], aContinue) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2023	+ DumpInHex(const_cast<char *>("Capability"), aRomImgEntry->iS.iCaps[1]);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2024	+ DumpInHex(const_cast<char *>(" "), aRomImgEntry->iS.iCaps[0], aContinue) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2025
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2026	*out << "Tools Version..............." << dec << (TUint)aRomImgEntry->iToolsVersion.iMajor;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2027	*out << "." ;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2028	@@ -630,13 +637,13 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2029	*out << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2030
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2031	*out << "Module Version.............." << dec << (aRomImgEntry->iModuleVersion >> 16) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2032	- DumpInHex("Exception Descriptor", aRomImgEntry->iExceptionDescriptor) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2033	+ DumpInHex(const_cast<char *>("Exception Descriptor"), aRomImgEntry->iExceptionDescriptor) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2034	*out << "Priority...................." << dec << aRomImgEntry->iPriority << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2035
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2036	if( aRefTbl )
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2037	- DumpInHex("Dll ref table size", aRefTbl->iNumberOfEntries*8) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2038	+ DumpInHex(const_cast<char >("Dll ref table size"), aRefTbl->iNumberOfEntries8) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2039	else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2040	- DumpInHex("Dll ref table size", 0) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2041	+ DumpInHex(const_cast<char *>("Dll ref table size"), 0) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2042
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2043	if( iDisplayOptions & DUMP_E32_IMG_FLAG){
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2044	if(stricmp(iE32ImgFileName.c_str(), aEntry->Name()) == 0){
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2045	@@ -695,8 +702,8 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2046	*out << left << prefix;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2047	out->width(40);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2048	*out << right << file->Name() << "[" ;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2049	- DumpInHex( "", aRomImgEntry->iHardwareVariant, true) << "] ";
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2050	- DumpInHex( " DataSize=", (aRomImgEntry->iBssSize + aRomImgEntry->iDataSize), true) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2051	+ DumpInHex( const_cast<char *>(""), aRomImgEntry->iHardwareVariant, true) << "] ";
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2052	+ DumpInHex( const_cast<char *>(" DataSize="), (aRomImgEntry->iBssSize + aRomImgEntry->iDataSize), true) << endl;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2053
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2054	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2055
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2056	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_build.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_build.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2057	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_build.cpp 2010-05-10 19:22:13.793117226 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2058	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_build.cpp 2010-05-08 15:04:00.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2059	@@ -29,7 +29,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2060
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2061	#if defined(__MSVCDOTNET__) \|\| defined(__TOOLS2__)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2062	#include <iomanip>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2063	- #include <strstream>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2064	+ #include <sstream>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2065	#else //!__MSVCDOTNET__
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2066	#include <iomanip.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2067	#endif //__MSVCDOTNET__
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2068	@@ -1218,22 +1218,11 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2069	f.UpdateHeaderCrc();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2070	if (overflow)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2071	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2072	- char * buffer = new char [size];
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2073	- // need to check if the compressed file will fit in the image
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2074	- #if defined(__LINUX__)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2075	- ostrstream os((char*)aDest, aMaxSize, (ios::openmode)(ios::out+ios::binary));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2076	- #elif defined(__TOOLS2__) && defined (_STLP_THREADS)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2077	- ostrstream os((char*)buffer, size,(ios::out+ios::binary));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2078	- #elif defined( __TOOLS2__)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2079	- ostrstream os((char*)buffer, size,(ios::out+ios::binary));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2080	- #else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2081	- ostrstream os( (char*)buffer, size, (ios::out+ios::binary));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2082	- #endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2083	+ ostringstream os(ios_base::out\|ios_base::binary);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2084	os << f;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2085	- TUint compressedSize = os.pcount();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2086	+ TUint compressedSize = os.str().size();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2087	if (compressedSize <= aMaxSize)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2088	overflow = EFalse;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2089	- delete[] buffer;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2090	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2091	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2092	if (overflow)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2093	@@ -1242,15 +1231,9 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2094	Print(EError, "Overflowed by approximately 0x%x bytes.\n", size - aMaxSize);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2095	exit(667);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2096	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2097	- #if defined(__TOOLS2__) && defined (_STLP_THREADS)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2098	- ostrstream os((char*)aDest, aMaxSize,(ios::out+ios::binary));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2099	- #elif __TOOLS2__
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2100	- ostrstream os((char*)aDest, aMaxSize, (std::_Ios_Openmode)(ios::out+ios::binary));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2101	- #else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2102	- ostrstream os((char*)aDest, aMaxSize, (ios::out+ios::binary));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2103	- #endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2104	+ ostringstream os(ios_base::out\|ios_base::binary);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2105	os << f;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2106	- size = os.pcount();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2107	+ size = os.str().size();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2108	compression = f.iHdr->CompressionType();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2109	memcpy(&iUids[0], aDest, sizeof(iUids));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2110	}
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2111	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_coreimage.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_coreimage.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2112	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_coreimage.cpp 2010-05-10 19:22:13.793117226 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2113	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_coreimage.cpp 2010-05-08 15:06:54.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2114	@@ -99,7 +99,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2115	TInt RCoreImageReader::ReadIdentifier()
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2116	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2117	int itemsRead = fread(&iIdentifier, sizeof(TUint8), K_ID_SIZE, iCoreImage);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2118	- TInt result = ImageError(itemsRead, K_ID_SIZE, "Read Identifier");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2119	+ TInt result = ImageError(itemsRead, K_ID_SIZE, const_cast<char *>("Read Identifier"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2120	if (result != KErrNone)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2121	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2122	iIdentifier[0] = 0;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2123	@@ -117,7 +117,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2124	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2125	int itemsRead = fread (&aHeader.iHeaderSize,
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2126	(sizeof(TRofsHeader)) - K_ID_SIZE*sizeof(TUint8), 1, iCoreImage);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2127	- TInt result = ImageError(itemsRead, 1, "Read Core Header");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2128	+ TInt result = ImageError(itemsRead, 1, const_cast<char *>("Read Core Header"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2129	if (result == KErrNone)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2130	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2131	// copy the previously read identifier into the header
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2132	@@ -137,7 +137,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2133	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2134	int itemsRead = fread (&aHeader.iHeaderSize,
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2135	(sizeof(TExtensionRofsHeader)) - K_ID_SIZE*sizeof(TUint8), 1, iCoreImage);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2136	- TInt result = ImageError(itemsRead, 1, "Read Extension Header");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2137	+ TInt result = ImageError(itemsRead, 1, const_cast<char *>("Read Extension Header"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2138	if (result == KErrNone)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2139	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2140	// copy the previously read identifier into the header
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2141	@@ -199,7 +199,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2142	// is read later when handling subdirectories
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2143	int bytesRead = sizeof(TRofsDir) - sizeof(TRofsEntry);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2144	int itemsRead = fread (&aDir, bytesRead , 1, iCoreImage);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2145	- if (ImageError(itemsRead, 1, "Read Dir") == KErrNone)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2146	+ if (ImageError(itemsRead, 1, const_cast<char *>("Read Dir")) == KErrNone)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2147	return bytesRead;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2148	else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2149	return 0;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2150	@@ -233,13 +233,13 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2151	// need to work out how big entry needs to be from the Struct Size
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2152	// in TRofsEntry
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2153	int itemsRead = fread(&aEntry.iStructSize, sizeof(TUint16), 1, iCoreImage);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2154	- int result = ImageError(itemsRead, 1, "Read Entry Size");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2155	+ int result = ImageError(itemsRead, 1, const_cast<char *>("Read Entry Size"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2156	if (result == KErrNone)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2157	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2158	// read rest of entry excluding the iStructSize
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2159	itemsRead = fread(&aEntry.iUids[0], sizeof(TRofsEntry) -sizeof(TUint16),
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2160	1, iCoreImage);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2161	- result = ImageError(itemsRead, 1, "Rest of Entry");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2162	+ result = ImageError(itemsRead, 1, const_cast<char *>("Rest of Entry"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2163	// return length read - this include includes iStructSize and first char of name
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2164	if (result == KErrNone)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2165	return sizeof(TRofsEntry);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2166	@@ -270,7 +270,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2167	TInt RCoreImageReader::ReadRofEntryName(TUint16* aName, int aLength)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2168	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2169	int itemsRead = fread(aName, sizeof(TUint16), aLength, iCoreImage);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2170	- return ImageError(itemsRead, aLength, "Rof Entry Name");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2171	+ return ImageError(itemsRead, aLength, const_cast<char *>("Rof Entry Name"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2172	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2173
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2174	/**
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2175	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_driveimage.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_driveimage.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2176	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_driveimage.cpp 2010-05-10 19:22:13.793117226 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2177	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_driveimage.cpp 2010-04-21 13:27:26.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2178	@@ -254,7 +254,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2179	fileName.append("/");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2180
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2181	// Go through each entry
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2182	- while(dirEntry = readdir(dirHandler))
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2183	+ while((dirEntry = readdir(dirHandler)) != NULL)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2184	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2185	if(dirEntry->d_type != DT_DIR)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2186	{
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2187	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_driveutl.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_driveutl.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2188	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_driveutl.cpp 2010-05-10 19:22:13.793117226 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2189	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_driveutl.cpp 2010-05-08 15:05:24.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2190	@@ -82,7 +82,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2191	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2192	Time Stamp for Log file.
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2193	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2194	-TAny GetLocalTime(TAny)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2195	+TAny GetLocalTime()
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2196	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2197	struct tm *aNewTime = NULL;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2198	time_t aTime = 0;
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2199	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_driveutl.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_driveutl.h
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2200	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_driveutl.h 2010-05-10 19:22:13.793117226 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2201	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_driveutl.h 2010-05-08 15:08:42.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2202	@@ -24,6 +24,6 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2203	#include <e32def.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2204
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2205	TInt Getlogfile(TText aDriveObeyFileName,TText &aPadLogFile);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2206	-TAny GetLocalTime(TAny);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2207	+TAny GetLocalTime();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2208
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2209	#endif
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2210	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_obey.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_obey.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2211	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_obey.cpp 2010-05-10 19:22:13.793117226 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2212	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_obey.cpp 2010-05-12 09:50:42.805097594 +0100
787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2213	@@ -47,6 +47,7 @@
787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2214	#include <time.h>
787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2215	#include <assert.h>
787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2216	#include <errno.h>
787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2217	+#include <limits.h>
787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2218
787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2219	#include <e32std.h>
787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2220	#include <e32std_private.h>
787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2221	@@ -283,7 +284,7 @@
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2222	iCurrentLine++;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2223	iCurrentMark = ftell(iObeyFile);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2224	iLine[0]='\0';
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2225	- fgets((char*)iLine,imaxLength+1,iObeyFile);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2226	+ char cp = fgets((char)iLine,imaxLength+1,iObeyFile); (void)cp;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2227	iCurrentObeyStatement = new TText[imaxLength+1];
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2228	strcpy((char)iCurrentObeyStatement,(char)iLine);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2229	iNumWords = Parse();
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2230	@@ -646,13 +647,7 @@
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2231	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2232	if (keyword == EKeywordCoreImage)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2233	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2234	- #if defined(__TOOLS2__) && defined (_STLP_THREADS)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2235	- istringstream val(iReader.Word(1),(ios_base::in+ios_base::out));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2236	- #elif __TOOLS2__
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2237	- istringstream val(iReader.Word(1),(std::_Ios_Openmode)(ios_base::in+ios_base::out));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2238	- #else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2239	- istrstream val(iReader.Word(1),strlen(iReader.Word(1)));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2240	- #endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2241	+ istringstream val(iReader.Word(1),ios_base::in\|ios_base::out);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2242	iReader.CopyWord(1, coreImageFileName);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2243	iReader.MarkNext(); // ready for processing extension
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2244	break;
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2245	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/rofsbuild.mmp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/rofsbuild.mmp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2246	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/rofsbuild.mmp 2010-05-10 19:22:13.797117735 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2247	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/rofsbuild.mmp 2010-05-08 15:07:32.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2248	@@ -43,15 +43,16 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2249	USERINCLUDE ../../imglib/inc ../../imglib/compress ../../imglib/filesystem/include
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2250	USERINCLUDE ../../imglib/patchdataprocessor/include ../../imglib/parameterfileprocessor/include
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2251	USERINCLUDE ../../imglib/memmap/include
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2252	+#ifndef TOOLS2_LINUX
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2253	USERINCLUDE ../../imglib/boostlibrary/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2254	+#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2255
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2256	STATICLIBRARY filesystem
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2257	STATICLIBRARY patchdataprocessor
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2258	STATICLIBRARY parameterfileprocessor
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2259	STATICLIBRARY memmap
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2260	#ifdef TOOLS2_LINUX
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2261	-STATICLIBRARY boost_thread-mgw34-mt-1_39_linux
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2262	-OPTION GCC -pthread -O2 -Wno-uninitialized
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2263	+OPTION GCC -pthread -O2 -Wno-uninitialized -lboost_thread-mt
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2264	#else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2265	STATICLIBRARY boost_thread-mgw34-mt-1_39_win32
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2266	OPTION GCC -mthreads -O2 -Wno-uninitialized
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2267	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_rofs.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_rofs.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2268	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_rofs.cpp 2010-05-10 19:22:13.793117226 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2269	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rofsbuild/r_rofs.cpp 2010-05-08 15:08:18.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2270	@@ -584,9 +584,10 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2271	coffhead[0x54] = 0x20;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2272
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2273	// now fill in the text segment size
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2274	- (TUint32 ) (&coffhead[0x18]) = ALIGN4K(iSizeUsed);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2275	- (TUint32 ) (&coffhead[0x40]) = ALIGN4K(iSizeUsed);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2276	-
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2277	+ TUint32 * p0x18 = reinterpret_cast<TUint32 *>(&coffhead[0x18]);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2278	+ *p0x18 = ALIGN4K(iSizeUsed);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2279	+ TUint32 * p0x40 = reinterpret_cast<TUint32 *>(&coffhead[0x40]);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2280	+ *p0x40 = ALIGN4K(iSizeUsed);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2281	os.write(reinterpret_cast<char *>(coffhead), sizeof(coffhead));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2282	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2283	break;
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2284	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rombuild/r_obey.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/r_obey.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2285	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rombuild/r_obey.cpp 2010-05-10 19:22:13.805117355 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2286	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/r_obey.cpp 2010-05-08 14:50:44.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2287	@@ -301,7 +301,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2288	iCurrentLine++;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2289	iCurrentMark = ftell(iObeyFile);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2290	iLine[0]='\0';
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2291	- fgets((char*)iLine,imaxLength+1,iObeyFile);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2292	+ char * cp = fgets((char*)iLine,imaxLength+1,iObeyFile); (void)cp;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2293	iNumWords = Parse();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2294	return KErrNone;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2295	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2296	@@ -2973,13 +2973,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2297	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2298	if (keyword == EKeywordCoreImage)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2299	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2300	-#if defined(__TOOLS2__) && defined (_STLP_THREADS)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2301	- istringstream val(iReader.Word(1),(ios_base::in+ios_base::out));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2302	-#elif __TOOLS2__
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2303	- istringstream val(iReader.Word(1),(std::_Ios_Openmode)(ios_base::in+ios_base::out));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2304	-#else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2305	- istrstream val(iReader.Word(1),strlen(iReader.Word(1)));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2306	-#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2307	+ istringstream val(iReader.Word(1),ios_base::in\|ios_base::out);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2308	iReader.CopyWord(1, coreImageFileName);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2309	break;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2310	}
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2311	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rombuild/rombuild.mmp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/rombuild.mmp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2312	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rombuild/rombuild.mmp 2010-05-10 19:22:13.809118004 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2313	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/rombuild.mmp 2010-05-08 14:52:22.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2314	@@ -41,7 +41,9 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2315	userinclude ../../imglib/compress ../../imglib/inc
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2316	userinclude ../../imglib/patchdataprocessor/include ../../imglib/parameterfileprocessor/include
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2317	userinclude ../../imglib/memmap/include
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2318	+#ifndef TOOLS2_LINUX
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2319	userinclude ../../imglib/boostlibrary/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2320	+#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2321
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2322	OS_LAYER_SYSTEMINCLUDE_SYMBIAN
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2323
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2324	@@ -50,8 +52,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2325	staticlibrary memmap
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2326
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2327	#ifdef TOOLS2_LINUX
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2328	-STATICLIBRARY boost_thread-mgw34-mt-1_39_linux
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2329	-OPTION GCC -O2 -Wno-uninitialized -pthread
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2330	+OPTION GCC -pthread -O2 -Wno-uninitialized -lboost_thread-mt
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2331	#else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2332	STATICLIBRARY boost_thread-mgw34-mt-1_39_win32
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2333	OPTION GCC -O2 -Wno-uninitialized -mthreads
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2334	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rombuild/r_rom.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/r_rom.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2335	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rombuild/r_rom.cpp 2010-05-10 19:22:13.805117355 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2336	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/romtools/rombuild/r_rom.cpp 2010-05-08 14:51:46.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2337	@@ -1835,7 +1835,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2338	TRomFile** l=rf->iPDeps;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2339	FindMarked(MARK_EXE, MARK_EXE, l);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2340	TInt nx=l-rf->iPDeps;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2341	- if (!e->IsDll() && (nx>1 \|\| nx==1 && l[-1]!=rf))
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2342	+ if (!e->IsDll() && (nx>1 \|\| (nx==1 && l[-1]!=rf)))
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2343	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2344	Print(EError,"EXE %s links to the following other EXEs:\n", e->iFileName);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2345	TInt j;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2346	@@ -2198,8 +2198,11 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2347	coffhead[0x54] = 0x20;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2348
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2349	// now fill in the text segment size
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2350	- (TUint32 ) (&coffhead[0x18]) = ALIGN4K(iSizeUsed);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2351	- (TUint32 ) (&coffhead[0x40]) = ALIGN4K(iSizeUsed);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2352	+ TUint32 * p0x18 = reinterpret_cast<TUint32 *>(&coffhead[0x18]);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2353	+ *p0x18 = ALIGN4K(iSizeUsed);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2354	+ TUint32 * p0x40 = reinterpret_cast<TUint32 *>(&coffhead[0x40]);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2355	+ *p0x40 = ALIGN4K(iSizeUsed);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2356	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2357
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2358	os.write(reinterpret_cast<char *>(coffhead), sizeof(coffhead));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2359	}
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2360	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/inc/pkgfileparser.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/inc/pkgfileparser.h
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2361	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/inc/pkgfileparser.h 2010-05-10 19:22:13.849689642 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2362	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/inc/pkgfileparser.h 2010-05-08 15:20:36.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2363	@@ -33,6 +33,10 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2364
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2365	#include "pkglanguage.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2366
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2367	+int CompareTwoString(wchar_t const * string ,wchar_t const * option);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2368	+int CompareNString(wchar_t const * string ,wchar_t const * option, int len);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2369	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2370	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2371	typedef class PkgParser PKGPARSER, *PPKGPARSER;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2372
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2373	//Data structures for pkg file parsing
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2374	@@ -147,7 +151,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2375	int OpenFile();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2376	void DeleteAll();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2377
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2378	- HANDLE iPkgHandle;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2379	+ FILE * iPkgHandle;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2380
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2381	LANGUAGE_LIST iLangList;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2382	PKG_HEADER iPkgHeader;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2383	@@ -162,7 +166,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2384	void GetNextChar();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2385	void GetNextToken();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2386	bool GetStringToken();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2387	- WORD ParseEscapeChars();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2388	+ unsigned short ParseEscapeChars();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2389	void GetAlphaNumericToken();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2390	bool IsNumericToken();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2391	void GetNumericToken();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2392	@@ -197,8 +201,8 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2393
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2394	friend String wstring2string (const std::wstring& aWide);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2395	friend std::wstring string2wstring (const String& aNarrow);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2396	- friend int CompareTwoString(wchar_t* string ,wchar_t* option);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2397	- friend int CompareNString(wchar_t* string ,wchar_t* option, int len);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2398	+ friend int CompareTwoString(wchar_t const * string ,wchar_t const * option);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2399	+ friend int CompareNString(wchar_t const * string ,wchar_t const * option, int len);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2400	};
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2401
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2402	#endif //__PKGFILEPARSER_H__
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2403	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/inc/pkglanguage.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/inc/pkglanguage.h
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2404	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/inc/pkglanguage.h 2010-05-10 19:22:13.849689642 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2405	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/inc/pkglanguage.h 2010-05-08 15:21:16.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2406	@@ -26,7 +26,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2407
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2408	typedef struct
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2409	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2410	- wchar_t* iName;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2411	+ wchar_t const * iName;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2412	unsigned long iId;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2413	} SKeyword;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2414
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2415	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/inc/sisutils.h /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/inc/sisutils.h
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2416	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/inc/sisutils.h 2010-05-10 19:22:13.849689642 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2417	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/inc/sisutils.h 2010-05-08 15:19:24.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2418	@@ -40,6 +40,9 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2419	#ifdef WIN32
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2420	#define PATHSEPARATOR "\\"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2421	#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2422	+#ifdef __LINUX__
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2423	+#define PATHSEPARATOR "/"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2424	+#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2425
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2426	//typedefs
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2427	typedef std::string String;
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2428	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/src/pkgfileparser.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/src/pkgfileparser.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2429	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/src/pkgfileparser.cpp 2010-05-10 19:22:13.852617598 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2430	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/src/pkgfileparser.cpp 2010-05-08 15:16:08.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2431	@@ -18,13 +18,15 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2432
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2433	#include "sisutils.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2434	#include "pkgfileparser.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2435	+#include <vector>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2436	+#include <wchar.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2437
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2438	// Parse options lookups
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2439	#define MAXTOKENLEN 30
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2440	struct SParseToken
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2441	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2442	- WCHAR pszOpt[MAXTOKENLEN];
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2443	- DWORD dwOpt;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2444	+ wchar_t pszOpt[MAXTOKENLEN];
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2445	+ unsigned dwOpt;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2446	};
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2447
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2448	const SParseToken KTokens[] =
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2449	@@ -46,6 +48,10 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2450	};
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2451	#define NUMPARSETOKENS (sizeof(KTokens)/sizeof(SParseToken))
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2452
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2453	+std::wstring string2wstring (const String& aNarrow);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2454	+String wstring2string (const std::wstring& aWide);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2455	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2456	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2457	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2458	Constructor: PkgParser class
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2459	Initilize the parameters to data members.
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2460	@@ -68,9 +74,9 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2461	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2462	PkgParser::~PkgParser()
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2463	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2464	- if(iPkgHandle != INVALID_HANDLE_VALUE)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2465	+ if(iPkgHandle)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2466	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2467	- ::CloseHandle(iPkgHandle);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2468	+ std::fclose(iPkgHandle);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2469	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2470
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2471	DeleteAll();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2472	@@ -84,9 +90,14 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2473	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2474	int PkgParser::OpenFile()
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2475	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2476	- iPkgHandle = ::CreateFileW(string2wstring(iPkgFile).data(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2477	+#ifdef WIN32
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2478	+ iPkgHandle = _wfopen(string2wstring(iPkgFile).c_str(),L"r");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2479	+#else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2480	+ // *nix fopen doesn't care about the filename encoding, as long as its NULL-terminated.
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2481	+ iPkgHandle = std::fopen(iPkgFile.c_str(),"r");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2482	+#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2483	+ return iPkgHandle ? 1 : 0;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2484
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2485	- return (iPkgHandle != INVALID_HANDLE_VALUE) ? 1 : 0;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2486	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2487
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2488	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2489	@@ -164,7 +175,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2490	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2491	if(!OpenFile())
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2492	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2493	- throw SisUtilsException((char*)iPkgFile.data(), "Could not open file");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2494	+ throw SisUtilsException((char)iPkgFile.data(), const_cast<char >("Could not open file"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2495	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2496
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2497	GetNextChar();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2498	@@ -209,7 +220,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2499	case EOF_TOKEN:
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2500	break;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2501	default:
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2502	- ParserError("Unexpected token");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2503	+ ParserError(const_cast<char *>("Unexpected token"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2504	break;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2505	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2506	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2507	@@ -273,7 +284,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2508
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2509	// process application names
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2510	ExpectToken('{');
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2511	- for (WORD wNumLangs = 0; wNumLangs < iLangList.size(); wNumLangs++)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2512	+ for (unsigned short wNumLangs = 0; wNumLangs < iLangList.size(); wNumLangs++)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2513	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2514	GetNextToken ();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2515	ExpectToken(QUOTED_STRING_TOKEN);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2516	@@ -664,7 +675,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2517	aExpression.append("\"");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2518	break;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2519	case ALPHA_TOKEN:
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2520	- if(!CompareNString(m_tokenValue.pszString,L"option",6))
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2521	+ if(!CompareNString(m_tokenValue.pszString,const_cast<wchar_t *>(L"option"),6))
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2522	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2523	aExpression.append(" defined(");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2524	aExpression.append(wstring2string(m_tokenValue.pszString));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2525	@@ -687,7 +698,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2526	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2527	break;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2528	default:
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2529	- ParserError("ErrBadCondFormat");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2530	+ ParserError(const_cast<char *>("ErrBadCondFormat"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2531	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2532	GetNextToken ();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2533	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2534	@@ -771,7 +782,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2535	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2536	void PkgParser::ParseOptionsBlockL()
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2537	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2538	- WORD wNumLangs;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2539	+ unsigned short wNumLangs;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2540
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2541	ExpectToken('(');
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2542	GetNextToken ();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2543	@@ -838,7 +849,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2544	void PkgParser::ParseVendorNameL()
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2545	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2546	ExpectToken('{');
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2547	- for (WORD wNumLangs = 0; wNumLangs < iLangList.size(); wNumLangs++)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2548	+ for (unsigned short wNumLangs = 0; wNumLangs < iLangList.size(); wNumLangs++)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2549	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2550	GetNextToken ();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2551	ExpectToken(QUOTED_STRING_TOKEN);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2552	@@ -990,14 +1001,8 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2553	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2554	void PkgParser::GetNextChar()
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2555	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2556	-#ifdef WIN32
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2557	- DWORD dwBytesRead;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2558	- if (!::ReadFile(iPkgHandle, (LPVOID)&m_pkgChar, sizeof(WCHAR), &dwBytesRead, NULL) \|\|
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2559	- dwBytesRead!=sizeof(wchar_t))
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2560	- m_pkgChar='\0';
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2561	-#else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2562	-#error "TODO: Implement this function under other OS than Windows"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2563	-#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2564	+ wint_t wch = std::fgetwc(iPkgHandle);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2565	+ m_pkgChar = (wch == WEOF) ? 0 : wch;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2566	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2567
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2568	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2569	@@ -1012,7 +1017,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2570	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2571	if (m_token!=aToken)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2572	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2573	- ParserError("Unexpected Token");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2574	+ ParserError(const_cast<char *>("Unexpected Token"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2575	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2576	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2577
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2578	@@ -1105,10 +1110,10 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2579	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2580	bool PkgParser::GetStringToken()
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2581	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2582	- DWORD wCount = 0;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2583	+ unsigned wCount = 0;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2584	bool done=false;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2585	bool finished=false;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2586	- DWORD escapeChars = 0;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2587	+ unsigned escapeChars = 0;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2588
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2589	while (!finished)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2590	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2591	@@ -1120,11 +1125,11 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2592	if(wCount < (MAX_STRING - 1))
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2593	m_tokenValue.pszString[wCount++] = m_pkgChar;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2594	else //We dont want the string with length greater than MAX_STRING to be cut off silently
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2595	- ParserError("Bad String");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2596	+ ParserError(const_cast<char *>("Bad String"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2597	GetNextChar();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2598	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2599	if(m_pkgChar == '\0')
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2600	- ParserError("Bad String");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2601	+ ParserError(const_cast<char *>("Bad String"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2602	GetNextChar();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2603	done=true;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2604	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2605	@@ -1153,15 +1158,16 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2606	@internalComponent
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2607	@released
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2608	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2609	-WORD PkgParser::ParseEscapeChars()
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2610	+unsigned short PkgParser::ParseEscapeChars()
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2611	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2612	- WORD found=0;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2613	- WCHAR temp[MAX_STRING];
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2614	-#ifdef WIN32
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2615	+ unsigned short found=0;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2616	+ wchar_t temp[MAX_STRING];
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2617	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2618	while (m_pkgChar == '<')
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2619	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2620	wcscpy(temp,m_tokenValue.pszString);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2621	- DWORD fileOffset=::SetFilePointer(iPkgHandle, 0L, NULL, FILE_CURRENT);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2622	+ std::fpos_t foff;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2623	+ std::fgetpos(iPkgHandle,&foff);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2624	try
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2625	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2626	GetNextChar();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2627	@@ -1170,32 +1176,29 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2628	found++;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2629	else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2630	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2631	- ::SetFilePointer(iPkgHandle, fileOffset, NULL, FILE_BEGIN);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2632	+ std::fsetpos(iPkgHandle,&foff);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2633	break;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2634	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2635	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2636	catch (...)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2637	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2638	wcscpy(m_tokenValue.pszString,temp);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2639	- ::SetFilePointer(iPkgHandle, fileOffset, NULL, FILE_BEGIN);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2640	+ std::fsetpos(iPkgHandle,&foff);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2641	break;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2642	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2643	- DWORD num=m_tokenValue.dwNumber;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2644	+ unsigned num=m_tokenValue.dwNumber;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2645	// watch for CP1252 escapes which aren't appropriate for UNICODE
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2646	- if (num>=0x80 && num<=0x9F) ParserError("Invalid Escape");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2647	- DWORD len=wcslen(temp);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2648	+ if (num>=0x80 && num<=0x9F) ParserError(const_cast<char *>("Invalid Escape"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2649	+ unsigned len=wcslen(temp);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2650	wcscpy(m_tokenValue.pszString,temp);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2651	if (len+2<=MAX_STRING)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2652	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2653	- m_tokenValue.pszString[len]=(WCHAR)num;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2654	+ m_tokenValue.pszString[len]=(wchar_t)num;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2655	len++;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2656	m_tokenValue.pszString[len]='\0';
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2657	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2658	GetNextChar();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2659	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2660	-#else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2661	-#error "TODO: Implement this function under other OS than Windows"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2662	-#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2663	return found;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2664	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2665
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2666	@@ -1207,7 +1210,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2667	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2668	void PkgParser::GetAlphaNumericToken()
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2669	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2670	- WORD wCount = 0;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2671	+ unsigned short wCount = 0;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2672	while(m_pkgChar && (isalnum(m_pkgChar) \|\| ((m_pkgChar) == '_')))
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2673	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2674	if(wCount < (MAX_STRING - 1))
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2675	@@ -1232,12 +1235,13 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2676	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2677	// we may have a number but we must look ahead one char to be certain
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2678
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2679	- WCHAR oldChar = m_pkgChar;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2680	- DWORD fileOffset=::SetFilePointer(iPkgHandle, 0L, NULL, FILE_CURRENT);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2681	+ wchar_t oldChar = m_pkgChar;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2682	+ std::fpos_t foff;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2683	+ std::fgetpos(iPkgHandle,&foff);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2684	GetNextChar();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2685	lexemeIsNumber = iswdigit(m_pkgChar) != FALSE;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2686	m_pkgChar = oldChar;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2687	- ::SetFilePointer(iPkgHandle,fileOffset,NULL,FILE_BEGIN);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2688	+ std::fsetpos(iPkgHandle,&foff);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2689	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2690
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2691	return lexemeIsNumber;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2692	@@ -1251,23 +1255,30 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2693	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2694	void PkgParser::GetNumericToken()
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2695	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2696	- WCHAR temp[MAX_STRING];
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2697	- LPWSTR end;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2698	+ wchar_t temp[MAX_STRING];
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2699	+ wchar_t * end;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2700	bool hexString = false;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2701	- DWORD dwBytesRead;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2702	- DWORD fileOffset=::SetFilePointer(iPkgHandle, 0L, NULL, FILE_CURRENT);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2703	+ std::fpos_t foff;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2704	+ std::fgetpos(iPkgHandle,&foff);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2705
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2706	temp[0]=m_pkgChar;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2707	- if (!::ReadFile(iPkgHandle, &temp[1], (MAX_STRING-2)*sizeof(WCHAR), &dwBytesRead, NULL) \|\|
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2708	- dwBytesRead==0)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2709	- ParserError("Read failed");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2710	- temp[1+dwBytesRead/sizeof(WCHAR)]='\0';
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2711	- hexString = (!CompareNString(temp, L"0x", 2) \|\| !CompareNString(&temp[1], L"0x", 2));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2712	+ unsigned wchRead = fread(&temp[1],sizeof(wchar_t),MAX_STRING - 2,iPkgHandle);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2713	+ if (!wchRead)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2714	+ {
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2715	+ ParserError(const_cast<char *>("Read failed"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2716	+ }
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2717	+ temp[1+wchRead] = 0;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2718	+ hexString = (!CompareNString(temp, const_cast<wchar_t *>(L"0x"), 2) \|\|
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2719	+ !CompareNString(&temp[1], const_cast<wchar_t *>(L"0x"), 2));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2720
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2721	m_tokenValue.dwNumber = wcstoul(temp, &end, (hexString) ? 16 : 10);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2722
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2723	- if (end==temp) ParserError("Read failed");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2724	- ::SetFilePointer(iPkgHandle, fileOffset+(end-temp-1)*sizeof(WCHAR), NULL, FILE_BEGIN);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2725	+ if (end==temp)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2726	+ {
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2727	+ ParserError(const_cast<char *>("Read failed"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2728	+ }
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2729	+ std::fsetpos(iPkgHandle,&foff);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2730	+ std::fseek(iPkgHandle,(end-temp-1) * sizeof(wchar_t),SEEK_CUR);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2731	GetNextChar();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2732	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2733
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2734	@@ -1344,7 +1355,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2735
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2736	str << (char*)iPkgFile.data() << "(" << m_nLineNo << "): " << msg;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2737
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2738	- throw SisUtilsException("PakageFile-Parser Error", (char*)(str.str()).data());
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2739	+ throw SisUtilsException(const_cast<char >("PackageFile-Parser Error"), (char)(str.str()).data());
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2740	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2741
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2742	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2743	@@ -1357,22 +1368,14 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2744	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2745	String wstring2string (const std::wstring& aWide)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2746	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2747	- int max = ::WideCharToMultiByte(CP_OEMCP,0,aWide.c_str(),aWide.length(),0,0,0,0);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2748	- String reply;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2749	- if (max > 0 )
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2750	- {
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2751	- char* buffer = new char [max];
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2752	- try
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2753	+ std::vector<char> buffer((aWide.length() * sizeof(wchar_t)) + 1, '\0');
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2754	+ size_t nchars = wcstombs(&buffer[0],aWide.c_str(),buffer.size());
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2755	+ if (nchars == (size_t)-1)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2756	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2757	- ::WideCharToMultiByte(CP_OEMCP,0,aWide.c_str(),aWide.length(),buffer,max,0,0);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2758	- reply = String (buffer, max);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2759	- }
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2760	- catch (...)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2761	- {
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2762	- throw SisUtilsException("ParserError", "wstring to string conversion failed");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2763	- }
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2764	- delete [] buffer;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2765	+ throw SisUtilsException(const_cast<char *>("ParserError"),
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2766	+ const_cast<char *>("wstring to string conversion failed"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2767	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2768	+ String reply(&buffer[0]);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2769	return reply;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2770	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2771
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2772	@@ -1386,22 +1389,14 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2773	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2774	std::wstring string2wstring (const String& aNarrow)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2775	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2776	- int max = ::MultiByteToWideChar(CP_OEMCP,0,aNarrow.c_str(),aNarrow.length(),0,0);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2777	- std::wstring reply;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2778	- if (max > 0 )
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2779	+ std::vector<char> buffer(mblen(aNarrow.c_str(),aNarrow.length()) + 2, '\0');
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2780	+ size_t nchars = mbstowcs((wchar_t *)&buffer[0],aNarrow.c_str(),buffer.size());
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2781	+ if (nchars == (size_t)-1)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2782	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2783	- wchar_t* buffer = new wchar_t [max];
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2784	- try
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2785	- {
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2786	- ::MultiByteToWideChar(CP_OEMCP,0,aNarrow.c_str(),aNarrow.length(),buffer,max);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2787	- reply = std::wstring (buffer, max);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2788	- }
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2789	- catch (...)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2790	- {
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2791	- throw SisUtilsException("ParserError", "string to wstring conversion failed");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2792	- }
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2793	- delete [] buffer;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2794	+ throw SisUtilsException(const_cast<char *>("ParserError"),
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2795	+ const_cast<char *>("string to wstring conversion failed"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2796	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2797	+ std::wstring reply((wchar_t *)&buffer[0]);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2798	return reply;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2799	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2800
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2801	@@ -1414,9 +1409,13 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2802	@param string - first string
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2803	@param option - second string
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2804	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2805	-int CompareTwoString(wchar_t* string ,wchar_t* option)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2806	+int CompareTwoString(wchar_t const * string ,wchar_t const * option)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2807	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2808	+#if defined(WIN32)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2809	return wcsicmp(string,option);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2810	+#elif defined(__LINUX__)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2811	+ return wcscasecmp(string,option);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2812	+#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2813	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2814
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2815	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2816	@@ -1429,7 +1428,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2817	@param option - second string
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2818	@param len - no of wide characters to be compared
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2819	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2820	-int CompareNString(wchar_t* string ,wchar_t* option, int len)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2821	+int CompareNString(wchar_t const * string ,wchar_t const * option, int len)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2822	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2823	- return wcsnicmp(string,option,len);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2824	+ return wmemcmp(string,option,len);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2825	}
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2826	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/src/sis2iby.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/src/sis2iby.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2827	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/src/sis2iby.cpp 2010-05-10 19:22:13.852617598 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2828	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/src/sis2iby.cpp 2010-05-08 15:17:54.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2829	@@ -86,12 +86,12 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2830	break;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2831	case STAT_FAILURE:
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2832	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2833	- throw SisUtilsException((char*)sisFile.data(), "Failed to extract SIS file");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2834	+ throw SisUtilsException((char)sisFile.data(), const_cast<char >("Failed to extract SIS file"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2835	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2836	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2837	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2838	else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2839	- throw SisUtilsException((char*)sisFile.data(), "File not found");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2840	+ throw SisUtilsException((char)sisFile.data(), const_cast<char >("File not found"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2841	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2842
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2843	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2844	@@ -128,7 +128,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2845	ibyFile.append(".iby");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2846
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2847	if( !MakeDirectory(iOutputPath) )
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2848	- throw SisUtilsException((char*)iOutputPath.data(), "Failed to create path");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2849	+ throw SisUtilsException((char)iOutputPath.data(), const_cast<char >("Failed to create path"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2850
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2851	if(IsVerboseMode())
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2852	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2853	@@ -139,7 +139,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2854
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2855	if(!ibyHandle.good())
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2856	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2857	- throw SisUtilsException((char*)ibyFile.data(), "Failed to create IBY file");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2858	+ throw SisUtilsException((char)ibyFile.data(), const_cast<char >("Failed to create IBY file"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2859	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2860
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2861	// Generating Header
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2862	@@ -239,10 +239,11 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2863	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2864	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2865	else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2866	- throw SisUtilsException((char*)pkgFileName.data(), "Could not create parser object");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2867	+ throw SisUtilsException((char)pkgFileName.data(), const_cast<char >("Could not create parser object"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2868	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2869	else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2870	- throw SisUtilsException((char*)pkgFileName.data(), "File not found");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2871	+ throw SisUtilsException(const_cast<char *>(pkgFileName.data()),
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2872	+ const_cast<char *>("File not found"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2873	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2874
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2875	/**
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2876	@@ -551,7 +552,12 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2877	aFile.assign(fPath);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2878	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2879	#else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2880	-#error "TODO: Implement this function under other OS than Windows"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2881	+ char fPath[FILENAME_MAX];
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2882	+ if (realpath(aFile.c_str(),fPath))
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2883	+ {
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2884	+ aFile.assign(fPath);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2885	+ }
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2886	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2887	#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2888	return;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2889	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2890	@@ -652,7 +658,8 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2891
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2892	if( !aIfs.is_open() )
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2893	{
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2894	- throw SisUtilsException((char*)aFile.data(), "Cannot open file");
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2895	+ throw SisUtilsException(const_cast<char *>(aFile.data()),
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2896	+ const_cast<char *>("Cannot open file"));
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2897	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2898
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2899	aIfs.seekg(0,std::ios::end);
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2900	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/src/sisutils.cpp /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/src/sisutils.cpp
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2901	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/src/sisutils.cpp 2010-05-10 19:22:13.852617598 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2902	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/imgtools/sisutils/src/sisutils.cpp 2010-05-08 15:18:44.000000000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2903	@@ -20,6 +20,13 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2904	#include <windows.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2905	#include <direct.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2906	#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2907	+#ifdef __LINUX__
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2908	+#include <vector>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2909	+#include <cerrno>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2910	+#include <sys/wait.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2911	+#include <sys/stat.h>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2912	+#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2913	+
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2914
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2915	#include "sisutils.h"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2916
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2917	@@ -201,9 +208,47 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2918	::CloseHandle( pi.hProcess );
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2919	::CloseHandle( pi.hThread );
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2920	#else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2921	-#error "TODO: Implement this function under other OS than Windows"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2922	+ String::iterator pch = cmd.begin();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2923	+ String::iterator end = cmd.end();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2924	+ char *token = NULL;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2925	+ std::vector<char *> args;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2926	+ for ( ;pch != end; ++pch)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2927	+ {
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2928	+ if (isspace(*pch))
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2929	+ {
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2930	+ *pch = '\0';
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2931	+ if (token) {
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2932	+ token = NULL;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2933	+ }
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2934	+ }
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2935	+ else if (!token)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2936	+ {
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2937	+ token = &*pch;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2938	+ args.push_back(token);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2939	+ }
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2940	+ }
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2941	+ args.push_back(NULL);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2942	+ pid_t pid = fork();
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2943	+ if (pid == 0)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2944	+ {
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2945	+ execv(args[0],&args[0]);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2946	+ }
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2947	+ else if (pid < 0)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2948	+ {
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2949	+ iExitCode = static_cast<TUint32>(STAT_FAILURE);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2950	+ }
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2951	+ else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2952	+ {
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2953	+ int rtc;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2954	+ pid_t ws = waitpid( pid, &rtc, 0);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2955	+ if (ws != pid) {
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2956	+ iExitCode = static_cast<TUint32>(STAT_FAILURE);
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2957	+ }
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2958	+ else {
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2959	+ iExitCode = rtc;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2960	+ }
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2961	+ }
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2962	#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2963	-
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2964	return iExitCode;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2965	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2966
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2967	@@ -281,7 +326,13 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2968	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2969	}
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2970	#else
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2971	-#error "TODO: Implement this function under other OS than Windows"
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2972	+ if(mkdir(dir.data(),777) != 0)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2973	+ {
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2974	+ if(errno != EEXIST)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2975	+ {
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2976	+ status = EFalse;
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2977	+ }
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2978	+ }
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2979	#endif
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2980	if(status == EFalse)
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2981	break;
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2982	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/sbsv2/cpp-raptor/group/exports.inf /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/cpp-raptor/group/exports.inf
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2983	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/sbsv2/cpp-raptor/group/exports.inf 2010-05-10 19:22:13.856618037 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2984	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/cpp-raptor/group/exports.inf 2010-05-09 13:37:03.425787000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2985	@@ -15,6 +15,6 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2986	*
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2987	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2988
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2989	-../win32/bin/cpp.exe /tools/sbs/win32/bv/bin/cpp.exe
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2990	-../win32/i686-pc-mingw32/bin/cc1.exe /tools/sbs/win32/bv/i686-pc-mingw32/bin/cc1.exe
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2991	-../win32/i686-pc-mingw32/bin/libiconv-2.dll /tools/sbs/win32/bv/i686-pc-mingw32/bin/libiconv-2.dll
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2992	+../win32/bin/cpp.exe ../../tools/sbs/win32/bv/bin/cpp.exe
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2993	+../win32/i686-pc-mingw32/bin/cc1.exe ../../tools/sbs/win32/bv/i686-pc-mingw32/bin/cc1.exe
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2994	+../win32/i686-pc-mingw32/bin/libiconv-2.dll ../../tools/sbs/win32/bv/i686-pc-mingw32/bin/libiconv-2.dll
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2995	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/sbsv2/raptor/group/exports.inf /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/group/exports.inf
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2996	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/sbsv2/raptor/group/exports.inf 2010-05-10 19:22:17.197117642 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	2997	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/group/exports.inf 2010-05-09 13:36:29.473288000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2998	@@ -15,209 +15,209 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	2999	*
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3000	*/
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3001
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3002	-../RELEASE-NOTES.txt /tools/sbs/RELEASE-NOTES.txt
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3003	-../bin/sbs /tools/sbs/bin/sbs
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3004	-../bin/fixmeta.py /tools/sbs/bin/fixmeta.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3005	-../bin/codetest_osbuild.sh /tools/sbs/bin/codetest_osbuild.sh
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3006	-../bin/countbinaries.sh /tools/sbs/bin/countbinaries.sh
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3007	-../bin/gethost.sh /tools/sbs/bin/gethost.sh
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3008	-../bin/failedstats.py /tools/sbs/bin/failedstats.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3009	-../bin/sbs.bat /tools/sbs/bin/sbs.bat
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3010	-../bin/unsplitdirs.py /tools/sbs/bin/unsplitdirs.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3011	-../bin/buildstats.py /tools/sbs/bin/buildstats.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3012	-../bin/speedtest_osbuild.sh /tools/sbs/bin/speedtest_osbuild.sh
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3013	-../bin/sbsv2cache.py /tools/sbs/bin/sbsv2cache.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3014	-../bin/whatsource.py /tools/sbs/bin/whatsource.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3015	-../bin/oby2linux.py /tools/sbs/bin/oby2linux.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3016	-../bin/createrfifile.pl /tools/sbs/bin/createrfifile.pl
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3017	-../bin/vartoxml.py /tools/sbs/bin/vartoxml.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3018	-../bin/readme.txt /tools/sbs/bin/readme.txt
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3019	-../bin/squashlog.py /tools/sbs/bin/squashlog.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3020	-../bin/statcollate.py /tools/sbs/bin/statcollate.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3021	-../bin/createvmap.py /tools/sbs/bin/createvmap.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3022	-../bin/raptorlog.py /tools/sbs/bin/raptorlog.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3023	-../bin/osbuild.sh /tools/sbs/bin/osbuild.sh
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3024	-../bin/setup_user.sh /tools/sbs/bin/setup_user.sh
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3025	-../bin/msvcr71.dll /tools/sbs/bin/msvcr71.dll
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3026	-../bin/install_raptor.sh /tools/sbs/bin/install_raptor.sh
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3027	-../bin/mkgetfailed.py /tools/sbs/bin/mkgetfailed.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3028	-../examples/os_properties.xml /tools/sbs/examples/os_properties.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3029	-../examples/sbs_init.xml /tools/sbs/examples/sbs_init.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3030	-../lib/flm/e32abiv2stdexe.flm /tools/sbs/lib/flm/e32abiv2stdexe.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3031	-../lib/flm/user/default.flm_ex /tools/sbs/lib/flm/user/default.flm_ex
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3032	-../lib/flm/user/globals.mk_ex /tools/sbs/lib/flm/user/globals.mk_ex
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3033	-../lib/flm/e32abiv2dll.flm /tools/sbs/lib/flm/e32abiv2dll.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3034	-../lib/flm/tracecompiler.mk /tools/sbs/lib/flm/tracecompiler.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3035	-../lib/flm/win32exe.flm /tools/sbs/lib/flm/win32exe.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3036	-../lib/flm/template_ext.flm /tools/sbs/lib/flm/template_ext.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3037	-../lib/flm/e32abiv2ani.flm /tools/sbs/lib/flm/e32abiv2ani.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3038	-../lib/flm/converged-comms/createcommdbs.flm /tools/sbs/lib/flm/converged-comms/createcommdbs.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3039	-../lib/flm/converged-comms/installdefaultcommdb.flm /tools/sbs/lib/flm/converged-comms/installdefaultcommdb.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3040	-../lib/flm/win32plugin.flm /tools/sbs/lib/flm/win32plugin.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3041	-../lib/flm/win32klib.flm /tools/sbs/lib/flm/win32klib.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3042	-../lib/flm/extensions.xml /tools/sbs/lib/flm/extensions.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3043	-../lib/flm/stack.mk /tools/sbs/lib/flm/stack.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3044	-../lib/flm/globals.mk /tools/sbs/lib/flm/globals.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3045	-../lib/flm/win32stdexe.flm /tools/sbs/lib/flm/win32stdexe.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3046	-../lib/flm/e32abiv2lib.flm /tools/sbs/lib/flm/e32abiv2lib.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3047	-../lib/flm/win32resource.flm /tools/sbs/lib/flm/win32resource.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3048	-../lib/flm/config/default.flm /tools/sbs/lib/flm/config/default.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3049	-../lib/flm/win32lib.flm /tools/sbs/lib/flm/win32lib.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3050	-../lib/flm/null.flm /tools/sbs/lib/flm/null.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3051	-../lib/flm/tools/test_command_diff.sh /tools/sbs/lib/flm/tools/test_command_diff.sh
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3052	-../lib/flm/tools/stlport.flm /tools/sbs/lib/flm/tools/stlport.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3053	-../lib/flm/tools/buildstubsis.flm /tools/sbs/lib/flm/tools/buildstubsis.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3054	-../lib/flm/msvctools.xml /tools/sbs/lib/flm/msvctools.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3055	-../lib/flm/tools2lib.flm /tools/sbs/lib/flm/tools2lib.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3056	-../lib/flm/win32ldd.flm /tools/sbs/lib/flm/win32ldd.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3057	-../lib/flm/tools.xml /tools/sbs/lib/flm/tools.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3058	-../lib/flm/metaflm.mk /tools/sbs/lib/flm/metaflm.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3059	-../lib/flm/e32abiv2ldd.flm /tools/sbs/lib/flm/e32abiv2ldd.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3060	-../lib/flm/e32abiv2pdl.flm /tools/sbs/lib/flm/e32abiv2pdl.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3061	-../lib/flm/e32abiv2stdlib.flm /tools/sbs/lib/flm/e32abiv2stdlib.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3062	-../lib/flm/config.xml /tools/sbs/lib/flm/config.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3063	-../lib/flm/win32stddll.flm /tools/sbs/lib/flm/win32stddll.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3064	-../lib/flm/gccxmlresource.flm /tools/sbs/lib/flm/gccxmlresource.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3065	-../lib/flm/e32abiv2textnotifier2.flm /tools/sbs/lib/flm/e32abiv2textnotifier2.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3066	-../lib/flm/e32abiv2implib.flm /tools/sbs/lib/flm/e32abiv2implib.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3067	-../lib/flm/e32abiv2exe.flm /tools/sbs/lib/flm/e32abiv2exe.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3068	-../lib/flm/win32pdl.flm /tools/sbs/lib/flm/win32pdl.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3069	-../lib/flm/win32.flm /tools/sbs/lib/flm/win32.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3070	-../lib/flm/base.xml /tools/sbs/lib/flm/base.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3071	-../lib/flm/grouping.flm /tools/sbs/lib/flm/grouping.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3072	-../lib/flm/e32abiv2.flm /tools/sbs/lib/flm/e32abiv2.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3073	-../lib/flm/e32abiv2exexp.flm /tools/sbs/lib/flm/e32abiv2exexp.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3074	-../lib/flm/e32abiv2defaults.mk /tools/sbs/lib/flm/e32abiv2defaults.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3075	-../lib/flm/e32abiv2fsy.flm /tools/sbs/lib/flm/e32abiv2fsy.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3076	-../lib/flm/final.mk /tools/sbs/lib/flm/final.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3077	-../lib/flm/none.flm /tools/sbs/lib/flm/none.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3078	-../lib/flm/analysis.xml /tools/sbs/lib/flm/analysis.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3079	-../lib/flm/e32abiv2var2.flm /tools/sbs/lib/flm/e32abiv2var2.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3080	-../lib/flm/msvctools.flm /tools/sbs/lib/flm/msvctools.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3081	-../lib/flm/win32kdll.flm /tools/sbs/lib/flm/win32kdll.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3082	-../lib/flm/win32ani.flm /tools/sbs/lib/flm/win32ani.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3083	-../lib/flm/e32abiv2plugin.flm /tools/sbs/lib/flm/e32abiv2plugin.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3084	-../lib/flm/win32bitmap.flm /tools/sbs/lib/flm/win32bitmap.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3085	-../lib/flm/tools2common.flm /tools/sbs/lib/flm/tools2common.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3086	-../lib/flm/win32fsy.flm /tools/sbs/lib/flm/win32fsy.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3087	-../lib/flm/readme.txt /tools/sbs/lib/flm/readme.txt
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3088	-../lib/flm/e32abiv2kext.flm /tools/sbs/lib/flm/e32abiv2kext.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3089	-../lib/flm/e32abiv2stddll.flm /tools/sbs/lib/flm/e32abiv2stddll.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3090	-../lib/flm/win32exexp.flm /tools/sbs/lib/flm/win32exexp.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3091	-../lib/flm/stringtable.flm /tools/sbs/lib/flm/stringtable.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3092	-../lib/flm/utils/utility.xml /tools/sbs/lib/flm/utils/utility.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3093	-../lib/flm/utils/prebuilt.flm /tools/sbs/lib/flm/utils/prebuilt.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3094	-../lib/flm/utils/copydir.flm /tools/sbs/lib/flm/utils/copydir.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3095	-../lib/flm/win32pdd.flm /tools/sbs/lib/flm/win32pdd.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3096	-../lib/flm/taggedrules.mk /tools/sbs/lib/flm/taggedrules.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3097	-../lib/flm/booleanlogic.mk /tools/sbs/lib/flm/booleanlogic.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3098	-../lib/flm/emulator.xml /tools/sbs/lib/flm/emulator.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3099	-../lib/flm/win32kext.flm /tools/sbs/lib/flm/win32kext.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3100	-../lib/flm/test/exeabiv2_2/test.cpp /tools/sbs/lib/flm/test/exeabiv2_2/test.cpp
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3101	-../lib/flm/test/exeabiv2_2/test_function.cpp /tools/sbs/lib/flm/test/exeabiv2_2/test_function.cpp
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3102	-../lib/flm/test/exeabiv2_2/exeabiv2_2.mk /tools/sbs/lib/flm/test/exeabiv2_2/exeabiv2_2.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3103	-../lib/flm/test/templateext/temex.mk /tools/sbs/lib/flm/test/templateext/temex.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3104	-../lib/flm/test/templateext/Makefile /tools/sbs/lib/flm/test/templateext/Makefile
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3105	-../lib/flm/test/Makefile /tools/sbs/lib/flm/test/Makefile
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3106	-../lib/flm/test/exeabiv2_4/test.cpp /tools/sbs/lib/flm/test/exeabiv2_4/test.cpp
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3107	-../lib/flm/test/exeabiv2_4/exeabiv2_4.mk /tools/sbs/lib/flm/test/exeabiv2_4/exeabiv2_4.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3108	-../lib/flm/test/exeabiv2_4/test_big.cpp /tools/sbs/lib/flm/test/exeabiv2_4/test_big.cpp
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3109	-../lib/flm/test/flmtests.mk /tools/sbs/lib/flm/test/flmtests.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3110	-../lib/flm/test/ciaabiv2_1/uc_exe.cia /tools/sbs/lib/flm/test/ciaabiv2_1/uc_exe.cia
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3111	-../lib/flm/test/ciaabiv2_1/uc_exe.cpp /tools/sbs/lib/flm/test/ciaabiv2_1/uc_exe.cpp
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3112	-../lib/flm/test/ciaabiv2_1/ciaabiv2_1.mk /tools/sbs/lib/flm/test/ciaabiv2_1/ciaabiv2_1.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3113	-../lib/flm/test/export1/Makefile /tools/sbs/lib/flm/test/export1/Makefile
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3114	-../lib/flm/test/export1/t1e.h /tools/sbs/lib/flm/test/export1/t1e.h
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3115	-../lib/flm/test/export1/t4e.h /tools/sbs/lib/flm/test/export1/t4e.h
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3116	-../lib/flm/test/export1/t2e.h /tools/sbs/lib/flm/test/export1/t2e.h
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3117	-../lib/flm/test/export1/t3e.h /tools/sbs/lib/flm/test/export1/t3e.h
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3118	-../lib/flm/test/dllabiv2_1/test.cpp /tools/sbs/lib/flm/test/dllabiv2_1/test.cpp
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3119	-../lib/flm/test/dllabiv2_1/dllabiv2_1.mk /tools/sbs/lib/flm/test/dllabiv2_1/dllabiv2_1.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3120	-../lib/flm/test/raptorglue/raptorglue.mk /tools/sbs/lib/flm/test/raptorglue/raptorglue.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3121	-../lib/flm/test/dllbasictests.mk /tools/sbs/lib/flm/test/dllbasictests.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3122	-../lib/flm/test/exeabiv2_1/test.cpp /tools/sbs/lib/flm/test/exeabiv2_1/test.cpp
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3123	-../lib/flm/test/exeabiv2_1/exeabiv2_1.mk /tools/sbs/lib/flm/test/exeabiv2_1/exeabiv2_1.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3124	-../lib/flm/test/dllabiv2_defaults.mk /tools/sbs/lib/flm/test/dllabiv2_defaults.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3125	-../lib/flm/test/exeperftests.mk /tools/sbs/lib/flm/test/exeperftests.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3126	-../lib/flm/test/ciatests.mk /tools/sbs/lib/flm/test/ciatests.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3127	-../lib/flm/test/environment/pvm/pvmtest.mk /tools/sbs/lib/flm/test/environment/pvm/pvmtest.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3128	-../lib/flm/test/environment/make/test_variable_restore.mk /tools/sbs/lib/flm/test/environment/make/test_variable_restore.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3129	-../lib/flm/test/exebasictests.mk /tools/sbs/lib/flm/test/exebasictests.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3130	-../lib/flm/test/exeabiv2_defaults.mk /tools/sbs/lib/flm/test/exeabiv2_defaults.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3131	-../lib/flm/test/exeabiv2_3/exeabiv2_3.mk /tools/sbs/lib/flm/test/exeabiv2_3/exeabiv2_3.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3132	-../lib/flm/test/exeabiv2_3/test_big.cpp /tools/sbs/lib/flm/test/exeabiv2_3/test_big.cpp
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3133	-../lib/flm/win32stdlib.flm /tools/sbs/lib/flm/win32stdlib.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3134	-../lib/flm/win32var2.flm /tools/sbs/lib/flm/win32var2.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3135	-../lib/flm/win32implib.flm /tools/sbs/lib/flm/win32implib.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3136	-../lib/flm/bitmap.flm /tools/sbs/lib/flm/bitmap.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3137	-../lib/flm/build.flm /tools/sbs/lib/flm/build.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3138	-../lib/flm/build.xml /tools/sbs/lib/flm/build.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3139	-../lib/flm/tools2exe.flm /tools/sbs/lib/flm/tools2exe.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3140	-../lib/flm/e32abiv2klib.flm /tools/sbs/lib/flm/e32abiv2klib.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3141	-../lib/flm/standard.xml /tools/sbs/lib/flm/standard.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3142	-../lib/flm/win32var.flm /tools/sbs/lib/flm/win32var.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3143	-../lib/flm/e32abiv2pdd.flm /tools/sbs/lib/flm/e32abiv2pdd.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3144	-../lib/flm/e32abiv2none.flm /tools/sbs/lib/flm/e32abiv2none.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3145	-../lib/flm/romfile.mk /tools/sbs/lib/flm/romfile.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3146	-../lib/flm/win32textnotifier2.flm /tools/sbs/lib/flm/win32textnotifier2.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3147	-../lib/flm/resource.flm /tools/sbs/lib/flm/resource.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3148	-../lib/flm/flmtools.mk /tools/sbs/lib/flm/flmtools.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3149	-../lib/flm/gnumakefile.flm /tools/sbs/lib/flm/gnumakefile.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3150	-../lib/flm/e32abiv2kdll.flm /tools/sbs/lib/flm/e32abiv2kdll.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3151	-../lib/flm/e32abiv2var.flm /tools/sbs/lib/flm/e32abiv2var.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3152	-../lib/flm/win32dll.flm /tools/sbs/lib/flm/win32dll.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3153	-../lib/flm/gccxml.flm /tools/sbs/lib/flm/gccxml.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3154	-../lib/flm/e32postlink.mk /tools/sbs/lib/flm/e32postlink.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3155	-../lib/config/default.xml /tools/sbs/lib/config/default.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3156	-../lib/config/build.xml /tools/sbs/lib/config/build.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3157	-../lib/config/interfaces.xml /tools/sbs/lib/config/interfaces.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3158	-../lib/config/gcc.xml /tools/sbs/lib/config/gcc.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3159	-../lib/config/variants.xml /tools/sbs/lib/config/variants.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3160	-../lib/config/coverity.xml /tools/sbs/lib/config/coverity.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3161	-../lib/config/meta.xml /tools/sbs/lib/config/meta.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3162	-../lib/config/locations.xml /tools/sbs/lib/config/locations.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3163	-../lib/config/gccxml.xml /tools/sbs/lib/config/gccxml.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3164	-../lib/config/carbide.xml /tools/sbs/lib/config/carbide.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3165	-../lib/config/msvc.xml /tools/sbs/lib/config/msvc.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3166	-../lib/config/make.xml /tools/sbs/lib/config/make.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3167	-../lib/config/root.xml /tools/sbs/lib/config/root.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3168	-../lib/config/winscw.xml /tools/sbs/lib/config/winscw.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3169	-../lib/config/arm.xml /tools/sbs/lib/config/arm.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3170	-../lib/config/gcce.xml /tools/sbs/lib/config/gcce.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3171	-../lib/config/rvct.xml /tools/sbs/lib/config/rvct.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3172	-../python/raptor_makefile.py /tools/sbs/python/raptor_makefile.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3173	-../python/filter_interface.py /tools/sbs/python/filter_interface.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3174	-../python/raptor_start.py /tools/sbs/python/raptor_start.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3175	-../python/pyparsing.py /tools/sbs/python/pyparsing.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3176	-../python/raptor_cli.py /tools/sbs/python/raptor_cli.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3177	-../python/raptor_cache.py /tools/sbs/python/raptor_cache.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3178	-../python/raptor_meta.py /tools/sbs/python/raptor_meta.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3179	-../python/raptor_xml.py /tools/sbs/python/raptor_xml.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3180	-../python/raptor_version.py /tools/sbs/python/raptor_version.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3181	-../python/generic_path.py /tools/sbs/python/generic_path.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3182	-../python/raptor_make.py /tools/sbs/python/raptor_make.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3183	-../python/plugins/filter_logfile.py /tools/sbs/python/plugins/filter_logfile.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3184	-../python/plugins/filter_terminal.py /tools/sbs/python/plugins/filter_terminal.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3185	-../python/plugins/filter_carbide.py /tools/sbs/python/plugins/filter_carbide.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3186	-../python/plugins/filter_what.py /tools/sbs/python/plugins/filter_what.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3187	-../python/plugins/dummyplugin.py /tools/sbs/python/plugins/dummyplugin.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3188	-../python/plugins/filter_clean.py /tools/sbs/python/plugins/filter_clean.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3189	-../python/plugins/filter_squashlog.py /tools/sbs/python/plugins/filter_squashlog.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3190	-../python/plugins/filter_checksource.py /tools/sbs/python/plugins/filter_checksource.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3191	-../python/plugins/filter_splitlog.py /tools/sbs/python/plugins/filter_splitlog.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3192	-../python/sbs_dist.py /tools/sbs/python/sbs_dist.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3193	-../python/raptor_utilities.py /tools/sbs/python/raptor_utilities.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3194	-../python/pluginbox.py /tools/sbs/python/pluginbox.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3195	-../python/dos2unix.py /tools/sbs/python/dos2unix.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3196	-../python/raptor_data.py /tools/sbs/python/raptor_data.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3197	-../python/filter_list.py /tools/sbs/python/filter_list.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3198	-../python/raptor.py /tools/sbs/python/raptor.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3199	-../python/mmpparser.py /tools/sbs/python/mmpparser.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3200	-../python/filter_utils.py /tools/sbs/python/filter_utils.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3201	-../schema/build/2_0.xsd /tools/sbs/schema/build/2_0.xsd
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3202	-../schema/build/log/1_0.xsd /tools/sbs/schema/build/log/1_0.xsd
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3203	-../schema/build/1_0.xsd /tools/sbs/schema/build/1_0.xsd
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3204	-../win32/bin/ransleep.exe /tools/sbs/win32/bin/ransleep.exe
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3205	-../win32/bin/sbs_descramble.exe /tools/sbs/win32/bin/sbs_descramble.exe
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3206	-../win32/bin/talonctl.exe /tools/sbs/win32/bin/talonctl.exe
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3207	-../win32/bin/talon.exe /tools/sbs/win32/bin/talon.exe
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3208	+../RELEASE-NOTES.txt ../../tools/sbs/RELEASE-NOTES.txt
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3209	+../bin/sbs ../../tools/sbs/bin/sbs
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3210	+../bin/fixmeta.py ../../tools/sbs/bin/fixmeta.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3211	+../bin/codetest_osbuild.sh ../../tools/sbs/bin/codetest_osbuild.sh
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3212	+../bin/countbinaries.sh ../../tools/sbs/bin/countbinaries.sh
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3213	+../bin/gethost.sh ../../tools/sbs/bin/gethost.sh
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3214	+../bin/failedstats.py ../../tools/sbs/bin/failedstats.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3215	+../bin/sbs.bat ../../tools/sbs/bin/sbs.bat
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3216	+../bin/unsplitdirs.py ../../tools/sbs/bin/unsplitdirs.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3217	+../bin/buildstats.py ../../tools/sbs/bin/buildstats.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3218	+../bin/speedtest_osbuild.sh ../../tools/sbs/bin/speedtest_osbuild.sh
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3219	+../bin/sbsv2cache.py ../../tools/sbs/bin/sbsv2cache.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3220	+../bin/whatsource.py ../../tools/sbs/bin/whatsource.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3221	+../bin/oby2linux.py ../../tools/sbs/bin/oby2linux.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3222	+../bin/createrfifile.pl ../../tools/sbs/bin/createrfifile.pl
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3223	+../bin/vartoxml.py ../../tools/sbs/bin/vartoxml.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3224	+../bin/readme.txt ../../tools/sbs/bin/readme.txt
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3225	+../bin/squashlog.py ../../tools/sbs/bin/squashlog.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3226	+../bin/statcollate.py ../../tools/sbs/bin/statcollate.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3227	+../bin/createvmap.py ../../tools/sbs/bin/createvmap.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3228	+../bin/raptorlog.py ../../tools/sbs/bin/raptorlog.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3229	+../bin/osbuild.sh ../../tools/sbs/bin/osbuild.sh
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3230	+../bin/setup_user.sh ../../tools/sbs/bin/setup_user.sh
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3231	+../bin/msvcr71.dll ../../tools/sbs/bin/msvcr71.dll
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3232	+../bin/install_raptor.sh ../../tools/sbs/bin/install_raptor.sh
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3233	+../bin/mkgetfailed.py ../../tools/sbs/bin/mkgetfailed.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3234	+../examples/os_properties.xml ../../tools/sbs/examples/os_properties.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3235	+../examples/sbs_init.xml ../../tools/sbs/examples/sbs_init.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3236	+../lib/flm/e32abiv2stdexe.flm ../../tools/sbs/lib/flm/e32abiv2stdexe.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3237	+../lib/flm/user/default.flm_ex ../../tools/sbs/lib/flm/user/default.flm_ex
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3238	+../lib/flm/user/globals.mk_ex ../../tools/sbs/lib/flm/user/globals.mk_ex
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3239	+../lib/flm/e32abiv2dll.flm ../../tools/sbs/lib/flm/e32abiv2dll.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3240	+../lib/flm/tracecompiler.mk ../../tools/sbs/lib/flm/tracecompiler.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3241	+../lib/flm/win32exe.flm ../../tools/sbs/lib/flm/win32exe.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3242	+../lib/flm/template_ext.flm ../../tools/sbs/lib/flm/template_ext.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3243	+../lib/flm/e32abiv2ani.flm ../../tools/sbs/lib/flm/e32abiv2ani.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3244	+../lib/flm/converged-comms/createcommdbs.flm ../../tools/sbs/lib/flm/converged-comms/createcommdbs.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3245	+../lib/flm/converged-comms/installdefaultcommdb.flm ../../tools/sbs/lib/flm/converged-comms/installdefaultcommdb.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3246	+../lib/flm/win32plugin.flm ../../tools/sbs/lib/flm/win32plugin.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3247	+../lib/flm/win32klib.flm ../../tools/sbs/lib/flm/win32klib.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3248	+../lib/flm/extensions.xml ../../tools/sbs/lib/flm/extensions.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3249	+../lib/flm/stack.mk ../../tools/sbs/lib/flm/stack.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3250	+../lib/flm/globals.mk ../../tools/sbs/lib/flm/globals.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3251	+../lib/flm/win32stdexe.flm ../../tools/sbs/lib/flm/win32stdexe.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3252	+../lib/flm/e32abiv2lib.flm ../../tools/sbs/lib/flm/e32abiv2lib.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3253	+../lib/flm/win32resource.flm ../../tools/sbs/lib/flm/win32resource.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3254	+../lib/flm/config/default.flm ../../tools/sbs/lib/flm/config/default.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3255	+../lib/flm/win32lib.flm ../../tools/sbs/lib/flm/win32lib.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3256	+../lib/flm/null.flm ../../tools/sbs/lib/flm/null.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3257	+../lib/flm/tools/test_command_diff.sh ../../tools/sbs/lib/flm/tools/test_command_diff.sh
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3258	+../lib/flm/tools/stlport.flm ../../tools/sbs/lib/flm/tools/stlport.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3259	+../lib/flm/tools/buildstubsis.flm ../../tools/sbs/lib/flm/tools/buildstubsis.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3260	+../lib/flm/msvctools.xml ../../tools/sbs/lib/flm/msvctools.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3261	+../lib/flm/tools2lib.flm ../../tools/sbs/lib/flm/tools2lib.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3262	+../lib/flm/win32ldd.flm ../../tools/sbs/lib/flm/win32ldd.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3263	+../lib/flm/tools.xml ../../tools/sbs/lib/flm/tools.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3264	+../lib/flm/metaflm.mk ../../tools/sbs/lib/flm/metaflm.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3265	+../lib/flm/e32abiv2ldd.flm ../../tools/sbs/lib/flm/e32abiv2ldd.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3266	+../lib/flm/e32abiv2pdl.flm ../../tools/sbs/lib/flm/e32abiv2pdl.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3267	+../lib/flm/e32abiv2stdlib.flm ../../tools/sbs/lib/flm/e32abiv2stdlib.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3268	+../lib/flm/config.xml ../../tools/sbs/lib/flm/config.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3269	+../lib/flm/win32stddll.flm ../../tools/sbs/lib/flm/win32stddll.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3270	+../lib/flm/gccxmlresource.flm ../../tools/sbs/lib/flm/gccxmlresource.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3271	+../lib/flm/e32abiv2textnotifier2.flm ../../tools/sbs/lib/flm/e32abiv2textnotifier2.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3272	+../lib/flm/e32abiv2implib.flm ../../tools/sbs/lib/flm/e32abiv2implib.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3273	+../lib/flm/e32abiv2exe.flm ../../tools/sbs/lib/flm/e32abiv2exe.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3274	+../lib/flm/win32pdl.flm ../../tools/sbs/lib/flm/win32pdl.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3275	+../lib/flm/win32.flm ../../tools/sbs/lib/flm/win32.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3276	+../lib/flm/base.xml ../../tools/sbs/lib/flm/base.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3277	+../lib/flm/grouping.flm ../../tools/sbs/lib/flm/grouping.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3278	+../lib/flm/e32abiv2.flm ../../tools/sbs/lib/flm/e32abiv2.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3279	+../lib/flm/e32abiv2exexp.flm ../../tools/sbs/lib/flm/e32abiv2exexp.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3280	+../lib/flm/e32abiv2defaults.mk ../../tools/sbs/lib/flm/e32abiv2defaults.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3281	+../lib/flm/e32abiv2fsy.flm ../../tools/sbs/lib/flm/e32abiv2fsy.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3282	+../lib/flm/final.mk ../../tools/sbs/lib/flm/final.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3283	+../lib/flm/none.flm ../../tools/sbs/lib/flm/none.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3284	+../lib/flm/analysis.xml ../../tools/sbs/lib/flm/analysis.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3285	+../lib/flm/e32abiv2var2.flm ../../tools/sbs/lib/flm/e32abiv2var2.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3286	+../lib/flm/msvctools.flm ../../tools/sbs/lib/flm/msvctools.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3287	+../lib/flm/win32kdll.flm ../../tools/sbs/lib/flm/win32kdll.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3288	+../lib/flm/win32ani.flm ../../tools/sbs/lib/flm/win32ani.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3289	+../lib/flm/e32abiv2plugin.flm ../../tools/sbs/lib/flm/e32abiv2plugin.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3290	+../lib/flm/win32bitmap.flm ../../tools/sbs/lib/flm/win32bitmap.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3291	+../lib/flm/tools2common.flm ../../tools/sbs/lib/flm/tools2common.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3292	+../lib/flm/win32fsy.flm ../../tools/sbs/lib/flm/win32fsy.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3293	+../lib/flm/readme.txt ../../tools/sbs/lib/flm/readme.txt
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3294	+../lib/flm/e32abiv2kext.flm ../../tools/sbs/lib/flm/e32abiv2kext.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3295	+../lib/flm/e32abiv2stddll.flm ../../tools/sbs/lib/flm/e32abiv2stddll.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3296	+../lib/flm/win32exexp.flm ../../tools/sbs/lib/flm/win32exexp.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3297	+../lib/flm/stringtable.flm ../../tools/sbs/lib/flm/stringtable.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3298	+../lib/flm/utils/utility.xml ../../tools/sbs/lib/flm/utils/utility.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3299	+../lib/flm/utils/prebuilt.flm ../../tools/sbs/lib/flm/utils/prebuilt.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3300	+../lib/flm/utils/copydir.flm ../../tools/sbs/lib/flm/utils/copydir.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3301	+../lib/flm/win32pdd.flm ../../tools/sbs/lib/flm/win32pdd.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3302	+../lib/flm/taggedrules.mk ../../tools/sbs/lib/flm/taggedrules.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3303	+../lib/flm/booleanlogic.mk ../../tools/sbs/lib/flm/booleanlogic.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3304	+../lib/flm/emulator.xml ../../tools/sbs/lib/flm/emulator.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3305	+../lib/flm/win32kext.flm ../../tools/sbs/lib/flm/win32kext.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3306	+../lib/flm/test/exeabiv2_2/test.cpp ../../tools/sbs/lib/flm/test/exeabiv2_2/test.cpp
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3307	+../lib/flm/test/exeabiv2_2/test_function.cpp ../../tools/sbs/lib/flm/test/exeabiv2_2/test_function.cpp
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3308	+../lib/flm/test/exeabiv2_2/exeabiv2_2.mk ../../tools/sbs/lib/flm/test/exeabiv2_2/exeabiv2_2.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3309	+../lib/flm/test/templateext/temex.mk ../../tools/sbs/lib/flm/test/templateext/temex.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3310	+../lib/flm/test/templateext/Makefile ../../tools/sbs/lib/flm/test/templateext/Makefile
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3311	+../lib/flm/test/Makefile ../../tools/sbs/lib/flm/test/Makefile
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3312	+../lib/flm/test/exeabiv2_4/test.cpp ../../tools/sbs/lib/flm/test/exeabiv2_4/test.cpp
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3313	+../lib/flm/test/exeabiv2_4/exeabiv2_4.mk ../../tools/sbs/lib/flm/test/exeabiv2_4/exeabiv2_4.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3314	+../lib/flm/test/exeabiv2_4/test_big.cpp ../../tools/sbs/lib/flm/test/exeabiv2_4/test_big.cpp
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3315	+../lib/flm/test/flmtests.mk ../../tools/sbs/lib/flm/test/flmtests.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3316	+../lib/flm/test/ciaabiv2_1/uc_exe.cia ../../tools/sbs/lib/flm/test/ciaabiv2_1/uc_exe.cia
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3317	+../lib/flm/test/ciaabiv2_1/uc_exe.cpp ../../tools/sbs/lib/flm/test/ciaabiv2_1/uc_exe.cpp
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3318	+../lib/flm/test/ciaabiv2_1/ciaabiv2_1.mk ../../tools/sbs/lib/flm/test/ciaabiv2_1/ciaabiv2_1.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3319	+../lib/flm/test/export1/Makefile ../../tools/sbs/lib/flm/test/export1/Makefile
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3320	+../lib/flm/test/export1/t1e.h ../../tools/sbs/lib/flm/test/export1/t1e.h
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3321	+../lib/flm/test/export1/t4e.h ../../tools/sbs/lib/flm/test/export1/t4e.h
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3322	+../lib/flm/test/export1/t2e.h ../../tools/sbs/lib/flm/test/export1/t2e.h
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3323	+../lib/flm/test/export1/t3e.h ../../tools/sbs/lib/flm/test/export1/t3e.h
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3324	+../lib/flm/test/dllabiv2_1/test.cpp ../../tools/sbs/lib/flm/test/dllabiv2_1/test.cpp
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3325	+../lib/flm/test/dllabiv2_1/dllabiv2_1.mk ../../tools/sbs/lib/flm/test/dllabiv2_1/dllabiv2_1.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3326	+../lib/flm/test/raptorglue/raptorglue.mk ../../tools/sbs/lib/flm/test/raptorglue/raptorglue.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3327	+../lib/flm/test/dllbasictests.mk ../../tools/sbs/lib/flm/test/dllbasictests.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3328	+../lib/flm/test/exeabiv2_1/test.cpp ../../tools/sbs/lib/flm/test/exeabiv2_1/test.cpp
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3329	+../lib/flm/test/exeabiv2_1/exeabiv2_1.mk ../../tools/sbs/lib/flm/test/exeabiv2_1/exeabiv2_1.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3330	+../lib/flm/test/dllabiv2_defaults.mk ../../tools/sbs/lib/flm/test/dllabiv2_defaults.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3331	+../lib/flm/test/exeperftests.mk ../../tools/sbs/lib/flm/test/exeperftests.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3332	+../lib/flm/test/ciatests.mk ../../tools/sbs/lib/flm/test/ciatests.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3333	+../lib/flm/test/environment/pvm/pvmtest.mk ../../tools/sbs/lib/flm/test/environment/pvm/pvmtest.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3334	+../lib/flm/test/environment/make/test_variable_restore.mk ../../tools/sbs/lib/flm/test/environment/make/test_variable_restore.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3335	+../lib/flm/test/exebasictests.mk ../../tools/sbs/lib/flm/test/exebasictests.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3336	+../lib/flm/test/exeabiv2_defaults.mk ../../tools/sbs/lib/flm/test/exeabiv2_defaults.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3337	+../lib/flm/test/exeabiv2_3/exeabiv2_3.mk ../../tools/sbs/lib/flm/test/exeabiv2_3/exeabiv2_3.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3338	+../lib/flm/test/exeabiv2_3/test_big.cpp ../../tools/sbs/lib/flm/test/exeabiv2_3/test_big.cpp
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3339	+../lib/flm/win32stdlib.flm ../../tools/sbs/lib/flm/win32stdlib.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3340	+../lib/flm/win32var2.flm ../../tools/sbs/lib/flm/win32var2.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3341	+../lib/flm/win32implib.flm ../../tools/sbs/lib/flm/win32implib.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3342	+../lib/flm/bitmap.flm ../../tools/sbs/lib/flm/bitmap.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3343	+../lib/flm/build.flm ../../tools/sbs/lib/flm/build.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3344	+../lib/flm/build.xml ../../tools/sbs/lib/flm/build.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3345	+../lib/flm/tools2exe.flm ../../tools/sbs/lib/flm/tools2exe.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3346	+../lib/flm/e32abiv2klib.flm ../../tools/sbs/lib/flm/e32abiv2klib.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3347	+../lib/flm/standard.xml ../../tools/sbs/lib/flm/standard.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3348	+../lib/flm/win32var.flm ../../tools/sbs/lib/flm/win32var.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3349	+../lib/flm/e32abiv2pdd.flm ../../tools/sbs/lib/flm/e32abiv2pdd.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3350	+../lib/flm/e32abiv2none.flm ../../tools/sbs/lib/flm/e32abiv2none.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3351	+../lib/flm/romfile.mk ../../tools/sbs/lib/flm/romfile.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3352	+../lib/flm/win32textnotifier2.flm ../../tools/sbs/lib/flm/win32textnotifier2.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3353	+../lib/flm/resource.flm ../../tools/sbs/lib/flm/resource.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3354	+../lib/flm/flmtools.mk ../../tools/sbs/lib/flm/flmtools.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3355	+../lib/flm/gnumakefile.flm ../../tools/sbs/lib/flm/gnumakefile.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3356	+../lib/flm/e32abiv2kdll.flm ../../tools/sbs/lib/flm/e32abiv2kdll.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3357	+../lib/flm/e32abiv2var.flm ../../tools/sbs/lib/flm/e32abiv2var.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3358	+../lib/flm/win32dll.flm ../../tools/sbs/lib/flm/win32dll.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3359	+../lib/flm/gccxml.flm ../../tools/sbs/lib/flm/gccxml.flm
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3360	+../lib/flm/e32postlink.mk ../../tools/sbs/lib/flm/e32postlink.mk
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3361	+../lib/config/default.xml ../../tools/sbs/lib/config/default.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3362	+../lib/config/build.xml ../../tools/sbs/lib/config/build.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3363	+../lib/config/interfaces.xml ../../tools/sbs/lib/config/interfaces.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3364	+../lib/config/gcc.xml ../../tools/sbs/lib/config/gcc.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3365	+../lib/config/variants.xml ../../tools/sbs/lib/config/variants.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3366	+../lib/config/coverity.xml ../../tools/sbs/lib/config/coverity.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3367	+../lib/config/meta.xml ../../tools/sbs/lib/config/meta.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3368	+../lib/config/locations.xml ../../tools/sbs/lib/config/locations.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3369	+../lib/config/gccxml.xml ../../tools/sbs/lib/config/gccxml.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3370	+../lib/config/carbide.xml ../../tools/sbs/lib/config/carbide.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3371	+../lib/config/msvc.xml ../../tools/sbs/lib/config/msvc.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3372	+../lib/config/make.xml ../../tools/sbs/lib/config/make.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3373	+../lib/config/root.xml ../../tools/sbs/lib/config/root.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3374	+../lib/config/winscw.xml ../../tools/sbs/lib/config/winscw.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3375	+../lib/config/arm.xml ../../tools/sbs/lib/config/arm.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3376	+../lib/config/gcce.xml ../../tools/sbs/lib/config/gcce.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3377	+../lib/config/rvct.xml ../../tools/sbs/lib/config/rvct.xml
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3378	+../python/raptor_makefile.py ../../tools/sbs/python/raptor_makefile.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3379	+../python/filter_interface.py ../../tools/sbs/python/filter_interface.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3380	+../python/raptor_start.py ../../tools/sbs/python/raptor_start.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3381	+../python/pyparsing.py ../../tools/sbs/python/pyparsing.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3382	+../python/raptor_cli.py ../../tools/sbs/python/raptor_cli.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3383	+../python/raptor_cache.py ../../tools/sbs/python/raptor_cache.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3384	+../python/raptor_meta.py ../../tools/sbs/python/raptor_meta.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3385	+../python/raptor_xml.py ../../tools/sbs/python/raptor_xml.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3386	+../python/raptor_version.py ../../tools/sbs/python/raptor_version.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3387	+../python/generic_path.py ../../tools/sbs/python/generic_path.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3388	+../python/raptor_make.py ../../tools/sbs/python/raptor_make.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3389	+../python/plugins/filter_logfile.py ../../tools/sbs/python/plugins/filter_logfile.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3390	+../python/plugins/filter_terminal.py ../../tools/sbs/python/plugins/filter_terminal.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3391	+../python/plugins/filter_carbide.py ../../tools/sbs/python/plugins/filter_carbide.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3392	+../python/plugins/filter_what.py ../../tools/sbs/python/plugins/filter_what.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3393	+../python/plugins/dummyplugin.py ../../tools/sbs/python/plugins/dummyplugin.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3394	+../python/plugins/filter_clean.py ../../tools/sbs/python/plugins/filter_clean.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3395	+../python/plugins/filter_squashlog.py ../../tools/sbs/python/plugins/filter_squashlog.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3396	+../python/plugins/filter_checksource.py ../../tools/sbs/python/plugins/filter_checksource.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3397	+../python/plugins/filter_splitlog.py ../../tools/sbs/python/plugins/filter_splitlog.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3398	+../python/sbs_dist.py ../../tools/sbs/python/sbs_dist.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3399	+../python/raptor_utilities.py ../../tools/sbs/python/raptor_utilities.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3400	+../python/pluginbox.py ../../tools/sbs/python/pluginbox.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3401	+../python/dos2unix.py ../../tools/sbs/python/dos2unix.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3402	+../python/raptor_data.py ../../tools/sbs/python/raptor_data.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3403	+../python/filter_list.py ../../tools/sbs/python/filter_list.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3404	+../python/raptor.py ../../tools/sbs/python/raptor.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3405	+../python/mmpparser.py ../../tools/sbs/python/mmpparser.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3406	+../python/filter_utils.py ../../tools/sbs/python/filter_utils.py
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3407	+../schema/build/2_0.xsd ../../tools/sbs/schema/build/2_0.xsd
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3408	+../schema/build/log/1_0.xsd ../../tools/sbs/schema/build/log/1_0.xsd
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3409	+../schema/build/1_0.xsd ../../tools/sbs/schema/build/1_0.xsd
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3410	+../win32/bin/ransleep.exe ../../tools/sbs/win32/bin/ransleep.exe
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3411	+../win32/bin/sbs_descramble.exe ../../tools/sbs/win32/bin/sbs_descramble.exe
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3412	+../win32/bin/talonctl.exe ../../tools/sbs/win32/bin/talonctl.exe
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3413	+../win32/bin/talon.exe ../../tools/sbs/win32/bin/talon.exe
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	3414	diff -u -r -b -B -E -x '.hg' -x 'cross-plat-dev-utils' -x 'baseline.txt' -x 'README' -x 'TODO' -x 'NEWS' -x '.pyc' -x '~' -x 'linux-unknown-libc2_11' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/sbsv2/raptor/lib/config/gcc.xml /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/lib/config/gcc.xml
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3415	--- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/sbsv2/raptor/lib/config/gcc.xml 2010-05-10 19:22:17.201117662 +0100
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	3416	+++ /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/lib/config/gcc.xml 2010-05-08 13:35:13.030060000 +0100
2 39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3417	@@ -26,7 +26,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3418	<!-- used by FLM code -->
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3419	<set name='COMPILER' value='$(GCC) -c' type='tool' versionCommand='$(GCC) -v' versionResult='gcc version (3.[456])\|(4.[0-9])'/>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3420
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3421	- <set name='CFLAGS' value='-fdefer-pop -fmerge-constants -fthread-jumps -floop-optimize -fif-conversion -fif-conversion2 -fguess-branch-probability -fcprop-registers -foptimize-sibling-calls -fstrength-reduce -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop -frerun-loop-opt -fgcse -fgcse-lm -fgcse-sm -fgcse-las -fdelete-null-pointer-checks -fexpensive-optimizations -fregmove -fschedule-insns -fschedule-insns2 -fsched-interblock -fsched-spec -fcaller-saves -fpeephole2 -freorder-blocks -freorder-functions -fstrict-aliasing -funit-at-a-time -falign-functions -falign-jumps -falign-loops -falign-labels -fcrossjumping -pipe -Wall -Wno-ctor-dtor-privacy -Wno-unknown-pragmas -m32'/>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3422	+ <set name='CFLAGS' value='-std=c++0x -fdefer-pop -fmerge-constants -fthread-jumps -floop-optimize -fif-conversion -fif-conversion2 -fguess-branch-probability -fcprop-registers -foptimize-sibling-calls -fstrength-reduce -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop -frerun-loop-opt -fgcse -fgcse-lm -fgcse-sm -fgcse-las -fdelete-null-pointer-checks -fexpensive-optimizations -fregmove -fschedule-insns -fschedule-insns2 -fsched-interblock -fsched-spec -fcaller-saves -fpeephole2 -freorder-blocks -freorder-functions -fstrict-aliasing -funit-at-a-time -falign-functions -falign-jumps -falign-loops -falign-labels -fcrossjumping -pipe -Wall -Wno-ctor-dtor-privacy -Wno-unknown-pragmas -m32'/>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3423
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3424	<!-- msys based programs sometimes don't search the path properly.
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3425	COMPILER_PATH can be set to tell gcc where to find
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3426	@@ -45,7 +45,7 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3427	<set name='CDEFS.WIN32' value='$(CDEFS.DEFAULT) _WIN32 WIN32 _WINDOWS __TOOLS2_WINDOWS__'/>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3428	<set name='CDEFS.LINUX' value='$(CDEFS.DEFAULT) __LINUX__ __TOOLS2_LINUX__'/>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3429
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3430	- <set name='INC.COMPILER' value='$(EPOCINCLUDE)/gcc_mingw/gcc_mingw_3_4_2.h'/>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3431	+ <set name='INC.COMPILER' value='$(EPOCINCLUDE)/gcc/gcc.h'/>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3432
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3433	<set name='OPT.D' value='-D'/>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3434	<set name='OPT.L' value='-L'/>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3435	@@ -55,12 +55,11 @@
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3436	<set name='OPT.SYSTEMINCLUDE' value='-isystem '/>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3437	<set name='OPT.USERINCLUDE' value='-I '/>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3438
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3439	- <!-- always use stlport headers -->
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3440	- <set name='SYSTEMINCLUDE' value='$(EPOCINCLUDE)/tools/stlport'/>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3441	+ <set name='SYSTEMINCLUDE' value=''/>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3442
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3443	<set name='LINKER' value='$(GCC)'/>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3444	<set name='LFLAGS' value=''/>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3445	- <set name='STATICLIBRARY' value='stlport.5.1'/>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3446	+ <set name='STATICLIBRARY' value=''/>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3447	<set name='LIBS' value=''/>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3448	<set name='LIBS.WIN32' value='$(LIBS)'/>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3449	<set name='LIBS.LINUX' value='$(LIBS) pthread'/>
39c28ec933dd Removing all prior files. Adding a complete branch of the 'build' package with fixes mikek parents: diff changeset	3450	Only in /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/sbsv2/raptor/python: raptor_version.py.bak
6 787612182dd0 1) Make cross-plat-dev-utils perl scripts independent of the package directory name mikek parents: 2 diff changeset	3451	Only in /home/imk/symbian/epocroot-pdk-3.0.h/linux_build/sbsv2/raptor/util: build

author	mikek
	Thu, 13 May 2010 08:38:18 +0100
changeset 6	787612182dd0
parent 2	39c28ec933dd
permissions	-rw-r--r--