|
1 ## diff generated by diff_upstream.pl |
|
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/build/bintools/checklib/library/library.cpp |
|
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 |
|
4 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/checklib/library/library.cpp 2010-05-08 15:37:06.000000000 +0100 |
|
5 @@ -25,6 +25,7 @@ |
|
6 #include <iostream> |
|
7 #include <iomanip> |
|
8 #include <cstdlib> |
|
9 +#include <cstring> |
|
10 |
|
11 namespace |
|
12 { |
|
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/build/bintools/checklib/main.cpp |
|
14 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/checklib/main.cpp 2010-05-10 19:22:09.012618252 +0100 |
|
15 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/checklib/main.cpp 2010-05-08 15:36:26.000000000 +0100 |
|
16 @@ -22,6 +22,7 @@ |
|
17 #include <sstream> |
|
18 #include <iostream> |
|
19 #include <stdexcept> |
|
20 +#include <cstring> |
|
21 |
|
22 |
|
23 const char SELF_NAME[] = "checklib"; |
|
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/build/bintools/checklib/object/coff_object.cpp |
|
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 |
|
26 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/checklib/object/coff_object.cpp 2010-05-08 15:38:08.000000000 +0100 |
|
27 @@ -21,6 +21,7 @@ |
|
28 |
|
29 #include <algorithm> |
|
30 #include <functional> |
|
31 +#include <cstring> |
|
32 |
|
33 Coff_object::Coff_object(const char* p1, const char* p2) |
|
34 { |
|
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/build/bintools/checklib/object/elf_object.cpp |
|
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 |
|
37 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/checklib/object/elf_object.cpp 2010-05-08 15:37:34.000000000 +0100 |
|
38 @@ -22,6 +22,7 @@ |
|
39 |
|
40 #include <algorithm> |
|
41 #include <functional> |
|
42 +#include <cstring> |
|
43 |
|
44 Elf_object::Elf_object(const char* p1, const char* p2) |
|
45 { |
|
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/build/bintools/rcomp/src/localise.cpp |
|
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 |
|
48 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/rcomp/src/localise.cpp 2010-05-08 15:38:52.000000000 +0100 |
|
49 @@ -27,9 +27,11 @@ |
|
50 #pragma warning( disable : 4530 ) // function not inlined. |
|
51 #endif |
|
52 |
|
53 -#include <stdio.h> |
|
54 +#include <cstdio> |
|
55 #include <iostream> |
|
56 #include "ERRORHAN.H" |
|
57 +#include <cstring> |
|
58 +#include <cstdlib> |
|
59 |
|
60 #if defined(__MSVCDOTNET__) || defined(__TOOLS2__) |
|
61 using std::ifstream; |
|
62 @@ -1787,8 +1789,16 @@ |
|
63 const char * fileName = SourceFileName.GetAssertedNonEmptyBuffer(); |
|
64 ifstream iFile(fileName); |
|
65 |
|
66 +#ifdef __LINUX__ |
|
67 + char LocalisationOutputFileName[sizeof("/tmp/rcomp_temp_XXXXXX")]; |
|
68 + strcpy(LocalisationOutputFileName,"/tmp/rcomp_temp_XXXXXX"); |
|
69 + int fd = mkstemp(LocalisationOutputFileName); close(fd); |
|
70 +#endif |
|
71 +#ifdef WIN32 |
|
72 char * LocalisationOutputFileName; |
|
73 LocalisationOutputFileName = tmpnam(NULL); |
|
74 +#endif |
|
75 + |
|
76 ofstream outputFile(LocalisationOutputFileName); |
|
77 |
|
78 String fileLine(""); |
|
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/build/bintools/rcomp/src/rcomp.cpp |
|
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 |
|
81 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/rcomp/src/rcomp.cpp 2010-05-08 15:41:18.000000000 +0100 |
|
82 @@ -90,8 +90,8 @@ |
|
83 #pragma warning( disable : 4244 ) // C4244: '=' : conversion from 'int' to 'short', possible loss of data |
|
84 #endif //__VC32__ |
|
85 |
|
86 -#include "resource.h" |
|
87 -#include "parser.h" |
|
88 +#include "RESOURCE.H" |
|
89 +#include "Parser.h" |
|
90 |
|
91 int yylex(); |
|
92 void yyerror(const char* string, ...); |
|
93 @@ -100,14 +100,14 @@ |
|
94 extern int yylineno; |
|
95 |
|
96 #include "rcomp.hpp" |
|
97 -#include "datatype.h" |
|
98 -#include "mem.h" |
|
99 -#include "rcbinstr.h" |
|
100 -#include "rcscan.h" |
|
101 -#include "errorhan.h" |
|
102 -#include "fileacc.h" |
|
103 -#include "version.h" |
|
104 -#include "ctable.h" |
|
105 +#include "DATATYPE.H" |
|
106 +#include "MEM.H" |
|
107 +#include "RCBINSTR.H" |
|
108 +#include "RCSCAN.H" |
|
109 +#include "ERRORHAN.H" |
|
110 +#include "FILEACC.H" |
|
111 +#include "VERSION.H" |
|
112 +#include "CTABLE.H" |
|
113 #include "localise.h" |
|
114 #include "main.h" |
|
115 |
|
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/build/bintools/rcomp/src/rcompl.cpp |
|
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 |
|
118 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/rcomp/src/rcompl.cpp 2010-05-08 15:40:00.000000000 +0100 |
|
119 @@ -662,8 +662,8 @@ |
|
120 #include <limits.h> |
|
121 #include <string.h> |
|
122 #include "main.h" |
|
123 -#include "structst.h" |
|
124 -#include "parser.h" |
|
125 +#include "STRUCTST.H" |
|
126 +#include "Parser.h" |
|
127 #include "localise.h" |
|
128 |
|
129 #define YY_SKIP_YYWRAP 1 |
|
130 @@ -696,7 +696,7 @@ |
|
131 } |
|
132 |
|
133 #include "rcomp.hpp" |
|
134 -#include "fileline.h" |
|
135 +#include "FILELINE.H" |
|
136 |
|
137 #define VALUE_LEN (1024*8) // must match sizeof(YYSTYPE.Value) |
|
138 char buf[VALUE_LEN]; |
|
139 @@ -734,7 +734,7 @@ |
|
140 #pragma warning( disable : 4505 ) |
|
141 #endif //__VC32__ |
|
142 |
|
143 -#include "errorhan.h" |
|
144 +#include "ERRORHAN.H" |
|
145 |
|
146 #define REGISTER_LINE ErrorHandler::Register(pFileLineHandler->GetCurrentFile(), pFileLineHandler->GetErrorLine(* pCurrentLineNumber)) |
|
147 |
|
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/build/bintools/rcomp/src/RCOMP.LEX |
|
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 |
|
150 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/rcomp/src/RCOMP.LEX 2010-05-08 15:45:48.000000000 +0100 |
|
151 @@ -20,9 +20,9 @@ |
|
152 #include <limits.h> |
|
153 #include <string.h> |
|
154 #include "main.h" |
|
155 -#include "structst.h" |
|
156 -#include "parser.h" |
|
157 -#include "localise.h" |
|
158 +#include "STRUCTST.H" |
|
159 +#include "PARSER.H" |
|
160 +#include "LOCALISE.H" |
|
161 |
|
162 #define YY_SKIP_YYWRAP 1 |
|
163 #define YY_NEVER_INTERACTIVE 1 |
|
164 @@ -92,7 +92,7 @@ |
|
165 #pragma warning( disable : 4505 ) |
|
166 #endif //__VC32__ |
|
167 |
|
168 -#include "errorhan.h" |
|
169 +#include "ERRORHAN.H" |
|
170 |
|
171 #define REGISTER_LINE ErrorHandler::Register(pFileLineHandler->GetCurrentFile(), pFileLineHandler->GetErrorLine(* pCurrentLineNumber)) |
|
172 |
|
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/build/bintools/rcomp/src/RCOMP.YACC |
|
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 |
|
175 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/rcomp/src/RCOMP.YACC 2010-05-08 15:47:00.000000000 +0100 |
|
176 @@ -35,8 +35,8 @@ |
|
177 #pragma warning( disable : 4244 ) // C4244: '=' : conversion from 'int' to 'short', possible loss of data |
|
178 #endif //__VC32__ |
|
179 |
|
180 -#include "resource.h" |
|
181 -#include "parser.h" |
|
182 +#include "RESOURCE.H" |
|
183 +#include "PARSER.H" |
|
184 |
|
185 int yylex(); |
|
186 void yyerror(const char* string, ...); |
|
187 @@ -45,14 +45,14 @@ |
|
188 extern int yylineno; |
|
189 |
|
190 #include "rcomp.hpp" |
|
191 -#include "datatype.h" |
|
192 -#include "mem.h" |
|
193 -#include "rcbinstr.h" |
|
194 -#include "rcscan.h" |
|
195 -#include "errorhan.h" |
|
196 -#include "fileacc.h" |
|
197 -#include "version.h" |
|
198 -#include "ctable.h" |
|
199 +#include "DATATYPE.H" |
|
200 +#include "MEM.H" |
|
201 +#include "RCBINSTR.H" |
|
202 +#include "RSCAN.H" |
|
203 +#include "ERRORHAN.H" |
|
204 +#include "FILEACC.H" |
|
205 +#include "VERSION.H" |
|
206 +#include "CTABLE.H" |
|
207 #include "localise.h" |
|
208 #include "main.h" |
|
209 |
|
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/build/buildtoolguides/romtoolsguide/group/bld.inf |
|
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 |
|
212 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/buildtoolguides/romtoolsguide/group/bld.inf 2010-05-08 15:41:44.000000000 +0100 |
|
213 @@ -1,3 +1,3 @@ |
|
214 |
|
215 PRJ_EXPORTS |
|
216 -../com.nokia.rombuild_0.1.jar /plugins/com.nokia.rombuild_0.1.jar |
|
217 \ No newline at end of file |
|
218 +../com.nokia.rombuild_0.1.jar ../../plugins/com.nokia.rombuild_0.1.jar |
|
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/build/buildtoolguides/sbsv2guide/group/bld.inf |
|
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 |
|
221 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/buildtoolguides/sbsv2guide/group/bld.inf 2010-05-08 15:42:04.000000000 +0100 |
|
222 @@ -1,3 +1,3 @@ |
|
223 |
|
224 PRJ_EXPORTS |
|
225 -../com.nokia.sysbuild_0.1.jar /plugins/com.nokia.sysbuild_0.1.jar |
|
226 \ No newline at end of file |
|
227 +../com.nokia.sysbuild_0.1.jar ../../plugins/com.nokia.sysbuild_0.1.jar |
|
228 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/build/e32tools/e32lib/e32image/deflate/deflate.cpp |
|
229 --- /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 |
|
230 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/e32lib/e32image/deflate/deflate.cpp 2010-05-08 14:35:02.000000000 +0100 |
|
231 @@ -87,7 +87,7 @@ |
|
232 |
|
233 inline HDeflateHash* HDeflateHash::NewLC(TInt aLinks) |
|
234 { |
|
235 - return new(HMem::Alloc(0,_FOFF(HDeflateHash,iOffset[Min(aLinks,KDeflateMaxDistance)]))) HDeflateHash; |
|
236 + return new(HMem::Alloc(0,_FOFF(HDeflateHash,iOffset[0]) + (sizeof(TOffset) * Min(aLinks,KDeflateMaxDistance)))) HDeflateHash; |
|
237 } |
|
238 |
|
239 inline TInt HDeflateHash::Hash(const TUint8* aPtr) |
|
240 Only in /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/e32lib/e32image: Makefile.elftran.bak |
|
241 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/build/e32tools/e32lib/group/seclib.mmp |
|
242 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/e32lib/group/seclib.mmp 2010-05-10 19:22:12.068618177 +0100 |
|
243 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/e32lib/group/seclib.mmp 2010-05-08 14:34:04.000000000 +0100 |
|
244 @@ -45,8 +45,11 @@ |
|
245 userinclude ../setcap |
|
246 userinclude ../../e32lib/e32image/inc |
|
247 systeminclude /epoc32/include |
|
248 +systeminclude /epoc32/include/platform |
|
249 |
|
250 OPTION GCC -w |
|
251 +option GCC -w |
|
252 + |
|
253 |
|
254 //macro __PLACEMENT_NEW_INLINE |
|
255 //macro __PLACEMENT_VEC_NEW_INLINE |
|
256 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/build/e32tools/elf2e32/group/elf2e32.mmp |
|
257 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/group/elf2e32.mmp 2010-05-10 19:22:12.072624202 +0100 |
|
258 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/group/elf2e32.mmp 2010-05-08 14:17:32.000000000 +0100 |
|
259 @@ -28,7 +28,9 @@ |
|
260 source byte_pair.cpp pagedcompress.cpp checksum.cpp stdexe_target.cpp |
|
261 |
|
262 systeminclude /epoc32/include /epoc32/include/tools |
|
263 +systeminclude /epoc32/include/platform |
|
264 userinclude ../source ../include |
|
265 +userinclude ../../../bintools/elftools/inc |
|
266 |
|
267 option GCC -w |
|
268 |
|
269 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/build/e32tools/elf2e32/source/deffile.cpp |
|
270 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/deffile.cpp 2010-05-10 19:22:12.072624202 +0100 |
|
271 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/deffile.cpp 2010-05-08 14:31:46.000000000 +0100 |
|
272 @@ -18,9 +18,11 @@ |
|
273 // |
|
274 |
|
275 // |
|
276 -#include <stdio.h> |
|
277 +#include <cstdio> |
|
278 +#include <cstring> |
|
279 #include <iostream> |
|
280 -#include <stdlib.h> |
|
281 +#include <cstdlib> |
|
282 + |
|
283 |
|
284 #include "pl_symbol.h" |
|
285 #include "deffile.h" |
|
286 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/build/e32tools/elf2e32/source/deflatecompress.cpp |
|
287 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/deflatecompress.cpp 2010-05-10 19:22:12.072624202 +0100 |
|
288 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/deflatecompress.cpp 2010-05-08 14:25:12.000000000 +0100 |
|
289 @@ -126,7 +126,8 @@ |
|
290 inline HDeflateHash* HDeflateHash::NewLC(TInt aLinks) |
|
291 { |
|
292 //return new(HMem::Alloc(0,_FOFF(HDeflateHash,iOffset[Min(aLinks,KDeflateMaxDistance)]))) HDeflateHash; |
|
293 - return new(new char[_FOFF(HDeflateHash,iOffset[Min(aLinks,KDeflateMaxDistance)])]) HDeflateHash; |
|
294 + return new(new char[_FOFF(HDeflateHash,iOffset[0]) + |
|
295 + (sizeof(TOffset) * Min(aLinks,KDeflateMaxDistance))]) HDeflateHash; |
|
296 } |
|
297 |
|
298 /** |
|
299 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/build/e32tools/elf2e32/source/e32exporttable.cpp |
|
300 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/e32exporttable.cpp 2010-05-10 19:22:12.076640076 +0100 |
|
301 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/e32exporttable.cpp 2010-05-08 14:18:16.000000000 +0100 |
|
302 @@ -18,6 +18,7 @@ |
|
303 #include "pl_elfexports.h" |
|
304 #include "pl_dllsymbol.h" |
|
305 #include "pl_elflocalrelocation.h" |
|
306 +#include <cstring> |
|
307 |
|
308 /** |
|
309 Destructor for E32ExportTable class. |
|
310 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/build/e32tools/elf2e32/source/e32imagefile.cpp |
|
311 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/e32imagefile.cpp 2010-05-10 19:22:12.076640076 +0100 |
|
312 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/e32imagefile.cpp 2010-05-08 14:20:20.000000000 +0100 |
|
313 @@ -21,6 +21,7 @@ |
|
314 |
|
315 // get E32ImageHeader class... |
|
316 #define INCLUDE_E32IMAGEHEADER_IMPLEMENTATION |
|
317 +#include <cstdio> |
|
318 #define RETURN_FAILURE(_r) return (fprintf(stderr, "line %d\n", __LINE__),_r) |
|
319 //#define E32IMAGEHEADER_TRACE(_t) printf _t |
|
320 #include "e32imagefile.h" |
|
321 @@ -40,11 +41,9 @@ |
|
322 #include <iostream> |
|
323 #ifndef __LINUX__ |
|
324 #include <io.h> |
|
325 -#else |
|
326 - #include <time.h> |
|
327 #endif |
|
328 -#include <time.h> |
|
329 -#include <stdio.h> |
|
330 +#include <ctime> |
|
331 + |
|
332 |
|
333 using namespace std; |
|
334 |
|
335 @@ -365,7 +364,7 @@ |
|
336 iImportSectionSize = aTotalSize; |
|
337 iImportSection = (uint32 *)new char[aTotalSize]; |
|
338 memset(iImportSection, 0, aTotalSize); |
|
339 - memcpy(iImportSection, aImportSection.begin(), aImportSectionSize); |
|
340 + memcpy(iImportSection, &*aImportSection.begin(), aImportSectionSize); |
|
341 char * strTab = ((char *)iImportSection) + aImportSectionSize; |
|
342 memcpy(strTab, aStrTab.data(), aStrTab.size()); |
|
343 |
|
344 @@ -1922,7 +1921,7 @@ |
|
345 memcpy(aInfo, (void*)&aSymInf, sizeof(aSymInf)); |
|
346 |
|
347 TUint aPos = aSymInf.iSymbolTblOffset; |
|
348 - memcpy(aInfo+aPos, iSymAddrTab.begin(), iSymAddrTab.size()*sizeof(uint32)); |
|
349 + memcpy(aInfo+aPos, &*iSymAddrTab.begin(), iSymAddrTab.size()*sizeof(uint32)); |
|
350 |
|
351 aPos += iSymAddrTab.size()*aSizeofNames; |
|
352 aPos += iSymNameOffTab.size()*aSizeofNames; |
|
353 @@ -1933,13 +1932,13 @@ |
|
354 if(aSymInf.iFlags & 1) |
|
355 aOffLen=4; |
|
356 while(Iter != iSymNameOffTab.end()){ |
|
357 - memcpy( ((void*)(aInfo+aPos)), ((void*)Iter), aOffLen); |
|
358 + memcpy( ((void*)(aInfo+aPos)), &*Iter, aOffLen); |
|
359 aPos += aOffLen; |
|
360 Iter++; |
|
361 } |
|
362 |
|
363 aPos = aSymInf.iStringTableOffset; |
|
364 - memcpy(aInfo+aPos, iSymbolNames.begin(), iSymbolNames.size()); |
|
365 + memcpy(aInfo+aPos, &*iSymbolNames.begin(), iSymbolNames.size()); |
|
366 |
|
367 // At the end, the dependencies are listed. They remain zeroes and shall be fixed up |
|
368 // while relocating. |
|
369 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/build/e32tools/elf2e32/source/elffilesupplied.cpp |
|
370 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/elffilesupplied.cpp 2010-05-10 19:22:12.076640076 +0100 |
|
371 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/elffilesupplied.cpp 2010-05-08 14:22:14.000000000 +0100 |
|
372 @@ -25,7 +25,15 @@ |
|
373 |
|
374 #include <algorithm> |
|
375 #include <iostream> |
|
376 -#include<hash_set> |
|
377 +#if __GNUC__ < 4 |
|
378 + #include <ext/hash_set> |
|
379 + #define SET_TYPE __gnu_cxx::hash_set |
|
380 + #define HASH_FUN __gnu_cxx::hash |
|
381 +#else |
|
382 + #include <unordered_set> |
|
383 + #define SET_TYPE std::unordered_set |
|
384 + #define HASH_FUN std::hash |
|
385 +#endif |
|
386 |
|
387 using namespace std; |
|
388 |
|
389 @@ -638,7 +646,7 @@ |
|
390 */ |
|
391 int ElfFileSupplied::UnWantedSymbolp(const char * aSymbol) |
|
392 { |
|
393 - static hash_set<const char*, hash<const char*>, eqstr> aSymbolSet; |
|
394 + static SET_TYPE<const char*, HASH_FUN<const char*>, eqstr> aSymbolSet; |
|
395 int symbollistsize=sizeof(Unwantedruntimesymbols)/sizeof(Unwantedruntimesymbols[0]); |
|
396 static bool FLAG=false; |
|
397 while(!FLAG) |
|
398 @@ -649,7 +657,7 @@ |
|
399 } |
|
400 FLAG=true; |
|
401 } |
|
402 - hash_set<const char*, hash<const char*>, eqstr>::const_iterator it |
|
403 + SET_TYPE<const char*, HASH_FUN<const char*>, eqstr>::const_iterator it |
|
404 = aSymbolSet.find(aSymbol); |
|
405 if(it != aSymbolSet.end()) |
|
406 return 1; |
|
407 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/build/e32tools/elf2e32/source/errorhandler.cpp |
|
408 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/errorhandler.cpp 2010-05-10 19:22:12.076640076 +0100 |
|
409 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/errorhandler.cpp 2010-05-08 14:24:02.000000000 +0100 |
|
410 @@ -26,7 +26,9 @@ |
|
411 #include "errorhandler.h" |
|
412 #include "messagehandler.h" |
|
413 #include <iostream> |
|
414 -#include <stdio.h> |
|
415 +#include <cstdio> |
|
416 +#include <cstring> |
|
417 + |
|
418 using std::cerr; |
|
419 using std::endl; |
|
420 |
|
421 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/build/e32tools/elf2e32/source/huffman.cpp |
|
422 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/huffman.cpp 2010-05-10 19:22:12.085117410 +0100 |
|
423 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/huffman.cpp 2010-05-08 14:25:08.000000000 +0100 |
|
424 @@ -22,6 +22,7 @@ |
|
425 #endif |
|
426 |
|
427 #include <cassert> |
|
428 +#include <cstring> |
|
429 #include "huffman.h" |
|
430 #include "errorhandler.h" |
|
431 #include "farray.h" |
|
432 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/build/e32tools/elf2e32/source/h_utl.cpp |
|
433 --- /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 |
|
434 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/h_utl.cpp 2010-05-08 14:33:02.000000000 +0100 |
|
435 @@ -17,8 +17,9 @@ |
|
436 // |
|
437 // |
|
438 |
|
439 -#include <stdlib.h> |
|
440 -#include <stdio.h> |
|
441 +#include <cstdlib> |
|
442 +#include <cstdio> |
|
443 +#include <cstring> |
|
444 #include "h_utl.h" |
|
445 |
|
446 /** |
|
447 Only in /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source: h_utl.h.bak |
|
448 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/build/e32tools/elf2e32/source/inflate.cpp |
|
449 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/inflate.cpp 2010-05-10 19:22:12.085117410 +0100 |
|
450 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/inflate.cpp 2010-05-08 14:25:46.000000000 +0100 |
|
451 @@ -23,6 +23,8 @@ |
|
452 #include "farray.h" |
|
453 #include "errorhandler.h" |
|
454 #include<iostream> |
|
455 +#include <cstring> |
|
456 + |
|
457 using std::cout; |
|
458 |
|
459 /* |
|
460 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/build/e32tools/elf2e32/source/messageimplementation.cpp |
|
461 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/messageimplementation.cpp 2010-05-10 19:22:12.089117220 +0100 |
|
462 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/messageimplementation.cpp 2010-05-08 14:33:34.000000000 +0100 |
|
463 @@ -23,7 +23,8 @@ |
|
464 #include<iostream> |
|
465 #include<stdarg.h> |
|
466 #include<string> |
|
467 -#include <stdio.h> |
|
468 +#include <cstring> |
|
469 + |
|
470 |
|
471 using std::endl; |
|
472 using std::cout; |
|
473 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/build/e32tools/elf2e32/source/parametermanager.cpp |
|
474 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/parametermanager.cpp 2010-05-10 19:22:12.089117220 +0100 |
|
475 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/parametermanager.cpp 2010-05-08 14:29:50.000000000 +0100 |
|
476 @@ -2247,7 +2247,7 @@ |
|
477 { |
|
478 int len = nq; |
|
479 symbol = new char[len+1]; |
|
480 - memcpy(symbol, p, len); |
|
481 + memcpy(symbol, &*p, len); |
|
482 symbol[len] = 0; |
|
483 q = nq+1; |
|
484 |
|
485 @@ -2387,7 +2387,7 @@ |
|
486 if (*e == '-' || *e == '+') break; |
|
487 } |
|
488 if (e != b) |
|
489 - ParseCapability1(b, e, aCapabilities, invert); |
|
490 + ParseCapability1(&*b, &*e, aCapabilities, invert); |
|
491 |
|
492 b = e; |
|
493 |
|
494 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/build/e32tools/elf2e32/source/pl_elfexecutable.h |
|
495 --- /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 |
|
496 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/pl_elfexecutable.h 2010-05-08 14:31:06.000000000 +0100 |
|
497 @@ -22,13 +22,19 @@ |
|
498 |
|
499 #include "pl_common.h" |
|
500 #include <list> |
|
501 -#include <hash_map> |
|
502 +#if __GNUC__ < 4 |
|
503 + #include <ext/hash_map> |
|
504 + #define MAP_TYPE __gnu_cxx::hash_map |
|
505 +#else |
|
506 + #include <unordered_map> |
|
507 + #define MAP_TYPE std::unordered_map |
|
508 +#endif |
|
509 #include "pl_elfimports.h" |
|
510 #include "pl_elfrelocations.h" |
|
511 #include "pl_elfexports.h" |
|
512 |
|
513 using std::list; |
|
514 -using std::hash_map; |
|
515 +using MAP_TYPE; |
|
516 |
|
517 class DllSymbol; |
|
518 class Symbol; |
|
519 @@ -122,7 +128,7 @@ |
|
520 * The dynamic symbol array. |
|
521 */ |
|
522 Elf32_Sym *iElfDynSym;//The ELF symbol |
|
523 - hash_map<PLUINT32, DllSymbol*> iSymbolTable; //The representation |
|
524 + MAP_TYPE<PLUINT32, DllSymbol*> iSymbolTable; //The representation |
|
525 |
|
526 /** |
|
527 * The static symbol table. |
|
528 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/build/e32tools/elf2e32/source/pl_elfexports.cpp |
|
529 --- /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 |
|
530 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/pl_elfexports.cpp 2010-05-08 14:20:44.000000000 +0100 |
|
531 @@ -20,6 +20,7 @@ |
|
532 #include "pl_elfexports.h" |
|
533 #include "pl_elfexecutable.h" |
|
534 #include "pl_dllsymbol.h" |
|
535 +#include <cstring> |
|
536 |
|
537 using std::set_difference; |
|
538 |
|
539 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/build/e32tools/elf2e32/source/pl_elfimports.cpp |
|
540 --- /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 |
|
541 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/pl_elfimports.cpp 2010-05-08 14:32:18.000000000 +0100 |
|
542 @@ -19,6 +19,7 @@ |
|
543 |
|
544 #include "pl_elfimports.h" |
|
545 #include "pl_elfimportrelocation.h" |
|
546 +#include <cstring> |
|
547 |
|
548 /** |
|
549 Constructor for class ElfImports |
|
550 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/build/e32tools/elf2e32/source/pl_elfproducer.cpp |
|
551 --- /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 |
|
552 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/pl_elfproducer.cpp 2010-05-08 14:23:30.000000000 +0100 |
|
553 @@ -22,6 +22,7 @@ |
|
554 #include <stdio.h> |
|
555 #include <string> |
|
556 #include "errorhandler.h" |
|
557 +#include <cstring> |
|
558 |
|
559 /** |
|
560 * Following array is indexed on the SECTION_INDEX enum |
|
561 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/build/e32tools/elf2e32/source/pl_symbol.cpp |
|
562 --- /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 |
|
563 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/pl_symbol.cpp 2010-05-08 14:18:40.000000000 +0100 |
|
564 @@ -18,6 +18,7 @@ |
|
565 // |
|
566 |
|
567 #include "pl_symbol.h" |
|
568 +#include <cstring> |
|
569 |
|
570 |
|
571 /** |
|
572 Only in /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/buildrom/tools: cdf.dtd.bak |
|
573 Only in /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/buildrom/tools: featuredatabase.dtd.bak |
|
574 Only in /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/buildrom/tools: featureuids.dtd.bak |
|
575 Only in /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/buildrom/tools: imageContent.dtd.bak |
|
576 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/build/imgtools/imgcheck/group/bld.inf |
|
577 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/group/bld.inf 2010-05-10 19:22:12.133117501 +0100 |
|
578 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/group/bld.inf 2010-05-08 15:25:20.000000000 +0100 |
|
579 @@ -21,8 +21,10 @@ |
|
580 |
|
581 // These libraries needs to be exported |
|
582 PRJ_EXPORTS |
|
583 +#ifndef TOOLS2_LINUX |
|
584 ../libxml/lib/libxml2.a /epoc32/release/tools2/rel/libxml2.a |
|
585 ../libxml/lib/libxml2.a /epoc32/release/tools2/deb/libxml2.a |
|
586 +#endif |
|
587 ../src/imgcheck.xsl /epoc32/tools/imgcheck.xsl |
|
588 ./imgcheck.pl /epoc32/tools/imgcheck.pl |
|
589 ./imgcheck.cmd /epoc32/tools/imgcheck.cmd |
|
590 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/build/imgtools/imgcheck/group/imgcheck.mmp |
|
591 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/group/imgcheck.mmp 2010-05-10 19:22:12.133117501 +0100 |
|
592 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/group/imgcheck.mmp 2010-05-08 17:31:00.000000000 +0100 |
|
593 @@ -25,17 +25,24 @@ |
|
594 SOURCE exceptionimplementation.cpp exceptionreporter.cpp |
|
595 SOURCE cmdlinewriter.cpp xmlwriter.cpp dbgflagchecker.cpp |
|
596 USERINCLUDE ../libimgutils/inc ../inc ../../imglib/compress |
|
597 +#ifndef TOOLS2_LINUX |
|
598 USERINCLUDE ../../imglib/boostlibrary |
|
599 +#endif |
|
600 |
|
601 OS_LAYER_SYSTEMINCLUDE_SYMBIAN |
|
602 +#ifndef TOOLS2_LINUX |
|
603 SYSTEMINCLUDE ../libxml ../ |
|
604 +#endif |
|
605 |
|
606 SYSTEMINCLUDE ../../imglib/inc ../../romtools/rofsbuild |
|
607 |
|
608 -STATICLIBRARY imgutils xml2 wsock32 stlport.5.1 patchdataprocessor |
|
609 #ifdef TOOLS2_LINUX |
|
610 -STATICLIBRARY boost_thread-mgw34-mt-1_39_linux |
|
611 -OPTION GCC -pthread -O2 -Wno-uninitialized |
|
612 +STATICLIBRARY imgutils patchdataprocessor |
|
613 +#else |
|
614 +STATICLIBRARY imgutils xml2 wsock32 patchdataprocessor |
|
615 +#endif |
|
616 +#ifdef TOOLS2_LINUX |
|
617 +OPTION GCC -pthread -O2 -Wno-uninitialized -isystem /usr/include/libxml2 -lxml2 -lboost_thread-mt |
|
618 #else |
|
619 STATICLIBRARY boost_thread-mgw34-mt-1_39_win32 |
|
620 OPTION GCC -mthreads -O2 -Wno-uninitialized |
|
621 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/build/imgtools/imgcheck/inc/cmdlinehandler.h |
|
622 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/cmdlinehandler.h 2010-05-10 19:22:13.089118113 +0100 |
|
623 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/inc/cmdlinehandler.h 2010-05-08 15:31:40.000000000 +0100 |
|
624 @@ -120,7 +120,7 @@ |
|
625 @internalComponent |
|
626 @released |
|
627 */ |
|
628 -typedef enum Suppress |
|
629 +enum Suppress |
|
630 { |
|
631 EDep = 0x1, |
|
632 ESid = 0x2, |
|
633 @@ -136,7 +136,7 @@ |
|
634 @internalComponent |
|
635 @released |
|
636 */ |
|
637 -typedef enum NumberOfValue |
|
638 +enum NumberOfValue |
|
639 { |
|
640 ENone = 0x0, |
|
641 ESingle = 0x1, |
|
642 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/build/imgtools/imgcheck/inc/common.h |
|
643 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/common.h 2010-05-10 19:22:13.089118113 +0100 |
|
644 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/inc/common.h 2010-05-08 15:30:02.000000000 +0100 |
|
645 @@ -86,7 +86,7 @@ |
|
646 @internalComponent |
|
647 @released |
|
648 */ |
|
649 -typedef enum ReturnType |
|
650 +enum ReturnType |
|
651 { |
|
652 ESuccess = 0, |
|
653 EQuit, |
|
654 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/build/imgtools/imgcheck/inc/exceptionimplementation.h |
|
655 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/exceptionimplementation.h 2010-05-10 19:22:13.089118113 +0100 |
|
656 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/inc/exceptionimplementation.h 2010-05-08 15:30:50.000000000 +0100 |
|
657 @@ -91,7 +91,7 @@ |
|
658 struct Messages |
|
659 { |
|
660 int iIndex; |
|
661 - char* iMessage; |
|
662 + char const * iMessage; |
|
663 }; |
|
664 |
|
665 /** |
|
666 @@ -110,7 +110,7 @@ |
|
667 void Report(const String aMsg); |
|
668 |
|
669 private: |
|
670 - ofstream iLogStream; |
|
671 + Ofstream iLogStream; |
|
672 IndexVsMessageMap iMessage; |
|
673 unsigned int iMsgIndex; |
|
674 static unsigned int iCmdFlag; |
|
675 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/build/imgtools/imgcheck/inc/xmlwriter.h |
|
676 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/xmlwriter.h 2010-05-10 19:22:13.093117295 +0100 |
|
677 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/inc/xmlwriter.h 2010-05-08 15:32:40.000000000 +0100 |
|
678 @@ -24,7 +24,12 @@ |
|
679 #define XMLWRITER_H |
|
680 |
|
681 #include "reportwriter.h" |
|
682 -#include "libxml/xmlwriter.h" |
|
683 +#if defined(__LINUX__) |
|
684 + #include <libxml/xmlwriter.h> |
|
685 +#endif |
|
686 +#if defined(WIN32) |
|
687 + #include "libxml/xmlwriter.h" |
|
688 +#endif |
|
689 #include "common.h" |
|
690 |
|
691 /** |
|
692 @@ -107,7 +112,7 @@ |
|
693 |
|
694 private: |
|
695 // File stream for xml output. |
|
696 - ofstream iXmlFile; |
|
697 + Ofstream iXmlFile; |
|
698 // Xml file name for output. |
|
699 const String iXmlFileName; |
|
700 // Xml Buffer pointer. |
|
701 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/build/imgtools/imgcheck/libimgutils/inc/typedefs.h |
|
702 --- /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 |
|
703 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/libimgutils/inc/typedefs.h 2010-05-08 15:36:00.000000000 +0100 |
|
704 @@ -28,8 +28,8 @@ |
|
705 |
|
706 #undef _L |
|
707 |
|
708 -#include <fstream.h> |
|
709 -#include <iostream.h> |
|
710 +#include <fstream> |
|
711 +#include <iostream> |
|
712 #include <list> |
|
713 #include <vector> |
|
714 #include <map> |
|
715 @@ -53,10 +53,10 @@ |
|
716 @internalComponent |
|
717 @released |
|
718 */ |
|
719 -typedef ios Ios; |
|
720 +typedef std::ios Ios; |
|
721 typedef std::string String; |
|
722 -typedef ofstream Ofstream; |
|
723 -typedef ifstream Ifstream; |
|
724 +typedef std::ofstream Ofstream; |
|
725 +typedef std::ifstream Ifstream; |
|
726 typedef std::list<String> StringList; |
|
727 typedef std::map<unsigned int, String> UintVsString; |
|
728 typedef std::map<unsigned int, UintVsString> RomAddrVsExeName; |
|
729 @@ -95,7 +95,7 @@ |
|
730 @internalComponent |
|
731 @released |
|
732 */ |
|
733 -typedef enum EImageType |
|
734 +enum EImageType |
|
735 { |
|
736 EUnknownImage, |
|
737 ERomImage, |
|
738 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/build/imgtools/imgcheck/libimgutils/src/dirreader.cpp |
|
739 --- /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 |
|
740 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/libimgutils/src/dirreader.cpp 2010-05-08 15:34:42.000000000 +0100 |
|
741 @@ -119,9 +119,9 @@ |
|
742 void DirReader::ProcessImage() |
|
743 { |
|
744 char* cwd = new char[MAXPATHLEN]; |
|
745 - getcwd(cwd,MAXPATHLEN); |
|
746 + char *cp = getcwd(cwd,MAXPATHLEN); (void)cp; |
|
747 ReadDir(iImgFileName); |
|
748 - chdir(cwd); |
|
749 + int i = chdir(cwd); (void)i; |
|
750 if(cwd != NULL) |
|
751 delete [] cwd; |
|
752 cwd = 0; |
|
753 @@ -139,8 +139,11 @@ |
|
754 */ |
|
755 void DirReader::ReadDir(String aPath) |
|
756 { |
|
757 +#ifndef __LINUX__ |
|
758 int handle; |
|
759 int retVal = 0; |
|
760 +#endif |
|
761 + |
|
762 E32Image* e32Image = KNull; |
|
763 |
|
764 #ifdef __LINUX__ |
|
765 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/build/imgtools/imgcheck/libimgutils/src/romreader.cpp |
|
766 --- /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 |
|
767 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/libimgutils/src/romreader.cpp 2010-05-08 15:33:14.000000000 +0100 |
|
768 @@ -53,7 +53,7 @@ |
|
769 RomReader::RomReader(const char* aFile, EImageType aImgType) |
|
770 : ImageReader(aFile), iImageHeader(0), iData(0), iImgType(aImgType) |
|
771 { |
|
772 - iRomImageRootDirEntry = new RomImageDirEntry(""); |
|
773 + iRomImageRootDirEntry = new RomImageDirEntry(const_cast<char *>("")); |
|
774 } |
|
775 |
|
776 /** |
|
777 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/build/imgtools/imgcheck/src/cmdlinehandler.cpp |
|
778 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/cmdlinehandler.cpp 2010-05-10 19:22:13.137118346 +0100 |
|
779 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/src/cmdlinehandler.cpp 2010-05-08 15:21:44.000000000 +0100 |
|
780 @@ -25,6 +25,7 @@ |
|
781 */ |
|
782 |
|
783 #include "cmdlinehandler.h" |
|
784 +#include <cstring> |
|
785 |
|
786 /** |
|
787 Constructor initializes the iOptionMap with short and long option names as key and |
|
788 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/build/imgtools/imgcheck/src/cmdlinewriter.cpp |
|
789 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/cmdlinewriter.cpp 2010-05-10 19:22:13.137118346 +0100 |
|
790 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/src/cmdlinewriter.cpp 2010-05-08 15:22:18.000000000 +0100 |
|
791 @@ -24,6 +24,7 @@ |
|
792 */ |
|
793 |
|
794 #include "cmdlinewriter.h" |
|
795 +#include <cstring> |
|
796 |
|
797 /** |
|
798 Constructor: CmdLineWriter class |
|
799 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/build/imgtools/imgcheck/src/exceptionimplementation.cpp |
|
800 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/exceptionimplementation.cpp 2010-05-10 19:22:13.137118346 +0100 |
|
801 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/src/exceptionimplementation.cpp 2010-05-08 15:24:58.000000000 +0100 |
|
802 @@ -187,7 +187,7 @@ |
|
803 |
|
804 if(iCmdFlag & KVerbose) |
|
805 { |
|
806 - cout << aMsg.c_str() << endl; |
|
807 + std::cout << aMsg.c_str() << std::endl; |
|
808 } |
|
809 } |
|
810 |
|
811 @@ -207,10 +207,10 @@ |
|
812 iLogStream << aMsg.c_str() << "\n"; |
|
813 if(aMsg.find("Success") != String::npos) |
|
814 { |
|
815 - cout << aMsg.c_str() << endl; |
|
816 + std::cout << aMsg.c_str() << std::endl; |
|
817 } |
|
818 else |
|
819 { |
|
820 - cerr << aMsg.c_str() << endl; |
|
821 + std::cerr << aMsg.c_str() << std::endl; |
|
822 } |
|
823 } |
|
824 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/build/imgtools/imgcheck/src/sidchecker.cpp |
|
825 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/sidchecker.cpp 2010-05-10 19:22:13.141117388 +0100 |
|
826 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/src/sidchecker.cpp 2010-05-08 15:24:08.000000000 +0100 |
|
827 @@ -249,8 +249,8 @@ |
|
828 { |
|
829 exeAtt->iAttStatus = KNull; |
|
830 } |
|
831 - if((iAllExecutables |
|
832 - || (exeAtt->iAttStatus == KDuplicate)) && !exeAtt->iAttStatus.empty() |
|
833 + if(((iAllExecutables |
|
834 + || (exeAtt->iAttStatus == KDuplicate)) && !exeAtt->iAttStatus.empty()) |
|
835 || iNoCheck) |
|
836 { |
|
837 aExeContainer->iExeAttList.push_back(exeAtt); |
|
838 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/build/imgtools/imgcheck/src/xmlwriter.cpp |
|
839 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/xmlwriter.cpp 2010-05-10 19:22:13.141117388 +0100 |
|
840 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/src/xmlwriter.cpp 2010-05-09 13:32:35.689287394 +0100 |
|
841 @@ -24,9 +24,10 @@ |
|
842 */ |
|
843 |
|
844 #include "xmlwriter.h" |
|
845 +#include <cstring> |
|
846 |
|
847 #ifndef __LINUX__ |
|
848 - #include "/epoc32/gcc_mingw/include/windows.h" |
|
849 + #include <windows.h> |
|
850 #endif //__LINUX__ |
|
851 |
|
852 /** |
|
853 @@ -99,7 +100,7 @@ |
|
854 } |
|
855 xslSourcePath.append(KXslFileName.c_str()); |
|
856 |
|
857 - ifstream xslSourceHandle; |
|
858 + Ifstream xslSourceHandle; |
|
859 xslSourceHandle.open(xslSourcePath.c_str(), Ios::binary); |
|
860 if(!xslSourceHandle) |
|
861 { |
|
862 @@ -116,7 +117,7 @@ |
|
863 xslSourceHandle.read(filetocopy,fileSize); |
|
864 xslSourceHandle.close(); |
|
865 |
|
866 - ofstream xslDestHandle(xslDestPath.c_str(), Ios::binary | Ios::out); |
|
867 + Ofstream xslDestHandle(xslDestPath.c_str(), Ios::binary | Ios::out); |
|
868 if(!xslDestHandle) |
|
869 { |
|
870 delete [] filetocopy; |
|
871 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/build/imgtools/imglib/boostlibrary/boost/thread/pthread/thread_data.hpp |
|
872 --- /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 |
|
873 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/boostlibrary/boost/thread/pthread/thread_data.hpp 2010-05-09 13:34:57.929288271 +0100 |
|
874 @@ -8,7 +8,7 @@ |
|
875 #include <boost/thread/detail/config.hpp> |
|
876 #include <boost/thread/exceptions.hpp> |
|
877 #include <boost/shared_ptr.hpp> |
|
878 -#include <boost/enable_shared_from_this.hpp> |
|
879 +#include <boost/smart_ptr/enable_shared_from_this.hpp> |
|
880 #include <boost/thread/mutex.hpp> |
|
881 #include <boost/optional.hpp> |
|
882 #include <pthread.h> |
|
883 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/build/imgtools/imglib/e32image/deflate/deflate.cpp |
|
884 --- /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 |
|
885 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/e32image/deflate/deflate.cpp 2010-05-08 14:38:16.000000000 +0100 |
|
886 @@ -20,6 +20,7 @@ |
|
887 #include "deflate.h" |
|
888 #include "h_utl.h" |
|
889 #include "panic.h" |
|
890 +#define OFFSETOF(c,f) (((TInt)&(((c *)0x1000)->f))-0x1000) |
|
891 |
|
892 class HDeflateHash |
|
893 { |
|
894 @@ -89,7 +90,8 @@ |
|
895 |
|
896 inline HDeflateHash* HDeflateHash::NewLC(TInt aLinks) |
|
897 { |
|
898 - return new(HMem::Alloc(0,_FOFF(HDeflateHash,iOffset[Min(aLinks,KDeflateMaxDistance)]))) HDeflateHash; |
|
899 + return new(new char[OFFSETOF(HDeflateHash,iOffset[0]) + |
|
900 + (sizeof(TOffset) * Min(aLinks,KDeflateMaxDistance))]) HDeflateHash; |
|
901 } |
|
902 |
|
903 inline TInt HDeflateHash::Hash(const TUint8* aPtr) |
|
904 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/build/imgtools/imglib/e32image/deflate/panic.cpp |
|
905 --- /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 |
|
906 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/e32image/deflate/panic.cpp 2010-05-08 14:37:24.000000000 +0100 |
|
907 @@ -21,7 +21,7 @@ |
|
908 #include "h_utl.h" |
|
909 #include <stdlib.h> |
|
910 |
|
911 -char* HuffmanError[]= { |
|
912 +char const * HuffmanError[]= { |
|
913 "Huffman: Too many codes\n", |
|
914 "Huffman: Invalid coding\n", |
|
915 "Huffman: Buffer overflow\n", |
|
916 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/build/imgtools/imglib/e32uid/uidcrc.cpp |
|
917 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/e32uid/uidcrc.cpp 2010-05-10 19:22:13.761118115 +0100 |
|
918 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/e32uid/uidcrc.cpp 2010-05-08 14:36:56.000000000 +0100 |
|
919 @@ -55,7 +55,7 @@ |
|
920 |
|
921 for (i=1; i<4; i++) |
|
922 { |
|
923 - char* endptr = "failed"; |
|
924 + char * endptr; |
|
925 uids[i] = strtoul(argv[i],&endptr,0); |
|
926 if (*endptr!='\0') |
|
927 { |
|
928 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/build/imgtools/imglib/filesystem/source/cluster.cpp |
|
929 --- /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 |
|
930 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/cluster.cpp 2010-05-08 14:42:50.000000000 +0100 |
|
931 @@ -143,7 +143,9 @@ |
|
932 { |
|
933 if(iCurrentClusterNumber >= iTotalNumberOfClusters) |
|
934 { |
|
935 - throw ErrorHandler(IMAGESIZETOOBIG,"Occupied number of clusters count exceeded than available clusters",__FILE__,__LINE__); |
|
936 + throw ErrorHandler(IMAGESIZETOOBIG, |
|
937 + const_cast<char *>("Occupied number of clusters count exceeded than available clusters"), |
|
938 + const_cast<char *>(__FILE__),__LINE__); |
|
939 } |
|
940 ++iCurrentClusterNumber; |
|
941 } |
|
942 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/build/imgtools/imglib/filesystem/source/dirregion.cpp |
|
943 --- /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 |
|
944 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/dirregion.cpp 2010-05-08 14:47:44.000000000 +0100 |
|
945 @@ -49,7 +49,9 @@ |
|
946 iClusterPtr = CCluster::Instance(iClusterSize,totalClusters); |
|
947 if(iClusterPtr == NULL) |
|
948 { |
|
949 - throw ErrorHandler(CLUSTERERROR,"Instance creation error", __FILE__, __LINE__); |
|
950 + throw ErrorHandler(CLUSTERERROR, |
|
951 + const_cast<char *>("Instance creation error"), |
|
952 + const_cast<char *>( __FILE__), __LINE__); |
|
953 } |
|
954 iClusterSize = iClusterPtr->GetClusterSize(); |
|
955 } |
|
956 @@ -117,7 +119,8 @@ |
|
957 aOutPutStream.flush(); |
|
958 if(aOutPutStream.bad()) |
|
959 { |
|
960 - throw ErrorHandler(FILEWRITEERROR, __FILE__, __LINE__); |
|
961 + throw ErrorHandler(FILEWRITEERROR, const_cast<char *>(__FILE__), __LINE__); |
|
962 + |
|
963 } |
|
964 } |
|
965 |
|
966 @@ -175,7 +178,7 @@ |
|
967 } |
|
968 else |
|
969 { |
|
970 - throw ErrorHandler(EMPTYFILENAME, __FILE__, __LINE__); |
|
971 + throw ErrorHandler(EMPTYFILENAME, const_cast<char *>(__FILE__), __LINE__); |
|
972 } |
|
973 } |
|
974 |
|
975 @@ -247,7 +250,7 @@ |
|
976 if(tempString.length() == 0) |
|
977 { |
|
978 tempString.erase(); |
|
979 - throw ErrorHandler(EMPTYFILENAME, __FILE__, __LINE__); |
|
980 + throw ErrorHandler(EMPTYFILENAME, const_cast<char *>(__FILE__), __LINE__); |
|
981 } |
|
982 else |
|
983 { |
|
984 @@ -314,7 +317,8 @@ |
|
985 iInputStream.open(aEntry->GetFilePath().c_str(),Ios::binary); |
|
986 if(iInputStream.fail() == true ) |
|
987 { |
|
988 - throw ErrorHandler(FILEOPENERROR,(char*)aEntry->GetFilePath().c_str(),__FILE__,__LINE__); |
|
989 + throw ErrorHandler(FILEOPENERROR,const_cast<char *>(aEntry->GetFilePath().c_str()), |
|
990 + const_cast<char *>(__FILE__),__LINE__); |
|
991 } |
|
992 else |
|
993 { |
|
994 @@ -324,7 +328,8 @@ |
|
995 char* dataBuffer = (char*)malloc((unsigned int)fileSize); |
|
996 if(dataBuffer == 0) |
|
997 { |
|
998 - throw ErrorHandler(MEMORYALLOCATIONERROR, __FILE__, __LINE__); |
|
999 + throw ErrorHandler(MEMORYALLOCATIONERROR, |
|
1000 + const_cast<char *>(__FILE__), __LINE__); |
|
1001 } |
|
1002 //Read the whole file in one short |
|
1003 iInputStream.read (dataBuffer,fileSize); |
|
1004 @@ -332,7 +337,8 @@ |
|
1005 Long64 bytesRead = (unsigned int)iInputStream.tellg(); |
|
1006 if((iInputStream.bad()) || (bytesRead != fileSize)) |
|
1007 { |
|
1008 - throw ErrorHandler(FILEREADERROR,(char*)aEntry->GetFilePath().c_str(), __FILE__, __LINE__); |
|
1009 + throw ErrorHandler(FILEREADERROR,const_cast<char *>(aEntry->GetFilePath().c_str()), |
|
1010 + const_cast<char *>(__FILE__), __LINE__); |
|
1011 } |
|
1012 String clusterData(dataBuffer,(unsigned int)bytesRead); |
|
1013 PushStringIntoClusterMap(iClusterPtr->GetCurrentClusterNumber(),clusterData,iClusterSize,aEntry->GetEntryAttribute()); |
|
1014 @@ -544,12 +550,12 @@ |
|
1015 } |
|
1016 if(aNodeList.front()->GetEntryList()->size() <= 0) |
|
1017 { |
|
1018 - throw ErrorHandler(NOENTRIESFOUND, __FILE__, __LINE__); |
|
1019 + throw ErrorHandler(NOENTRIESFOUND, const_cast<char *>(__FILE__), __LINE__); |
|
1020 } |
|
1021 } |
|
1022 else |
|
1023 { |
|
1024 - throw ErrorHandler(ROOTNOTFOUND, __FILE__, __LINE__); |
|
1025 + throw ErrorHandler(ROOTNOTFOUND, const_cast<char *>(__FILE__), __LINE__); |
|
1026 } |
|
1027 } |
|
1028 |
|
1029 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/build/imgtools/imglib/filesystem/source/errorhandler.cpp |
|
1030 --- /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 |
|
1031 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/errorhandler.cpp 2010-05-08 14:42:14.000000000 +0100 |
|
1032 @@ -22,9 +22,10 @@ |
|
1033 |
|
1034 #include "errorhandler.h" |
|
1035 #include "messagehandler.h" |
|
1036 +#include <cstring> |
|
1037 |
|
1038 -char *errMssgPrefix="FileSystem : Error:"; |
|
1039 -char *Gspace=" "; |
|
1040 +char const *errMssgPrefix="FileSystem : Error:"; |
|
1041 +char const *Gspace=" "; |
|
1042 |
|
1043 /** |
|
1044 ErrorHandler constructor for doing common thing required for derived |
|
1045 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/build/imgtools/imglib/filesystem/source/fat16bootsector.cpp |
|
1046 --- /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 |
|
1047 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/fat16bootsector.cpp 2010-05-08 14:43:40.000000000 +0100 |
|
1048 @@ -21,6 +21,7 @@ |
|
1049 */ |
|
1050 |
|
1051 #include "fat16bootsector.h" |
|
1052 +#include <cstring> |
|
1053 |
|
1054 /** |
|
1055 Constructor of the fat16 boot sector class |
|
1056 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/build/imgtools/imglib/filesystem/source/fat16filesystem.cpp |
|
1057 --- /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 |
|
1058 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/fat16filesystem.cpp 2010-05-08 14:45:06.000000000 +0100 |
|
1059 @@ -21,7 +21,7 @@ |
|
1060 */ |
|
1061 |
|
1062 #include"fat16filesystem.h" |
|
1063 - |
|
1064 +#include <cstring> |
|
1065 |
|
1066 /** |
|
1067 Initializes the boot sector of a FAT 16 volume |
|
1068 @@ -76,45 +76,45 @@ |
|
1069 //copying of boot sector values in to the array |
|
1070 iData = new unsigned char[BytesPerSector]; |
|
1071 unsigned int pos = 0; |
|
1072 - memcpy(&iData[pos],JmpBoot,3); |
|
1073 + memmove(&iData[pos],JmpBoot,3); |
|
1074 pos += 3; |
|
1075 - memcpy(&iData[pos],OEMName,8); |
|
1076 + memmove(&iData[pos],OEMName,8); |
|
1077 pos += 8; |
|
1078 - memcpy(&iData[pos],&BytesPerSector,2); |
|
1079 + memmove(&iData[pos],&BytesPerSector,2); |
|
1080 pos += 2; |
|
1081 - memcpy(&iData[pos],&SectorsPerCluster,1); |
|
1082 + memmove(&iData[pos],&SectorsPerCluster,1); |
|
1083 pos += 1; |
|
1084 - memcpy(&iData[pos],&ReservedSectors,2); |
|
1085 + memmove(&iData[pos],&ReservedSectors,2); |
|
1086 pos += 2; |
|
1087 - memcpy(&iData[pos],&NumFats,1); |
|
1088 + memmove(&iData[pos],&NumFats,1); |
|
1089 pos += 1; |
|
1090 - memcpy(&iData[pos],&RootDirEntries,2); |
|
1091 + memmove(&iData[pos],&RootDirEntries,2); |
|
1092 pos += 2; |
|
1093 - memcpy(&iData[pos],&LowSectors,2); |
|
1094 + memmove(&iData[pos],&LowSectors,2); |
|
1095 pos += 2; |
|
1096 - memcpy(&iData[pos],&Media,1); |
|
1097 + memmove(&iData[pos],&Media,1); |
|
1098 pos += 1; |
|
1099 - memcpy(&iData[pos],&FatSectors,2); |
|
1100 + memmove(&iData[pos],&FatSectors,2); |
|
1101 pos += 2; |
|
1102 - memcpy(&iData[pos],&SectorPerTrack,2); |
|
1103 + memmove(&iData[pos],&SectorPerTrack,2); |
|
1104 pos += 2; |
|
1105 - memcpy(&iData[pos],&NumberOfHeads,2); |
|
1106 + memmove(&iData[pos],&NumberOfHeads,2); |
|
1107 pos += 2; |
|
1108 - memcpy(&iData[pos],&HiddenSectors,4); |
|
1109 + memmove(&iData[pos],&HiddenSectors,4); |
|
1110 pos += 4; |
|
1111 - memcpy(&iData[pos],&HighSectorsCount,4); |
|
1112 + memmove(&iData[pos],&HighSectorsCount,4); |
|
1113 pos += 4; |
|
1114 - memcpy(&iData[pos],&BootSectorDriveNumber,1); |
|
1115 + memmove(&iData[pos],&BootSectorDriveNumber,1); |
|
1116 pos += 1; |
|
1117 - memcpy(&iData[pos],&ReservedByte,1); |
|
1118 + memmove(&iData[pos],&ReservedByte,1); |
|
1119 pos += 1; |
|
1120 - memcpy(&iData[pos],&BootSignature,1); |
|
1121 + memmove(&iData[pos],&BootSignature,1); |
|
1122 pos += 1; |
|
1123 - memcpy(&iData[pos],&VolumeId,4); |
|
1124 + memmove(&iData[pos],&VolumeId,4); |
|
1125 pos += 4; |
|
1126 - memcpy(&iData[pos],VolumeLab,11); |
|
1127 + memmove(&iData[pos],VolumeLab,11); |
|
1128 pos += 11; |
|
1129 - memcpy(&iData[pos],FileSysType,8); |
|
1130 + memmove(&iData[pos],FileSysType,8); |
|
1131 pos += 8; |
|
1132 while(pos < BytesPerSector) |
|
1133 { |
|
1134 @@ -133,7 +133,7 @@ |
|
1135 ComputeClusterSizeInBytes(); |
|
1136 ComputeRootDirSectors(); |
|
1137 ComputeBytesPerSector(); |
|
1138 - MessageHandler::ReportMessage (INFORMATION,BOOTSECTORCREATEMSG, "FAT16"); |
|
1139 + MessageHandler::ReportMessage (INFORMATION,BOOTSECTORCREATEMSG, const_cast<char *>("FAT16")); |
|
1140 } |
|
1141 |
|
1142 /** |
|
1143 @@ -145,7 +145,7 @@ |
|
1144 */ |
|
1145 void CFat16FileSystem::WriteBootSector(ofstream& aOutPutStream) |
|
1146 { |
|
1147 - MessageHandler::ReportMessage (INFORMATION,BOOTSECTORWRITEMSG,"FAT16"); |
|
1148 + MessageHandler::ReportMessage (INFORMATION,BOOTSECTORWRITEMSG,const_cast<char *>("FAT16")); |
|
1149 aOutPutStream.write(reinterpret_cast<char*>(&iData[0]),iFAT16BootSector.BytesPerSector()); |
|
1150 aOutPutStream.flush(); |
|
1151 } |
|
1152 @@ -195,8 +195,8 @@ |
|
1153 // Each FAT16 entries occupies 2 bytes, hence multiply by 2 |
|
1154 aFatString.append((totalFatEntries - clusterCounter)*2, 0); |
|
1155 } |
|
1156 - MessageHandler::ReportMessage (INFORMATION,FATTABLEWRITEMSG, |
|
1157 - "FAT16"); |
|
1158 + |
|
1159 + MessageHandler::ReportMessage (INFORMATION,FATTABLEWRITEMSG,const_cast<char *>("FAT16")); |
|
1160 |
|
1161 // Write FAT table multiple times depending upon the No of FATS set. |
|
1162 unsigned int noOfFats = iFAT16BootSector.NumberOfFats(); |
|
1163 @@ -258,11 +258,15 @@ |
|
1164 iTotalClusters = iTotalDataSectors / iFAT16BootSector.SectorsPerCluster(); |
|
1165 if(iTotalClusters < KMinimumFat16Clusters) |
|
1166 { |
|
1167 - throw ErrorHandler(BOOTSECTORERROR,"Low Partition Size",__FILE__,__LINE__); |
|
1168 + throw ErrorHandler(BOOTSECTORERROR, |
|
1169 + const_cast<char *>("Low Partition Size"), |
|
1170 + const_cast<char *>(__FILE__),__LINE__); |
|
1171 } |
|
1172 if(iTotalClusters > KMaximumFat16Clusters) |
|
1173 { |
|
1174 - throw ErrorHandler(BOOTSECTORERROR,"High Partition Size",__FILE__,__LINE__); |
|
1175 + throw ErrorHandler(BOOTSECTORERROR, |
|
1176 + const_cast<char *>("High Partition Size"), |
|
1177 + const_cast<char *>(__FILE__),__LINE__); |
|
1178 } |
|
1179 |
|
1180 } |
|
1181 @@ -313,6 +317,6 @@ |
|
1182 catch(...) |
|
1183 { |
|
1184 delete dirRegionPtr; |
|
1185 - throw ErrorHandler(UNKNOWNERROR, __FILE__, __LINE__); |
|
1186 + throw ErrorHandler(UNKNOWNERROR, const_cast<char *>(__FILE__), __LINE__); |
|
1187 } |
|
1188 } |
|
1189 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/build/imgtools/imglib/filesystem/source/fat32bootsector.cpp |
|
1190 --- /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 |
|
1191 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/fat32bootsector.cpp 2010-05-08 14:48:14.000000000 +0100 |
|
1192 @@ -21,6 +21,7 @@ |
|
1193 */ |
|
1194 |
|
1195 #include "fat32bootsector.h" |
|
1196 +#include <cstring> |
|
1197 |
|
1198 /** |
|
1199 Constructor of the fat16 boot sector class |
|
1200 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/build/imgtools/imglib/filesystem/source/fat32filesystem.cpp |
|
1201 --- /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 |
|
1202 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/fat32filesystem.cpp 2010-05-08 14:41:04.000000000 +0100 |
|
1203 @@ -21,6 +21,7 @@ |
|
1204 */ |
|
1205 |
|
1206 #include"fat32filesystem.h" |
|
1207 +#include <cstring> |
|
1208 |
|
1209 /** |
|
1210 Initializes the boot sector of a FAT 32 volume |
|
1211 @@ -90,59 +91,59 @@ |
|
1212 //copying of boot sector values in to the array |
|
1213 iData = new unsigned char[BytesPerSector]; |
|
1214 unsigned int pos = 0; |
|
1215 - memcpy(&iData[pos],JmpBoot,3); |
|
1216 + memmove(&iData[pos],JmpBoot,3); |
|
1217 pos += 3; |
|
1218 - memcpy(&iData[pos],OEMName,8); |
|
1219 + memmove(&iData[pos],OEMName,8); |
|
1220 pos += 8; |
|
1221 - memcpy(&iData[pos],&BytesPerSector,2); |
|
1222 + memmove(&iData[pos],&BytesPerSector,2); |
|
1223 pos += 2; |
|
1224 - memcpy(&iData[pos],&SectorsPerCluster,1); |
|
1225 + memmove(&iData[pos],&SectorsPerCluster,1); |
|
1226 pos += 1; |
|
1227 - memcpy(&iData[pos],&ReservedSectors,2); |
|
1228 + memmove(&iData[pos],&ReservedSectors,2); |
|
1229 pos += 2; |
|
1230 - memcpy(&iData[pos],&NumFats,1); |
|
1231 + memmove(&iData[pos],&NumFats,1); |
|
1232 pos += 1; |
|
1233 - memcpy(&iData[pos],&RootDirEntries,2); |
|
1234 + memmove(&iData[pos],&RootDirEntries,2); |
|
1235 pos += 2; |
|
1236 - memcpy(&iData[pos],&LowSectors,2); |
|
1237 + memmove(&iData[pos],&LowSectors,2); |
|
1238 pos += 2; |
|
1239 - memcpy(&iData[pos],&Media,1); |
|
1240 + memmove(&iData[pos],&Media,1); |
|
1241 pos += 1; |
|
1242 - memcpy(&iData[pos],&FatSectors,2); |
|
1243 + memmove(&iData[pos],&FatSectors,2); |
|
1244 pos += 2; |
|
1245 - memcpy(&iData[pos],&SectorPerTrack,2); |
|
1246 + memmove(&iData[pos],&SectorPerTrack,2); |
|
1247 pos += 2; |
|
1248 - memcpy(&iData[pos],&NumberOfHeads,2); |
|
1249 + memmove(&iData[pos],&NumberOfHeads,2); |
|
1250 pos += 2; |
|
1251 - memcpy(&iData[pos],&HiddenSectors,4); |
|
1252 + memmove(&iData[pos],&HiddenSectors,4); |
|
1253 pos += 4; |
|
1254 - memcpy(&iData[pos],&HighSectorsCount,4); |
|
1255 + memmove(&iData[pos],&HighSectorsCount,4); |
|
1256 pos += 4; |
|
1257 - memcpy(&iData[pos],&FatSectors32,4); |
|
1258 + memmove(&iData[pos],&FatSectors32,4); |
|
1259 pos += 4; |
|
1260 - memcpy(&iData[pos],&ExtFlags,2); |
|
1261 + memmove(&iData[pos],&ExtFlags,2); |
|
1262 pos += 2; |
|
1263 - memcpy(&iData[pos],&FileSystemVersion,2); |
|
1264 + memmove(&iData[pos],&FileSystemVersion,2); |
|
1265 pos += 2; |
|
1266 - memcpy(&iData[pos],&RootCluster,4); |
|
1267 + memmove(&iData[pos],&RootCluster,4); |
|
1268 pos += 4; |
|
1269 - memcpy(&iData[pos],&FSInfo,2); |
|
1270 + memmove(&iData[pos],&FSInfo,2); |
|
1271 pos += 2; |
|
1272 - memcpy(&iData[pos],&BackUpBootSector,2); |
|
1273 + memmove(&iData[pos],&BackUpBootSector,2); |
|
1274 pos += 2; |
|
1275 - memcpy(&iData[pos],FutureReserved,12); |
|
1276 + memmove(&iData[pos],FutureReserved,12); |
|
1277 pos += 12; |
|
1278 - memcpy(&iData[pos],&BootSectorDriveNumber,1); |
|
1279 + memmove(&iData[pos],&BootSectorDriveNumber,1); |
|
1280 pos += 1; |
|
1281 - memcpy(&iData[pos],&ReservedByte,1); |
|
1282 + memmove(&iData[pos],&ReservedByte,1); |
|
1283 pos += 1; |
|
1284 - memcpy(&iData[pos],&BootSignature,1); |
|
1285 + memmove(&iData[pos],&BootSignature,1); |
|
1286 pos += 1; |
|
1287 - memcpy(&iData[pos],&VolumeId,4); |
|
1288 + memmove(&iData[pos],&VolumeId,4); |
|
1289 pos += 4; |
|
1290 - memcpy(&iData[pos],VolumeLab,11); |
|
1291 + memmove(&iData[pos],VolumeLab,11); |
|
1292 pos += 11; |
|
1293 - memcpy(&iData[pos],FileSystemType,8); |
|
1294 + memmove(&iData[pos],FileSystemType,8); |
|
1295 pos += 8; |
|
1296 while(pos < BytesPerSector) |
|
1297 { |
|
1298 @@ -159,7 +160,7 @@ |
|
1299 ComputeClusterSizeInBytes(); |
|
1300 ComputeRootDirSectors(); |
|
1301 ComputeBytesPerSector(); |
|
1302 - MessageHandler::ReportMessage (INFORMATION,BOOTSECTORCREATEMSG, "FAT32"); |
|
1303 + MessageHandler::ReportMessage (INFORMATION,BOOTSECTORCREATEMSG, const_cast<char *>("FAT32")); |
|
1304 } |
|
1305 |
|
1306 /** |
|
1307 @@ -172,7 +173,7 @@ |
|
1308 */ |
|
1309 void CFat32FileSystem::WriteBootSector(ofstream& aOutPutStream) |
|
1310 { |
|
1311 - MessageHandler::ReportMessage (INFORMATION,BOOTSECTORWRITEMSG, "FAT32"); |
|
1312 + MessageHandler::ReportMessage (INFORMATION,BOOTSECTORWRITEMSG, const_cast<char *>("FAT32")); |
|
1313 aOutPutStream.write(reinterpret_cast<char*>(&iData[0]),iFAT32BootSector.BytesPerSector()); |
|
1314 aOutPutStream.flush(); |
|
1315 } |
|
1316 @@ -228,8 +229,9 @@ |
|
1317 // Each FAT32 entries occupies 4 bytes, hence multiply by 4 |
|
1318 aFatString.append((totalFatEntries - clusterCounter)*4, 0); |
|
1319 } |
|
1320 - MessageHandler::ReportMessage (INFORMATION,FATTABLEWRITEMSG, |
|
1321 - "FAT32"); |
|
1322 + |
|
1323 + MessageHandler::ReportMessage (INFORMATION,FATTABLEWRITEMSG,const_cast<char *>("FAT32")); |
|
1324 + |
|
1325 //Write FAT table multiple times depending on the value of No of FATS set. |
|
1326 unsigned int noOfFats = iFAT32BootSector.NumberOfFats(); |
|
1327 for(unsigned int i=0; i<noOfFats; i++) |
|
1328 @@ -254,19 +256,19 @@ |
|
1329 unsigned int bytesPerSector = iFAT32BootSector.BytesPerSector(); |
|
1330 FSinfoData = new unsigned char[bytesPerSector]; |
|
1331 iFSInfo.SetFSInfo(); |
|
1332 - memcpy(&FSinfoData[counter], &iFSInfo.FSI_LeadSign,4); |
|
1333 + memmove(&FSinfoData[counter], &iFSInfo.FSI_LeadSign,4); |
|
1334 counter += 4; |
|
1335 - memcpy(&FSinfoData[counter], &iFSInfo.FSI_Reserved,480); |
|
1336 + memmove(&FSinfoData[counter], &iFSInfo.FSI_Reserved,480); |
|
1337 counter += 480; |
|
1338 - memcpy(&FSinfoData[counter], &iFSInfo.FSI_StrucSig,4); |
|
1339 + memmove(&FSinfoData[counter], &iFSInfo.FSI_StrucSig,4); |
|
1340 counter += 4; |
|
1341 - memcpy(&FSinfoData[counter], &iFSInfo.FSI_Free_Count,4); |
|
1342 + memmove(&FSinfoData[counter], &iFSInfo.FSI_Free_Count,4); |
|
1343 counter += 4; |
|
1344 - memcpy(&FSinfoData[counter], &iFSInfo.FSI_Nxt_Free,4); |
|
1345 + memmove(&FSinfoData[counter], &iFSInfo.FSI_Nxt_Free,4); |
|
1346 counter += 4; |
|
1347 - memcpy(&FSinfoData[counter], &iFSInfo.FSI_Reserved2,12); |
|
1348 + memmove(&FSinfoData[counter], &iFSInfo.FSI_Reserved2,12); |
|
1349 counter += 12; |
|
1350 - memcpy(&FSinfoData[counter], &iFSInfo.FSI_TrailSig,4); |
|
1351 + memmove(&FSinfoData[counter], &iFSInfo.FSI_TrailSig,4); |
|
1352 counter += 4; |
|
1353 counter += (bytesPerSector-KSizeOfFatBootSector); |
|
1354 aOutPutStream.write(reinterpret_cast<char*>(&FSinfoData[0]),counter); |
|
1355 @@ -367,11 +369,15 @@ |
|
1356 iTotalClusters = totalDataSectors / iFAT32BootSector.SectorsPerCluster(); |
|
1357 if(iTotalClusters < KMinimumFat32Clusters) |
|
1358 { |
|
1359 - throw ErrorHandler(BOOTSECTORERROR,"Low Partition Size",__FILE__, __LINE__); |
|
1360 + throw ErrorHandler(BOOTSECTORERROR, |
|
1361 + const_cast<char *>("Low Partition Size"), |
|
1362 + const_cast<char *>(__FILE__), __LINE__); |
|
1363 } |
|
1364 else if(iTotalClusters > KMaximumFat32Clusters) |
|
1365 { |
|
1366 - throw ErrorHandler(BOOTSECTORERROR,"high Partition Size",__FILE__, __LINE__); |
|
1367 + throw ErrorHandler(BOOTSECTORERROR, |
|
1368 + const_cast<char *>("high Partition Size"), |
|
1369 + const_cast<char *>(__FILE__), __LINE__); |
|
1370 } |
|
1371 } |
|
1372 /** |
|
1373 @@ -424,7 +430,7 @@ |
|
1374 { |
|
1375 delete dirRegionPtr; |
|
1376 dirRegionPtr = NULL; |
|
1377 - throw ErrorHandler(UNKNOWNERROR, __FILE__, __LINE__); |
|
1378 + throw ErrorHandler(UNKNOWNERROR, const_cast<char *>(__FILE__), __LINE__); |
|
1379 } |
|
1380 } |
|
1381 |
|
1382 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/build/imgtools/imglib/filesystem/source/fatbasebootsector.cpp |
|
1383 --- /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 |
|
1384 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/fatbasebootsector.cpp 2010-05-08 14:43:16.000000000 +0100 |
|
1385 @@ -22,6 +22,7 @@ |
|
1386 */ |
|
1387 |
|
1388 #include "fatbasebootsector.h" |
|
1389 +#include <cstring> |
|
1390 |
|
1391 /** |
|
1392 Constructor of the base boot sector class |
|
1393 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/build/imgtools/imglib/filesystem/source/filesysteminterface.cpp |
|
1394 --- /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 |
|
1395 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/filesysteminterface.cpp 2010-05-08 14:41:36.000000000 +0100 |
|
1396 @@ -62,7 +62,9 @@ |
|
1397 iOutputStream.open(aImageFileName,ios::out|ios::binary); |
|
1398 if(iOutputStream.fail() == true ) |
|
1399 { |
|
1400 - throw ErrorHandler(FILEOPENERROR,aImageFileName,__FILE__, __LINE__); |
|
1401 + throw ErrorHandler(FILEOPENERROR, |
|
1402 + const_cast<char *>(aImageFileName), |
|
1403 + const_cast<char *>(__FILE__), __LINE__); |
|
1404 } |
|
1405 switch(aFileSystem) |
|
1406 { |
|
1407 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/build/imgtools/imglib/filesystem/source/longname.cpp |
|
1408 --- /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 |
|
1409 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/longname.cpp 2010-05-08 14:45:46.000000000 +0100 |
|
1410 @@ -21,6 +21,7 @@ |
|
1411 |
|
1412 |
|
1413 #include "longname.h" |
|
1414 +#include <cstring> |
|
1415 |
|
1416 |
|
1417 /** |
|
1418 @@ -48,7 +49,7 @@ |
|
1419 iLongNameLength = iLongName.length(); |
|
1420 if(iLongNameLength == 0) |
|
1421 { |
|
1422 - throw ErrorHandler(EMPTYFILENAME, __FILE__, __LINE__); |
|
1423 + throw ErrorHandler(EMPTYFILENAME, const_cast<char *>(__FILE__), __LINE__); |
|
1424 } |
|
1425 FormatLongFileName(iLongName); |
|
1426 iShortName = GetShortEntryName(); |
|
1427 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/build/imgtools/imglib/filesystem/source/messageimplementation.cpp |
|
1428 --- /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 |
|
1429 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/messageimplementation.cpp 2010-05-08 14:49:08.000000000 +0100 |
|
1430 @@ -23,15 +23,17 @@ |
|
1431 |
|
1432 #include "messageimplementation.h" |
|
1433 #include "errorhandler.h" |
|
1434 +#include <cstring> |
|
1435 |
|
1436 using std::endl; |
|
1437 using std::cout; |
|
1438 typedef std::string String; |
|
1439 |
|
1440 -char *errorMssgPrefix="FileSystem : Error:"; |
|
1441 -char *warnMssgPrefix="FileSystem : Warning:"; |
|
1442 -char *infoMssgPrefix="FileSystem : Information:"; |
|
1443 -char *Space=" "; |
|
1444 +char const *errorMssgPrefix="FileSystem : Error:"; |
|
1445 +char const *warnMssgPrefix="FileSystem : Warning:"; |
|
1446 +char const *infoMssgPrefix="FileSystem : Information:"; |
|
1447 +char const *Space=" "; |
|
1448 + |
|
1449 |
|
1450 enum MessageArraySize{MAX=16}; |
|
1451 |
|
1452 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/build/imgtools/imglib/host/h_utl.cpp |
|
1453 --- /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 |
|
1454 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/host/h_utl.cpp 2010-05-08 14:36:18.000000000 +0100 |
|
1455 @@ -177,7 +177,7 @@ |
|
1456 |
|
1457 |
|
1458 TInt build=0; |
|
1459 - memset(&aVersion, sizeof(TVersion), 0); |
|
1460 + memset(&aVersion, 0, sizeof(TVersion)); |
|
1461 TInt i; |
|
1462 TInt len=strlen(str); |
|
1463 for (i=0; i<len; i++) |
|
1464 @@ -192,7 +192,7 @@ |
|
1465 { |
|
1466 cout << "\n Warning: major version must be in range 0 - 127 \n"; |
|
1467 } |
|
1468 - char* pMinor = strchr(str, '.'); |
|
1469 + char const * pMinor = strchr(str, '.'); |
|
1470 if (pMinor) |
|
1471 { |
|
1472 pMinor++; |
|
1473 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/build/imgtools/imglib/inc/h_utl.h |
|
1474 --- /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 |
|
1475 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/inc/h_utl.h 2010-05-08 14:39:00.000000000 +0100 |
|
1476 @@ -65,9 +65,6 @@ |
|
1477 #define _stricmp strcasecmp |
|
1478 #define strnicmp strncasecmp |
|
1479 |
|
1480 -// to fix the linux problem: memcpy does not work with overlapped areas. |
|
1481 -#define memcpy memmove |
|
1482 - |
|
1483 // hand-rolled strupr function for converting a string to all uppercase |
|
1484 char* strupr(char *a); |
|
1485 |
|
1486 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/build/imgtools/imglib/parameterfileprocessor/source/parameterfileprocessor.cpp |
|
1487 --- /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 |
|
1488 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/parameterfileprocessor/source/parameterfileprocessor.cpp 2010-05-08 14:35:28.000000000 +0100 |
|
1489 @@ -21,6 +21,7 @@ |
|
1490 |
|
1491 |
|
1492 #include "parameterfileprocessor.h" |
|
1493 +#include <cstring> |
|
1494 |
|
1495 |
|
1496 /** |
|
1497 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/build/imgtools/romtools/group/BLD.INF |
|
1498 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/group/BLD.INF 2010-05-10 19:22:13.781117167 +0100 |
|
1499 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/group/BLD.INF 2010-04-29 15:03:58.000000000 +0100 |
|
1500 @@ -15,13 +15,14 @@ |
|
1501 * |
|
1502 */ |
|
1503 |
|
1504 +#include <productvariant.hrh> |
|
1505 |
|
1506 PRJ_PLATFORMS |
|
1507 TOOLS2 |
|
1508 |
|
1509 PRJ_EXPORTS |
|
1510 |
|
1511 -../maksym/fixupsym.bat /epoc32/tools/fixupsym.bat |
|
1512 +../maksym/fixupsym.bat EPOCROOT_EXPORT_PATH(epoc32/tools/fixupsym.bat) |
|
1513 ../maksym/hpsym.bat /epoc32/tools/hpsym.bat |
|
1514 ../maksym/maksym.bat /epoc32/tools/maksym.bat |
|
1515 ../maksym/maksymrofs.bat /epoc32/tools/maksymrofs.bat |
|
1516 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/build/imgtools/romtools/group/readimage.mmp |
|
1517 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/group/readimage.mmp 2010-05-10 19:22:13.781117167 +0100 |
|
1518 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/group/readimage.mmp 2010-05-08 14:49:50.000000000 +0100 |
|
1519 @@ -45,15 +45,16 @@ |
|
1520 userinclude ..\..\imglib\compress |
|
1521 userinclude ..\..\imglib\patchdataprocessor\include |
|
1522 userinclude ..\..\sisutils\inc |
|
1523 +#ifndef TOOLS2_LINUX |
|
1524 userinclude ..\..\imglib\boostlibrary |
|
1525 +#endif |
|
1526 |
|
1527 USERINCLUDE ..\..\imglib\inc |
|
1528 OS_LAYER_SYSTEMINCLUDE_SYMBIAN |
|
1529 |
|
1530 staticlibrary sisutils |
|
1531 #ifdef TOOLS2_LINUX |
|
1532 -STATICLIBRARY boost_thread-mgw34-mt-1_39_linux |
|
1533 -OPTION GCC -pthread -O2 -Wno-uninitialized |
|
1534 +OPTION GCC -pthread -O2 -Wno-uninitialized -lboost_thread-mt |
|
1535 #else |
|
1536 STATICLIBRARY boost_thread-mgw34-mt-1_39_win32 |
|
1537 OPTION GCC -mthreads -O2 -Wno-uninitialized |
|
1538 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/build/imgtools/romtools/readimage/inc/common.h |
|
1539 --- /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 |
|
1540 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/inc/common.h 2010-05-08 15:01:02.000000000 +0100 |
|
1541 @@ -46,7 +46,7 @@ |
|
1542 #define DLL_UID1 10000079 |
|
1543 #define EXE_UID1 1000007a |
|
1544 |
|
1545 -typedef enum EImageType |
|
1546 +enum EImageType |
|
1547 { |
|
1548 EUNKNOWN_IMAGE, |
|
1549 EROM_IMAGE, |
|
1550 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/build/imgtools/romtools/readimage/inc/image_reader.h |
|
1551 --- /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 |
|
1552 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/inc/image_reader.h 2010-05-08 15:02:34.000000000 +0100 |
|
1553 @@ -27,7 +27,19 @@ |
|
1554 |
|
1555 |
|
1556 #include "common.h" |
|
1557 -#include <direct.h> |
|
1558 +#if defined(WIN32) |
|
1559 + #include <direct.h> |
|
1560 + #define GETCWD _getcwd |
|
1561 + #define CHDIR _chdir |
|
1562 + #define MKDIR(dir) _mkdir(dir) |
|
1563 +#elif defined(__LINUX__) |
|
1564 + #include <sys/stat.h> |
|
1565 + #include <unistd.h> |
|
1566 + #define GETCWD getcwd |
|
1567 + #define CHDIR chdir |
|
1568 + #define MKDIR(dir) mkdir((dir),S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) |
|
1569 +#endif |
|
1570 + |
|
1571 #include <map> |
|
1572 |
|
1573 typedef struct tag_FILEINFO |
|
1574 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/build/imgtools/romtools/readimage/inc/rofs_image_reader.h |
|
1575 --- /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 |
|
1576 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/inc/rofs_image_reader.h 2010-05-08 15:01:40.000000000 +0100 |
|
1577 @@ -65,7 +65,7 @@ |
|
1578 void DumpDirStructure(); |
|
1579 void DumpFileAttributes(); |
|
1580 void MarkNodes(); |
|
1581 - void SetSeek(streampos aOff, ios::seek_dir aStartPos=ios::beg); |
|
1582 + void SetSeek(streampos aOff, std::ios_base::seekdir aStartPos); |
|
1583 void ExtractImageContents(); |
|
1584 void CheckFileExtension(char* aFileName,TRomBuilderEntry* aEntry,TRomNode* aNode,ofstream& aLogFile ); |
|
1585 void GetCompleteNodePath(TRomNode* aNode,string& aName,char* aAppStr); |
|
1586 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/build/imgtools/romtools/readimage/src/e32_image_reader.cpp |
|
1587 --- /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 |
|
1588 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/src/e32_image_reader.cpp 2010-05-08 15:00:20.000000000 +0100 |
|
1589 @@ -74,27 +74,27 @@ |
|
1590 { |
|
1591 bool aContinue = true; |
|
1592 |
|
1593 - DumpInHex("Size", aE32Image.iSize ) << endl; |
|
1594 - DumpInHex("Uids",aE32Image.iOrigHdr->iUid1); |
|
1595 - DumpInHex(" ",aE32Image.iOrigHdr->iUid2, aContinue); |
|
1596 - DumpInHex(" ",aE32Image.iOrigHdr->iUid3, aContinue); |
|
1597 - DumpInHex(" ",aE32Image.iOrigHdr->iUidChecksum, aContinue) << endl; |
|
1598 - |
|
1599 - |
|
1600 - DumpInHex("Entry point", aE32Image.iOrigHdr->iEntryPoint ) << endl; |
|
1601 - DumpInHex("Code start addr" ,aE32Image.iOrigHdr->iCodeBase)<< endl; |
|
1602 - DumpInHex("Data start addr" ,aE32Image.iOrigHdr->iDataBase) << endl; |
|
1603 - DumpInHex("Text size" ,aE32Image.iOrigHdr->iTextSize) << endl; |
|
1604 - DumpInHex("Code size" ,aE32Image.iOrigHdr->iCodeSize) << endl; |
|
1605 - DumpInHex("Data size" ,aE32Image.iOrigHdr->iDataSize) << endl; |
|
1606 - DumpInHex("Bss size" ,aE32Image.iOrigHdr->iBssSize) << endl; |
|
1607 - DumpInHex("Total data size" ,(aE32Image.iOrigHdr->iBssSize + aE32Image.iOrigHdr->iDataSize)) << endl; |
|
1608 - DumpInHex("Heap min" ,aE32Image.iOrigHdr->iHeapSizeMin) << endl; |
|
1609 - DumpInHex("Heap max" ,aE32Image.iOrigHdr->iHeapSizeMax) << endl; |
|
1610 - DumpInHex("Stack size" ,aE32Image.iOrigHdr->iStackSize) << endl; |
|
1611 - DumpInHex("Export directory" ,aE32Image.iOrigHdr->iExportDirOffset) << endl; |
|
1612 - DumpInHex("Export dir count" ,aE32Image.iOrigHdr->iExportDirCount) << endl; |
|
1613 - DumpInHex("Flags" ,aE32Image.iOrigHdr->iFlags) << endl; |
|
1614 + DumpInHex(const_cast<char *>("Size"), aE32Image.iSize ) << endl; |
|
1615 + DumpInHex(const_cast<char *>("Uids"),aE32Image.iOrigHdr->iUid1); |
|
1616 + DumpInHex(const_cast<char *>(" "),aE32Image.iOrigHdr->iUid2, aContinue); |
|
1617 + DumpInHex(const_cast<char *>(" "),aE32Image.iOrigHdr->iUid3, aContinue); |
|
1618 + DumpInHex(const_cast<char *>(" "),aE32Image.iOrigHdr->iUidChecksum, aContinue) << endl; |
|
1619 + |
|
1620 + |
|
1621 + DumpInHex(const_cast<char *>("Entry point"), aE32Image.iOrigHdr->iEntryPoint ) << endl; |
|
1622 + DumpInHex(const_cast<char *>("Code start addr") ,aE32Image.iOrigHdr->iCodeBase)<< endl; |
|
1623 + DumpInHex(const_cast<char *>("Data start addr") ,aE32Image.iOrigHdr->iDataBase) << endl; |
|
1624 + DumpInHex(const_cast<char *>("Text size") ,aE32Image.iOrigHdr->iTextSize) << endl; |
|
1625 + DumpInHex(const_cast<char *>("Code size") ,aE32Image.iOrigHdr->iCodeSize) << endl; |
|
1626 + DumpInHex(const_cast<char *>("Data size") ,aE32Image.iOrigHdr->iDataSize) << endl; |
|
1627 + DumpInHex(const_cast<char *>("Bss size") ,aE32Image.iOrigHdr->iBssSize) << endl; |
|
1628 + DumpInHex(const_cast<char *>("Total data size") ,(aE32Image.iOrigHdr->iBssSize + aE32Image.iOrigHdr->iDataSize)) << endl; |
|
1629 + DumpInHex(const_cast<char *>("Heap min") ,aE32Image.iOrigHdr->iHeapSizeMin) << endl; |
|
1630 + DumpInHex(const_cast<char *>("Heap max") ,aE32Image.iOrigHdr->iHeapSizeMax) << endl; |
|
1631 + DumpInHex(const_cast<char *>("Stack size") ,aE32Image.iOrigHdr->iStackSize) << endl; |
|
1632 + DumpInHex(const_cast<char *>("Export directory") ,aE32Image.iOrigHdr->iExportDirOffset) << endl; |
|
1633 + DumpInHex(const_cast<char *>("Export dir count") ,aE32Image.iOrigHdr->iExportDirCount) << endl; |
|
1634 + DumpInHex(const_cast<char *>("Flags") ,aE32Image.iOrigHdr->iFlags) << endl; |
|
1635 |
|
1636 TUint aHeaderFmt = E32ImageHeader::HdrFmtFromFlags(aE32Image.iOrigHdr->iFlags); |
|
1637 |
|
1638 @@ -105,10 +105,10 @@ |
|
1639 // because this is relied on by used by "Symbian Signed". |
|
1640 // |
|
1641 E32ImageHeaderV* v = aE32Image.iHdr; |
|
1642 - DumpInHex("Secure ID", v->iS.iSecureId) << endl; |
|
1643 - DumpInHex("Vendor ID", v->iS.iVendorId) << endl; |
|
1644 - DumpInHex("Capability", v->iS.iCaps[1]); |
|
1645 - DumpInHex(" ", v->iS.iCaps[0], aContinue) << endl; |
|
1646 + DumpInHex(const_cast<char *>("Secure ID"), v->iS.iSecureId) << endl; |
|
1647 + DumpInHex(const_cast<char *>("Vendor ID"), v->iS.iVendorId) << endl; |
|
1648 + DumpInHex(const_cast<char *>("Capability"), v->iS.iCaps[1]); |
|
1649 + DumpInHex(const_cast<char *>(" "), v->iS.iCaps[0], aContinue) << endl; |
|
1650 |
|
1651 } |
|
1652 |
|
1653 @@ -119,15 +119,17 @@ |
|
1654 *out << "(" << dec << aE32Image.iOrigHdr->iToolsVersion.iBuild << ")" << endl; |
|
1655 |
|
1656 *out << "Module Version.............." << dec << (aE32Image.iOrigHdr->iModuleVersion >> 16) << endl; |
|
1657 - DumpInHex("Compression", aE32Image.iOrigHdr->iCompressionType) << endl; |
|
1658 + DumpInHex(const_cast<char *>("Compression"), aE32Image.iOrigHdr->iCompressionType) << endl; |
|
1659 |
|
1660 if( aHeaderFmt >= KImageHdrFmt_V ) |
|
1661 { |
|
1662 E32ImageHeaderV* v = aE32Image.iHdr; |
|
1663 - DumpInHex("Exception Descriptor", v->iExceptionDescriptor) << endl; |
|
1664 - DumpInHex("Code offset", v->iCodeOffset) << endl; |
|
1665 + DumpInHex(const_cast<char *>("Exception Descriptor"), v->iExceptionDescriptor) << endl; |
|
1666 + DumpInHex(const_cast<char *>("Code offset"), v->iCodeOffset) << endl; |
|
1667 + |
|
1668 } |
|
1669 |
|
1670 *out << "Priority...................." << dec << aE32Image.iOrigHdr->iProcessPriority << endl; |
|
1671 - DumpInHex("Dll ref table size", aE32Image.iOrigHdr->iDllRefTableCount) << endl << endl << endl; |
|
1672 + DumpInHex(const_cast<char *>("Dll ref table size"), aE32Image.iOrigHdr->iDllRefTableCount) << endl << endl << endl; |
|
1673 } |
|
1674 + |
|
1675 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/build/imgtools/romtools/readimage/src/image_handler.cpp |
|
1676 --- /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 |
|
1677 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/src/image_handler.cpp 2010-05-08 14:59:02.000000000 +0100 |
|
1678 @@ -392,7 +392,8 @@ |
|
1679 { |
|
1680 if(iInputFileName.empty()) |
|
1681 { |
|
1682 - throw SisUtilsException("Usage Error", "No SIS file passed"); |
|
1683 + throw SisUtilsException(const_cast<char *>("Usage Error"), |
|
1684 + const_cast<char *>("No SIS file passed")); |
|
1685 } |
|
1686 |
|
1687 iSisUtils = new Sis2Iby((char*)iInputFileName.c_str()); |
|
1688 @@ -409,7 +410,8 @@ |
|
1689 } |
|
1690 else |
|
1691 { |
|
1692 - throw SisUtilsException("Error:", "Cannot create Sis2Iby object"); |
|
1693 + throw SisUtilsException(const_cast<char *>("Error:"), |
|
1694 + const_cast<char *>("Cannot create Sis2Iby object")); |
|
1695 } |
|
1696 } |
|
1697 } |
|
1698 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/build/imgtools/romtools/readimage/src/image_reader.cpp |
|
1699 --- /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 |
|
1700 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/src/image_reader.cpp 2010-05-08 14:57:10.000000000 +0100 |
|
1701 @@ -173,7 +173,7 @@ |
|
1702 |
|
1703 |
|
1704 // get the current working directory and store in buffer. |
|
1705 - if( _getcwd(currWorkingDir,_MAX_BUFFER_SIZE_) == NULL ) |
|
1706 + if( GETCWD(currWorkingDir,_MAX_BUFFER_SIZE_) == NULL ) |
|
1707 { |
|
1708 // throw an exception if unable to get current working directory information. |
|
1709 throw ImageReaderException((char*)ImageReader::iImgFileName.c_str(), "Failed to get the current working directory"); |
|
1710 @@ -191,7 +191,7 @@ |
|
1711 changeToDrive.append(aDelimiter); |
|
1712 |
|
1713 // change the current working directory to the specified directory. |
|
1714 - if( _chdir(changeToDrive.c_str()) ) |
|
1715 + if( CHDIR(changeToDrive.c_str()) ) |
|
1716 { |
|
1717 // throw an exception if unable to change the directory specified. |
|
1718 throw ImageReaderException((char*)ImageReader::iImgFileName.c_str(), "Failed to change to the directory specified"); |
|
1719 @@ -200,23 +200,23 @@ |
|
1720 else |
|
1721 { |
|
1722 // if not,then create a cPtr directory. |
|
1723 - _mkdir(cPtr); |
|
1724 + MKDIR(cPtr); |
|
1725 // change the current working directory to cPtr. |
|
1726 - _chdir(cPtr); |
|
1727 + int r = CHDIR(cPtr); (void)r; |
|
1728 } |
|
1729 // repeat till cPtr is NULL. |
|
1730 while (cPtr!=NULL) |
|
1731 { |
|
1732 - if (cPtr = strtok(NULL,aDelimiter)) |
|
1733 + if ((cPtr = strtok(NULL,aDelimiter)) != NULL) |
|
1734 { |
|
1735 // create the directory. |
|
1736 - _mkdir(cPtr); |
|
1737 + MKDIR(cPtr); |
|
1738 // change current working directory. |
|
1739 - _chdir(cPtr); |
|
1740 + int r = CHDIR(cPtr); (void)r; |
|
1741 } |
|
1742 } |
|
1743 // revert back the working directory. |
|
1744 - _chdir(currWorkingDir); |
|
1745 + int r = CHDIR(currWorkingDir); (void)r; |
|
1746 // replace the source path with the original path information. |
|
1747 strcpy(aSrcPath,origPath.c_str()); |
|
1748 delete[] currWorkingDir; |
|
1749 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/build/imgtools/romtools/readimage/src/rofs_image_reader.cpp |
|
1750 --- /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 |
|
1751 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/src/rofs_image_reader.cpp 2010-05-08 14:58:12.000000000 +0100 |
|
1752 @@ -42,7 +42,7 @@ |
|
1753 delete iImageReader; |
|
1754 } |
|
1755 |
|
1756 -void RofsImageReader::SetSeek(streampos aOff, ios::seek_dir aStartPos) |
|
1757 +void RofsImageReader::SetSeek(streampos aOff, std::ios_base::seekdir aStartPos) |
|
1758 { |
|
1759 if(!iInputFile) |
|
1760 return; |
|
1761 @@ -290,7 +290,7 @@ |
|
1762 |
|
1763 *out << "********************************************************************" << endl; |
|
1764 iPath.assign((char*)aNode->iName); |
|
1765 - GetCompleteNodePath(aNode,iPath,"/"); |
|
1766 + GetCompleteNodePath(aNode,iPath,const_cast<char *>("/")); |
|
1767 *out << "File........................" << iPath.c_str() << endl; |
|
1768 if( aNode->iEntry->iExecutable ) |
|
1769 { |
|
1770 @@ -417,7 +417,8 @@ |
|
1771 { |
|
1772 // get the complete path |
|
1773 path.assign( (char*)aNode->iName ); |
|
1774 - GetCompleteNodePath( aNode, path, "\\\\" ); |
|
1775 + GetCompleteNodePath( aNode, path, const_cast<char *>("\\\\") ); |
|
1776 + |
|
1777 } |
|
1778 else |
|
1779 { |
|
1780 @@ -496,7 +497,7 @@ |
|
1781 { |
|
1782 // get the complete path |
|
1783 path.assign( (char*)aNode->iName ); |
|
1784 - GetCompleteNodePath( aNode, path, "\\" ); |
|
1785 + GetCompleteNodePath( aNode, path, const_cast<char *>("\\") ); |
|
1786 } |
|
1787 else |
|
1788 { |
|
1789 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/build/imgtools/romtools/readimage/src/rom_image_reader.cpp |
|
1790 --- /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 |
|
1791 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/src/rom_image_reader.cpp 2010-05-08 14:55:36.000000000 +0100 |
|
1792 @@ -20,6 +20,12 @@ |
|
1793 #include <e32rom.h> |
|
1794 #include "rom_image_reader.h" |
|
1795 #include "r_rom.h" |
|
1796 +#if defined(WIN32) |
|
1797 + #define ALLOCA _alloca |
|
1798 +#elif defined(__LINUX__) |
|
1799 + #include <alloca.h> |
|
1800 + #define ALLOCA alloca |
|
1801 +#endif |
|
1802 |
|
1803 void InflateUnCompress(unsigned char* source, int sourcesize, unsigned char* dest, int destsize); |
|
1804 RomImageFSEntry::RomImageFSEntry (const char* aName) : iName(aName), iSibling(0), iChildren(0) { |
|
1805 @@ -86,59 +92,60 @@ |
|
1806 |
|
1807 *out << endl << endl; |
|
1808 |
|
1809 - DumpInHex("Timestamp", (iRomHdr->iTime >> 32)) ; |
|
1810 - DumpInHex(" ", (iRomHdr->iTime &0xffffffff), aContinue) << endl; |
|
1811 + DumpInHex(const_cast<char *>("Timestamp"), (iRomHdr->iTime >> 32)) ; |
|
1812 + DumpInHex(const_cast<char *>(" "), (iRomHdr->iTime &0xffffffff), aContinue) << endl; |
|
1813 |
|
1814 - DumpInHex("RomBase", iRomHdr->iRomBase) << endl; |
|
1815 + DumpInHex(const_cast<char *>("RomBase"), iRomHdr->iRomBase) << endl; |
|
1816 |
|
1817 - DumpInHex("RomSize", iRomHdr->iRomSize) << endl; |
|
1818 - DumpInHex("KernelDataAddress", iRomHdr->iKernDataAddress) << endl; |
|
1819 - DumpInHex("KernelLimit", iRomHdr->iKernelLimit) << endl; |
|
1820 - DumpInHex("PrimaryFile", iRomHdr->iPrimaryFile) << endl; |
|
1821 - DumpInHex("SecondaryFile", iRomHdr->iSecondaryFile) << endl; |
|
1822 - DumpInHex("CheckSum", iRomHdr->iCheckSum) << endl; |
|
1823 - DumpInHex("Hardware", iRomHdr->iHardware) << endl; |
|
1824 - |
|
1825 - DumpInHex("Language", (TUint)(iRomHdr->iLanguage >> 32)); |
|
1826 - DumpInHex(" ", ((TUint)(iRomHdr->iLanguage & 0xffffffff)), aContinue) <<endl; |
|
1827 - |
|
1828 - DumpInHex("KernelConfigFlags", iRomHdr->iKernelConfigFlags) << endl; |
|
1829 - DumpInHex("RomExceptionSearchTable", iRomHdr->iRomExceptionSearchTable) << endl; |
|
1830 - DumpInHex("RomHeaderSize", iRomHdr->iRomHeaderSize) << endl; |
|
1831 - DumpInHex("RomSectionHeader", iRomHdr->iRomSectionHeader) << endl; |
|
1832 - DumpInHex("TotalSvDataSize", iRomHdr->iTotalSvDataSize) << endl; |
|
1833 - DumpInHex("VariantFile", iRomHdr->iVariantFile) << endl; |
|
1834 - DumpInHex("ExtensionFile", iRomHdr->iExtensionFile) << endl; |
|
1835 - DumpInHex("RelocInfo", iRomHdr->iRelocInfo) << endl; |
|
1836 - DumpInHex("OldTraceMask", iRomHdr->iOldTraceMask) << endl; |
|
1837 - DumpInHex("UserDataAddress", iRomHdr->iUserDataAddress) << endl; |
|
1838 - DumpInHex("TotalUserDataSize", iRomHdr->iTotalUserDataSize) << endl; |
|
1839 - DumpInHex("DebugPort", iRomHdr->iDebugPort) << endl; |
|
1840 - |
|
1841 - DumpInHex("Version", iRomHdr->iVersion.iMajor, false, 2); |
|
1842 - DumpInHex(".", iRomHdr->iVersion.iMinor, aContinue, 2); |
|
1843 - DumpInHex("(" ,iRomHdr->iVersion.iBuild, aContinue, 2); |
|
1844 + DumpInHex(const_cast<char *>("RomSize"), iRomHdr->iRomSize) << endl; |
|
1845 + DumpInHex(const_cast<char *>("KernelDataAddress"), iRomHdr->iKernDataAddress) << endl; |
|
1846 + DumpInHex(const_cast<char *>("KernelLimit"), iRomHdr->iKernelLimit) << endl; |
|
1847 + DumpInHex(const_cast<char *>("PrimaryFile"), iRomHdr->iPrimaryFile) << endl; |
|
1848 + DumpInHex(const_cast<char *>("SecondaryFile"), iRomHdr->iSecondaryFile) << endl; |
|
1849 + DumpInHex(const_cast<char *>("CheckSum"), iRomHdr->iCheckSum) << endl; |
|
1850 + DumpInHex(const_cast<char *>("Hardware"), iRomHdr->iHardware) << endl; |
|
1851 + |
|
1852 + DumpInHex(const_cast<char *>("Language"), (TUint)(iRomHdr->iLanguage >> 32)); |
|
1853 + DumpInHex(const_cast<char *>(" "), ((TUint)(iRomHdr->iLanguage & 0xffffffff)), aContinue) <<endl; |
|
1854 + |
|
1855 + DumpInHex(const_cast<char *>("KernelConfigFlags"), iRomHdr->iKernelConfigFlags) << endl; |
|
1856 + DumpInHex(const_cast<char *>("RomExceptionSearchTable"), iRomHdr->iRomExceptionSearchTable) << endl; |
|
1857 + DumpInHex(const_cast<char *>("RomHeaderSize"), iRomHdr->iRomHeaderSize) << endl; |
|
1858 + DumpInHex(const_cast<char *>("RomSectionHeader"), iRomHdr->iRomSectionHeader) << endl; |
|
1859 + DumpInHex(const_cast<char *>("TotalSvDataSize"), iRomHdr->iTotalSvDataSize) << endl; |
|
1860 + DumpInHex(const_cast<char *>("VariantFile"), iRomHdr->iVariantFile) << endl; |
|
1861 + DumpInHex(const_cast<char *>("ExtensionFile"), iRomHdr->iExtensionFile) << endl; |
|
1862 + DumpInHex(const_cast<char *>("RelocInfo"), iRomHdr->iRelocInfo) << endl; |
|
1863 + DumpInHex(const_cast<char *>("OldTraceMask"), iRomHdr->iOldTraceMask) << endl; |
|
1864 + DumpInHex(const_cast<char *>("UserDataAddress"), iRomHdr->iUserDataAddress) << endl; |
|
1865 + DumpInHex(const_cast<char *>("TotalUserDataSize"), iRomHdr->iTotalUserDataSize) << endl; |
|
1866 + DumpInHex(const_cast<char *>("DebugPort"), iRomHdr->iDebugPort) << endl; |
|
1867 + |
|
1868 + DumpInHex(const_cast<char *>("Version"), iRomHdr->iVersion.iMajor, false, 2); |
|
1869 + DumpInHex(const_cast<char *>("."), iRomHdr->iVersion.iMinor, aContinue, 2); |
|
1870 + DumpInHex(const_cast<char *>("(") ,iRomHdr->iVersion.iBuild, aContinue, 2); |
|
1871 *out << ")" << endl; |
|
1872 |
|
1873 - DumpInHex("CompressionType", iRomHdr->iCompressionType) << endl; |
|
1874 - DumpInHex("CompressedSize", iRomHdr->iCompressedSize) << endl; |
|
1875 - DumpInHex("UncompressedSize", iRomHdr->iUncompressedSize) << endl; |
|
1876 - DumpInHex("HcrFileAddress", iRomHdr->iHcrFileAddress) << endl; |
|
1877 + DumpInHex(const_cast<char *>("CompressionType"), iRomHdr->iCompressionType) << endl; |
|
1878 + DumpInHex(const_cast<char *>("CompressedSize"), iRomHdr->iCompressedSize) << endl; |
|
1879 + DumpInHex(const_cast<char *>("UncompressedSize"), iRomHdr->iUncompressedSize) << endl; |
|
1880 + DumpInHex(const_cast<char *>("HcrFileAddress"), iRomHdr->iHcrFileAddress) << endl; |
|
1881 |
|
1882 - DumpInHex("DisabledCapabilities", iRomHdr->iDisabledCapabilities[0]); |
|
1883 - DumpInHex(" ", iRomHdr->iDisabledCapabilities[1], aContinue) << endl; |
|
1884 + DumpInHex(const_cast<char *>("DisabledCapabilities"), iRomHdr->iDisabledCapabilities[0]); |
|
1885 + DumpInHex(const_cast<char *>(" "), iRomHdr->iDisabledCapabilities[1], aContinue) << endl; |
|
1886 + |
|
1887 + DumpInHex(const_cast<char *>("TraceMask"), iRomHdr->iTraceMask[0]); |
|
1888 |
|
1889 - DumpInHex("TraceMask", iRomHdr->iTraceMask[0]); |
|
1890 aPos = 1; |
|
1891 while( aPos < (TUint)KNumTraceMaskWords) |
|
1892 { |
|
1893 if(iRomHdr->iTraceMask[aPos]) |
|
1894 { |
|
1895 - DumpInHex(" ", iRomHdr->iTraceMask[aPos++], aContinue); |
|
1896 + DumpInHex(const_cast<char *>(" "), iRomHdr->iTraceMask[aPos++], aContinue); |
|
1897 } |
|
1898 else |
|
1899 { |
|
1900 - DumpInHex(" ", iRomHdr->iTraceMask[aPos++], aContinue, 1); |
|
1901 + DumpInHex(const_cast<char *>(" "), iRomHdr->iTraceMask[aPos++], aContinue, 1); |
|
1902 } |
|
1903 |
|
1904 } |
|
1905 @@ -151,22 +158,22 @@ |
|
1906 *out << "Extension ROM Image" << endl << endl; |
|
1907 bool aContinue = true; |
|
1908 |
|
1909 - DumpInHex("Timestamp", (iExtRomHdr->iTime >> 32)) ; |
|
1910 - DumpInHex(" ", (iExtRomHdr->iTime &0xffffffff), aContinue) << endl; |
|
1911 + DumpInHex(const_cast<char *>("Timestamp"), (iExtRomHdr->iTime >> 32)) ; |
|
1912 + DumpInHex(const_cast<char *>(" "), (iExtRomHdr->iTime &0xffffffff), aContinue) << endl; |
|
1913 |
|
1914 - DumpInHex("RomBase", iExtRomHdr->iRomBase) << endl; |
|
1915 + DumpInHex(const_cast<char *>("RomBase"), iExtRomHdr->iRomBase) << endl; |
|
1916 |
|
1917 - DumpInHex("RomSize", iExtRomHdr->iRomSize) << endl; |
|
1918 - DumpInHex("CheckSum", iExtRomHdr->iCheckSum) << endl; |
|
1919 + DumpInHex(const_cast<char *>("RomSize"), iExtRomHdr->iRomSize) << endl; |
|
1920 + DumpInHex(const_cast<char *>("CheckSum"), iExtRomHdr->iCheckSum) << endl; |
|
1921 |
|
1922 - DumpInHex("Version", iExtRomHdr->iVersion.iMajor, false, 2); |
|
1923 - DumpInHex(".", iExtRomHdr->iVersion.iMinor, aContinue, 2); |
|
1924 - DumpInHex("(" ,iExtRomHdr->iVersion.iBuild, aContinue, 2); |
|
1925 + DumpInHex(const_cast<char *>("Version"), iExtRomHdr->iVersion.iMajor, false, 2); |
|
1926 + DumpInHex(const_cast<char *>("."), iExtRomHdr->iVersion.iMinor, aContinue, 2); |
|
1927 + DumpInHex(const_cast<char *>("(") ,iExtRomHdr->iVersion.iBuild, aContinue, 2); |
|
1928 *out << ")" << endl; |
|
1929 |
|
1930 - DumpInHex("CompressionType", iExtRomHdr->iCompressionType) << endl; |
|
1931 - DumpInHex("CompressedSize", iExtRomHdr->iCompressedSize) << endl; |
|
1932 - DumpInHex("UncompressedSize", iExtRomHdr->iUncompressedSize) << endl; |
|
1933 + DumpInHex(const_cast<char *>("CompressionType"), iExtRomHdr->iCompressionType) << endl; |
|
1934 + DumpInHex(const_cast<char *>("CompressedSize"), iExtRomHdr->iCompressedSize) << endl; |
|
1935 + DumpInHex(const_cast<char *>("UncompressedSize"), iExtRomHdr->iUncompressedSize) << endl; |
|
1936 |
|
1937 *out << endl << endl; |
|
1938 |
|
1939 @@ -495,7 +502,7 @@ |
|
1940 |
|
1941 void RomImageReader::Name(string& aName, const wchar_t* aUnicodeName, TUint aLen) |
|
1942 { |
|
1943 - char* temp = (char*)_alloca((aLen << 1) + 1) ; |
|
1944 + char* temp = (char*)ALLOCA((aLen << 1) + 1) ; |
|
1945 size_t n = wcsrtombs(temp,&aUnicodeName,aLen,NULL); |
|
1946 if(n == (size_t)-1){ // the unicode string can not be coverted. |
|
1947 aName = "???"; |
|
1948 @@ -576,31 +583,31 @@ |
|
1949 { |
|
1950 bool aContinue = true; |
|
1951 |
|
1952 - DumpInHex("Load Address", aEntry->iTRomEntryPtr->iAddressLin) << endl; |
|
1953 - DumpInHex("Size", aEntry->iTRomEntryPtr->iSize) << endl; |
|
1954 + DumpInHex(const_cast<char *>("Load Address"), aEntry->iTRomEntryPtr->iAddressLin) << endl; |
|
1955 + DumpInHex(const_cast<char *>("Size"), aEntry->iTRomEntryPtr->iSize) << endl; |
|
1956 |
|
1957 TRomImageHeader *aRomImgEntry = aEntry->ImagePtr.iRomFileEntry; |
|
1958 |
|
1959 if( !aRomImgEntry ) |
|
1960 return; |
|
1961 //UIDs |
|
1962 - DumpInHex("Uids", aRomImgEntry->iUid1); |
|
1963 - DumpInHex(" ", aRomImgEntry->iUid2, aContinue); |
|
1964 - DumpInHex(" ", aRomImgEntry->iUid3, aContinue); |
|
1965 - DumpInHex(" ", aRomImgEntry->iUidChecksum, aContinue) << endl; |
|
1966 - |
|
1967 - DumpInHex("Entry point", aRomImgEntry->iEntryPoint) << endl; |
|
1968 - DumpInHex("Code start addr", aRomImgEntry->iCodeAddress) << endl; |
|
1969 - DumpInHex("Data start addr", aRomImgEntry->iDataAddress) << endl; |
|
1970 - DumpInHex("DataBssLinearBase", aRomImgEntry->iDataBssLinearBase) << endl; |
|
1971 - DumpInHex("Text size", aRomImgEntry->iTextSize) << endl; |
|
1972 - DumpInHex("Code size", aRomImgEntry->iCodeSize) << endl; |
|
1973 - DumpInHex("Data size", aRomImgEntry->iDataSize) << endl; |
|
1974 - DumpInHex("Bss size", (aRomImgEntry->iBssSize)) << endl; |
|
1975 - DumpInHex("Total data size", aRomImgEntry->iTotalDataSize) << endl; |
|
1976 - DumpInHex("Heap min", aRomImgEntry->iHeapSizeMin) << endl; |
|
1977 - DumpInHex("Heap max", aRomImgEntry->iHeapSizeMax) << endl; |
|
1978 - DumpInHex("Stack size", aRomImgEntry->iStackSize) << endl; |
|
1979 + DumpInHex(const_cast<char *>("Uids"), aRomImgEntry->iUid1); |
|
1980 + DumpInHex(const_cast<char *>(" "), aRomImgEntry->iUid2, aContinue); |
|
1981 + DumpInHex(const_cast<char *>(" "), aRomImgEntry->iUid3, aContinue); |
|
1982 + DumpInHex(const_cast<char *>(" "), aRomImgEntry->iUidChecksum, aContinue) << endl; |
|
1983 + |
|
1984 + DumpInHex(const_cast<char *>("Entry point"), aRomImgEntry->iEntryPoint) << endl; |
|
1985 + DumpInHex(const_cast<char *>("Code start addr"), aRomImgEntry->iCodeAddress) << endl; |
|
1986 + DumpInHex(const_cast<char *>("Data start addr"), aRomImgEntry->iDataAddress) << endl; |
|
1987 + DumpInHex(const_cast<char *>("DataBssLinearBase"), aRomImgEntry->iDataBssLinearBase) << endl; |
|
1988 + DumpInHex(const_cast<char *>("Text size"), aRomImgEntry->iTextSize) << endl; |
|
1989 + DumpInHex(const_cast<char *>("Code size"), aRomImgEntry->iCodeSize) << endl; |
|
1990 + DumpInHex(const_cast<char *>("Data size"), aRomImgEntry->iDataSize) << endl; |
|
1991 + DumpInHex(const_cast<char *>("Bss size"), (aRomImgEntry->iBssSize)) << endl; |
|
1992 + DumpInHex(const_cast<char *>("Total data size"), aRomImgEntry->iTotalDataSize) << endl; |
|
1993 + DumpInHex(const_cast<char *>("Heap min"), aRomImgEntry->iHeapSizeMin) << endl; |
|
1994 + DumpInHex(const_cast<char *>("Heap max"), aRomImgEntry->iHeapSizeMax) << endl; |
|
1995 + DumpInHex(const_cast<char *>("Stack size"), aRomImgEntry->iStackSize) << endl; |
|
1996 |
|
1997 TDllRefTable *aRefTbl = NULL; |
|
1998 |
|
1999 @@ -608,18 +615,18 @@ |
|
2000 TUint32 aOff = (TUint32)aRomImgEntry->iDllRefTable - iImageHeader->iRomHdr->iRomBase; |
|
2001 aRefTbl = (TDllRefTable*) ((char*)iImageHeader->iRomHdr + aOff); |
|
2002 TUint32 aVirtualAddr = (TUint32)aRefTbl->iEntry[0]; |
|
2003 - DumpInHex("Dll ref table", aVirtualAddr) << endl; |
|
2004 + DumpInHex(const_cast<char *>("Dll ref table"), aVirtualAddr) << endl; |
|
2005 } |
|
2006 |
|
2007 - DumpInHex("Export directory", aRomImgEntry->iExportDir) << endl; |
|
2008 - DumpInHex("Export dir count", aRomImgEntry->iExportDirCount) << endl; |
|
2009 - DumpInHex("Hardware variant", aRomImgEntry->iHardwareVariant) << endl; |
|
2010 - DumpInHex("Flags", aRomImgEntry->iFlags) << endl; |
|
2011 - DumpInHex("Secure ID", aRomImgEntry->iS.iSecureId) << endl; |
|
2012 - DumpInHex("Vendor ID", aRomImgEntry->iS.iVendorId) << endl; |
|
2013 + DumpInHex(const_cast<char *>("Export directory"), aRomImgEntry->iExportDir) << endl; |
|
2014 + DumpInHex(const_cast<char *>("Export dir count"), aRomImgEntry->iExportDirCount) << endl; |
|
2015 + DumpInHex(const_cast<char *>("Hardware variant"), aRomImgEntry->iHardwareVariant) << endl; |
|
2016 + DumpInHex(const_cast<char *>("Flags"), aRomImgEntry->iFlags) << endl; |
|
2017 + DumpInHex(const_cast<char *>("Secure ID"), aRomImgEntry->iS.iSecureId) << endl; |
|
2018 + DumpInHex(const_cast<char *>("Vendor ID"), aRomImgEntry->iS.iVendorId) << endl; |
|
2019 |
|
2020 - DumpInHex("Capability", aRomImgEntry->iS.iCaps[1]); |
|
2021 - DumpInHex(" ", aRomImgEntry->iS.iCaps[0], aContinue) << endl; |
|
2022 + DumpInHex(const_cast<char *>("Capability"), aRomImgEntry->iS.iCaps[1]); |
|
2023 + DumpInHex(const_cast<char *>(" "), aRomImgEntry->iS.iCaps[0], aContinue) << endl; |
|
2024 |
|
2025 *out << "Tools Version..............." << dec << (TUint)aRomImgEntry->iToolsVersion.iMajor; |
|
2026 *out << "." ; |
|
2027 @@ -630,13 +637,13 @@ |
|
2028 *out << endl; |
|
2029 |
|
2030 *out << "Module Version.............." << dec << (aRomImgEntry->iModuleVersion >> 16) << endl; |
|
2031 - DumpInHex("Exception Descriptor", aRomImgEntry->iExceptionDescriptor) << endl; |
|
2032 + DumpInHex(const_cast<char *>("Exception Descriptor"), aRomImgEntry->iExceptionDescriptor) << endl; |
|
2033 *out << "Priority...................." << dec << aRomImgEntry->iPriority << endl; |
|
2034 |
|
2035 if( aRefTbl ) |
|
2036 - DumpInHex("Dll ref table size", aRefTbl->iNumberOfEntries*8) << endl; |
|
2037 + DumpInHex(const_cast<char *>("Dll ref table size"), aRefTbl->iNumberOfEntries*8) << endl; |
|
2038 else |
|
2039 - DumpInHex("Dll ref table size", 0) << endl; |
|
2040 + DumpInHex(const_cast<char *>("Dll ref table size"), 0) << endl; |
|
2041 |
|
2042 if( iDisplayOptions & DUMP_E32_IMG_FLAG){ |
|
2043 if(stricmp(iE32ImgFileName.c_str(), aEntry->Name()) == 0){ |
|
2044 @@ -695,8 +702,8 @@ |
|
2045 *out << left << prefix; |
|
2046 out->width(40); |
|
2047 *out << right << file->Name() << "[" ; |
|
2048 - DumpInHex( "", aRomImgEntry->iHardwareVariant, true) << "] "; |
|
2049 - DumpInHex( " DataSize=", (aRomImgEntry->iBssSize + aRomImgEntry->iDataSize), true) << endl; |
|
2050 + DumpInHex( const_cast<char *>(""), aRomImgEntry->iHardwareVariant, true) << "] "; |
|
2051 + DumpInHex( const_cast<char *>(" DataSize="), (aRomImgEntry->iBssSize + aRomImgEntry->iDataSize), true) << endl; |
|
2052 |
|
2053 } |
|
2054 |
|
2055 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/build/imgtools/romtools/rofsbuild/r_build.cpp |
|
2056 --- /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 |
|
2057 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_build.cpp 2010-05-08 15:04:00.000000000 +0100 |
|
2058 @@ -29,7 +29,7 @@ |
|
2059 |
|
2060 #if defined(__MSVCDOTNET__) || defined(__TOOLS2__) |
|
2061 #include <iomanip> |
|
2062 - #include <strstream> |
|
2063 + #include <sstream> |
|
2064 #else //!__MSVCDOTNET__ |
|
2065 #include <iomanip.h> |
|
2066 #endif //__MSVCDOTNET__ |
|
2067 @@ -1218,22 +1218,11 @@ |
|
2068 f.UpdateHeaderCrc(); |
|
2069 if (overflow) |
|
2070 { |
|
2071 - char * buffer = new char [size]; |
|
2072 - // need to check if the compressed file will fit in the image |
|
2073 - #if defined(__LINUX__) |
|
2074 - ostrstream os((char*)aDest, aMaxSize, (ios::openmode)(ios::out+ios::binary)); |
|
2075 - #elif defined(__TOOLS2__) && defined (_STLP_THREADS) |
|
2076 - ostrstream os((char*)buffer, size,(ios::out+ios::binary)); |
|
2077 - #elif defined( __TOOLS2__) |
|
2078 - ostrstream os((char*)buffer, size,(ios::out+ios::binary)); |
|
2079 - #else |
|
2080 - ostrstream os( (char*)buffer, size, (ios::out+ios::binary)); |
|
2081 - #endif |
|
2082 + ostringstream os(ios_base::out|ios_base::binary); |
|
2083 os << f; |
|
2084 - TUint compressedSize = os.pcount(); |
|
2085 + TUint compressedSize = os.str().size(); |
|
2086 if (compressedSize <= aMaxSize) |
|
2087 overflow = EFalse; |
|
2088 - delete[] buffer; |
|
2089 } |
|
2090 } |
|
2091 if (overflow) |
|
2092 @@ -1242,15 +1231,9 @@ |
|
2093 Print(EError, "Overflowed by approximately 0x%x bytes.\n", size - aMaxSize); |
|
2094 exit(667); |
|
2095 } |
|
2096 - #if defined(__TOOLS2__) && defined (_STLP_THREADS) |
|
2097 - ostrstream os((char*)aDest, aMaxSize,(ios::out+ios::binary)); |
|
2098 - #elif __TOOLS2__ |
|
2099 - ostrstream os((char*)aDest, aMaxSize, (std::_Ios_Openmode)(ios::out+ios::binary)); |
|
2100 - #else |
|
2101 - ostrstream os((char*)aDest, aMaxSize, (ios::out+ios::binary)); |
|
2102 - #endif |
|
2103 + ostringstream os(ios_base::out|ios_base::binary); |
|
2104 os << f; |
|
2105 - size = os.pcount(); |
|
2106 + size = os.str().size(); |
|
2107 compression = f.iHdr->CompressionType(); |
|
2108 memcpy(&iUids[0], aDest, sizeof(iUids)); |
|
2109 } |
|
2110 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/build/imgtools/romtools/rofsbuild/r_coreimage.cpp |
|
2111 --- /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 |
|
2112 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_coreimage.cpp 2010-05-08 15:06:54.000000000 +0100 |
|
2113 @@ -99,7 +99,7 @@ |
|
2114 TInt RCoreImageReader::ReadIdentifier() |
|
2115 { |
|
2116 int itemsRead = fread(&iIdentifier, sizeof(TUint8), K_ID_SIZE, iCoreImage); |
|
2117 - TInt result = ImageError(itemsRead, K_ID_SIZE, "Read Identifier"); |
|
2118 + TInt result = ImageError(itemsRead, K_ID_SIZE, const_cast<char *>("Read Identifier")); |
|
2119 if (result != KErrNone) |
|
2120 { |
|
2121 iIdentifier[0] = 0; |
|
2122 @@ -117,7 +117,7 @@ |
|
2123 { |
|
2124 int itemsRead = fread (&aHeader.iHeaderSize, |
|
2125 (sizeof(TRofsHeader)) - K_ID_SIZE*sizeof(TUint8), 1, iCoreImage); |
|
2126 - TInt result = ImageError(itemsRead, 1, "Read Core Header"); |
|
2127 + TInt result = ImageError(itemsRead, 1, const_cast<char *>("Read Core Header")); |
|
2128 if (result == KErrNone) |
|
2129 { |
|
2130 // copy the previously read identifier into the header |
|
2131 @@ -137,7 +137,7 @@ |
|
2132 { |
|
2133 int itemsRead = fread (&aHeader.iHeaderSize, |
|
2134 (sizeof(TExtensionRofsHeader)) - K_ID_SIZE*sizeof(TUint8), 1, iCoreImage); |
|
2135 - TInt result = ImageError(itemsRead, 1, "Read Extension Header"); |
|
2136 + TInt result = ImageError(itemsRead, 1, const_cast<char *>("Read Extension Header")); |
|
2137 if (result == KErrNone) |
|
2138 { |
|
2139 // copy the previously read identifier into the header |
|
2140 @@ -199,7 +199,7 @@ |
|
2141 // is read later when handling subdirectories |
|
2142 int bytesRead = sizeof(TRofsDir) - sizeof(TRofsEntry); |
|
2143 int itemsRead = fread (&aDir, bytesRead , 1, iCoreImage); |
|
2144 - if (ImageError(itemsRead, 1, "Read Dir") == KErrNone) |
|
2145 + if (ImageError(itemsRead, 1, const_cast<char *>("Read Dir")) == KErrNone) |
|
2146 return bytesRead; |
|
2147 else |
|
2148 return 0; |
|
2149 @@ -233,13 +233,13 @@ |
|
2150 // need to work out how big entry needs to be from the Struct Size |
|
2151 // in TRofsEntry |
|
2152 int itemsRead = fread(&aEntry.iStructSize, sizeof(TUint16), 1, iCoreImage); |
|
2153 - int result = ImageError(itemsRead, 1, "Read Entry Size"); |
|
2154 + int result = ImageError(itemsRead, 1, const_cast<char *>("Read Entry Size")); |
|
2155 if (result == KErrNone) |
|
2156 { |
|
2157 // read rest of entry excluding the iStructSize |
|
2158 itemsRead = fread(&aEntry.iUids[0], sizeof(TRofsEntry) -sizeof(TUint16), |
|
2159 1, iCoreImage); |
|
2160 - result = ImageError(itemsRead, 1, "Rest of Entry"); |
|
2161 + result = ImageError(itemsRead, 1, const_cast<char *>("Rest of Entry")); |
|
2162 // return length read - this include includes iStructSize and first char of name |
|
2163 if (result == KErrNone) |
|
2164 return sizeof(TRofsEntry); |
|
2165 @@ -270,7 +270,7 @@ |
|
2166 TInt RCoreImageReader::ReadRofEntryName(TUint16* aName, int aLength) |
|
2167 { |
|
2168 int itemsRead = fread(aName, sizeof(TUint16), aLength, iCoreImage); |
|
2169 - return ImageError(itemsRead, aLength, "Rof Entry Name"); |
|
2170 + return ImageError(itemsRead, aLength, const_cast<char *>("Rof Entry Name")); |
|
2171 } |
|
2172 |
|
2173 /** |
|
2174 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/build/imgtools/romtools/rofsbuild/r_driveimage.cpp |
|
2175 --- /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 |
|
2176 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_driveimage.cpp 2010-04-21 13:27:26.000000000 +0100 |
|
2177 @@ -254,7 +254,7 @@ |
|
2178 fileName.append("/"); |
|
2179 |
|
2180 // Go through each entry |
|
2181 - while(dirEntry = readdir(dirHandler)) |
|
2182 + while((dirEntry = readdir(dirHandler)) != NULL) |
|
2183 { |
|
2184 if(dirEntry->d_type != DT_DIR) |
|
2185 { |
|
2186 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/build/imgtools/romtools/rofsbuild/r_driveutl.cpp |
|
2187 --- /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 |
|
2188 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_driveutl.cpp 2010-05-08 15:05:24.000000000 +0100 |
|
2189 @@ -82,7 +82,7 @@ |
|
2190 /** |
|
2191 Time Stamp for Log file. |
|
2192 */ |
|
2193 -TAny GetLocalTime(TAny) |
|
2194 +TAny GetLocalTime() |
|
2195 { |
|
2196 struct tm *aNewTime = NULL; |
|
2197 time_t aTime = 0; |
|
2198 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/build/imgtools/romtools/rofsbuild/r_driveutl.h |
|
2199 --- /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 |
|
2200 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_driveutl.h 2010-05-08 15:08:42.000000000 +0100 |
|
2201 @@ -24,6 +24,6 @@ |
|
2202 #include <e32def.h> |
|
2203 |
|
2204 TInt Getlogfile(TText *aDriveObeyFileName,TText* &aPadLogFile); |
|
2205 -TAny GetLocalTime(TAny); |
|
2206 +TAny GetLocalTime(); |
|
2207 |
|
2208 #endif |
|
2209 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/build/imgtools/romtools/rofsbuild/r_obey.cpp |
|
2210 --- /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 |
|
2211 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_obey.cpp 2010-05-08 15:04:50.000000000 +0100 |
|
2212 @@ -283,7 +283,7 @@ |
|
2213 iCurrentLine++; |
|
2214 iCurrentMark = ftell(iObeyFile); |
|
2215 iLine[0]='\0'; |
|
2216 - fgets((char*)iLine,imaxLength+1,iObeyFile); |
|
2217 + char *cp = fgets((char*)iLine,imaxLength+1,iObeyFile); (void)cp; |
|
2218 iCurrentObeyStatement = new TText[imaxLength+1]; |
|
2219 strcpy((char*)iCurrentObeyStatement,(char*)iLine); |
|
2220 iNumWords = Parse(); |
|
2221 @@ -646,13 +646,7 @@ |
|
2222 { |
|
2223 if (keyword == EKeywordCoreImage) |
|
2224 { |
|
2225 - #if defined(__TOOLS2__) && defined (_STLP_THREADS) |
|
2226 - istringstream val(iReader.Word(1),(ios_base::in+ios_base::out)); |
|
2227 - #elif __TOOLS2__ |
|
2228 - istringstream val(iReader.Word(1),(std::_Ios_Openmode)(ios_base::in+ios_base::out)); |
|
2229 - #else |
|
2230 - istrstream val(iReader.Word(1),strlen(iReader.Word(1))); |
|
2231 - #endif |
|
2232 + istringstream val(iReader.Word(1),ios_base::in|ios_base::out); |
|
2233 iReader.CopyWord(1, coreImageFileName); |
|
2234 iReader.MarkNext(); // ready for processing extension |
|
2235 break; |
|
2236 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/build/imgtools/romtools/rofsbuild/rofsbuild.mmp |
|
2237 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/rofsbuild.mmp 2010-05-10 19:22:13.797117735 +0100 |
|
2238 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/rofsbuild.mmp 2010-05-08 15:07:32.000000000 +0100 |
|
2239 @@ -43,15 +43,16 @@ |
|
2240 USERINCLUDE ../../imglib/inc ../../imglib/compress ../../imglib/filesystem/include |
|
2241 USERINCLUDE ../../imglib/patchdataprocessor/include ../../imglib/parameterfileprocessor/include |
|
2242 USERINCLUDE ../../imglib/memmap/include |
|
2243 +#ifndef TOOLS2_LINUX |
|
2244 USERINCLUDE ../../imglib/boostlibrary/ |
|
2245 +#endif |
|
2246 |
|
2247 STATICLIBRARY filesystem |
|
2248 STATICLIBRARY patchdataprocessor |
|
2249 STATICLIBRARY parameterfileprocessor |
|
2250 STATICLIBRARY memmap |
|
2251 #ifdef TOOLS2_LINUX |
|
2252 -STATICLIBRARY boost_thread-mgw34-mt-1_39_linux |
|
2253 -OPTION GCC -pthread -O2 -Wno-uninitialized |
|
2254 +OPTION GCC -pthread -O2 -Wno-uninitialized -lboost_thread-mt |
|
2255 #else |
|
2256 STATICLIBRARY boost_thread-mgw34-mt-1_39_win32 |
|
2257 OPTION GCC -mthreads -O2 -Wno-uninitialized |
|
2258 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/build/imgtools/romtools/rofsbuild/r_rofs.cpp |
|
2259 --- /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 |
|
2260 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_rofs.cpp 2010-05-08 15:08:18.000000000 +0100 |
|
2261 @@ -584,9 +584,10 @@ |
|
2262 coffhead[0x54] = 0x20; |
|
2263 |
|
2264 // now fill in the text segment size |
|
2265 - *(TUint32 *) (&coffhead[0x18]) = ALIGN4K(iSizeUsed); |
|
2266 - *(TUint32 *) (&coffhead[0x40]) = ALIGN4K(iSizeUsed); |
|
2267 - |
|
2268 + TUint32 * p0x18 = reinterpret_cast<TUint32 *>(&coffhead[0x18]); |
|
2269 + *p0x18 = ALIGN4K(iSizeUsed); |
|
2270 + TUint32 * p0x40 = reinterpret_cast<TUint32 *>(&coffhead[0x40]); |
|
2271 + *p0x40 = ALIGN4K(iSizeUsed); |
|
2272 os.write(reinterpret_cast<char *>(coffhead), sizeof(coffhead)); |
|
2273 } |
|
2274 break; |
|
2275 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/build/imgtools/romtools/rombuild/r_obey.cpp |
|
2276 --- /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 |
|
2277 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rombuild/r_obey.cpp 2010-05-08 14:50:44.000000000 +0100 |
|
2278 @@ -301,7 +301,7 @@ |
|
2279 iCurrentLine++; |
|
2280 iCurrentMark = ftell(iObeyFile); |
|
2281 iLine[0]='\0'; |
|
2282 - fgets((char*)iLine,imaxLength+1,iObeyFile); |
|
2283 + char * cp = fgets((char*)iLine,imaxLength+1,iObeyFile); (void)cp; |
|
2284 iNumWords = Parse(); |
|
2285 return KErrNone; |
|
2286 } |
|
2287 @@ -2973,13 +2973,7 @@ |
|
2288 { |
|
2289 if (keyword == EKeywordCoreImage) |
|
2290 { |
|
2291 -#if defined(__TOOLS2__) && defined (_STLP_THREADS) |
|
2292 - istringstream val(iReader.Word(1),(ios_base::in+ios_base::out)); |
|
2293 -#elif __TOOLS2__ |
|
2294 - istringstream val(iReader.Word(1),(std::_Ios_Openmode)(ios_base::in+ios_base::out)); |
|
2295 -#else |
|
2296 - istrstream val(iReader.Word(1),strlen(iReader.Word(1))); |
|
2297 -#endif |
|
2298 + istringstream val(iReader.Word(1),ios_base::in|ios_base::out); |
|
2299 iReader.CopyWord(1, coreImageFileName); |
|
2300 break; |
|
2301 } |
|
2302 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/build/imgtools/romtools/rombuild/rombuild.mmp |
|
2303 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rombuild/rombuild.mmp 2010-05-10 19:22:13.809118004 +0100 |
|
2304 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rombuild/rombuild.mmp 2010-05-08 14:52:22.000000000 +0100 |
|
2305 @@ -41,7 +41,9 @@ |
|
2306 userinclude ../../imglib/compress ../../imglib/inc |
|
2307 userinclude ../../imglib/patchdataprocessor/include ../../imglib/parameterfileprocessor/include |
|
2308 userinclude ../../imglib/memmap/include |
|
2309 +#ifndef TOOLS2_LINUX |
|
2310 userinclude ../../imglib/boostlibrary/ |
|
2311 +#endif |
|
2312 |
|
2313 OS_LAYER_SYSTEMINCLUDE_SYMBIAN |
|
2314 |
|
2315 @@ -50,8 +52,7 @@ |
|
2316 staticlibrary memmap |
|
2317 |
|
2318 #ifdef TOOLS2_LINUX |
|
2319 -STATICLIBRARY boost_thread-mgw34-mt-1_39_linux |
|
2320 -OPTION GCC -O2 -Wno-uninitialized -pthread |
|
2321 +OPTION GCC -pthread -O2 -Wno-uninitialized -lboost_thread-mt |
|
2322 #else |
|
2323 STATICLIBRARY boost_thread-mgw34-mt-1_39_win32 |
|
2324 OPTION GCC -O2 -Wno-uninitialized -mthreads |
|
2325 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/build/imgtools/romtools/rombuild/r_rom.cpp |
|
2326 --- /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 |
|
2327 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rombuild/r_rom.cpp 2010-05-08 14:51:46.000000000 +0100 |
|
2328 @@ -1835,7 +1835,7 @@ |
|
2329 TRomFile** l=rf->iPDeps; |
|
2330 FindMarked(MARK_EXE, MARK_EXE, l); |
|
2331 TInt nx=l-rf->iPDeps; |
|
2332 - if (!e->IsDll() && (nx>1 || nx==1 && l[-1]!=rf)) |
|
2333 + if (!e->IsDll() && (nx>1 || (nx==1 && l[-1]!=rf))) |
|
2334 { |
|
2335 Print(EError,"EXE %s links to the following other EXEs:\n", e->iFileName); |
|
2336 TInt j; |
|
2337 @@ -2198,8 +2198,11 @@ |
|
2338 coffhead[0x54] = 0x20; |
|
2339 |
|
2340 // now fill in the text segment size |
|
2341 - *(TUint32 *) (&coffhead[0x18]) = ALIGN4K(iSizeUsed); |
|
2342 - *(TUint32 *) (&coffhead[0x40]) = ALIGN4K(iSizeUsed); |
|
2343 + TUint32 * p0x18 = reinterpret_cast<TUint32 *>(&coffhead[0x18]); |
|
2344 + *p0x18 = ALIGN4K(iSizeUsed); |
|
2345 + TUint32 * p0x40 = reinterpret_cast<TUint32 *>(&coffhead[0x40]); |
|
2346 + *p0x40 = ALIGN4K(iSizeUsed); |
|
2347 + |
|
2348 |
|
2349 os.write(reinterpret_cast<char *>(coffhead), sizeof(coffhead)); |
|
2350 } |
|
2351 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/build/imgtools/sisutils/inc/pkgfileparser.h |
|
2352 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/inc/pkgfileparser.h 2010-05-10 19:22:13.849689642 +0100 |
|
2353 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/sisutils/inc/pkgfileparser.h 2010-05-08 15:20:36.000000000 +0100 |
|
2354 @@ -33,6 +33,10 @@ |
|
2355 |
|
2356 #include "pkglanguage.h" |
|
2357 |
|
2358 +int CompareTwoString(wchar_t const * string ,wchar_t const * option); |
|
2359 +int CompareNString(wchar_t const * string ,wchar_t const * option, int len); |
|
2360 + |
|
2361 + |
|
2362 typedef class PkgParser PKGPARSER, *PPKGPARSER; |
|
2363 |
|
2364 //Data structures for pkg file parsing |
|
2365 @@ -147,7 +151,7 @@ |
|
2366 int OpenFile(); |
|
2367 void DeleteAll(); |
|
2368 |
|
2369 - HANDLE iPkgHandle; |
|
2370 + FILE * iPkgHandle; |
|
2371 |
|
2372 LANGUAGE_LIST iLangList; |
|
2373 PKG_HEADER iPkgHeader; |
|
2374 @@ -162,7 +166,7 @@ |
|
2375 void GetNextChar(); |
|
2376 void GetNextToken(); |
|
2377 bool GetStringToken(); |
|
2378 - WORD ParseEscapeChars(); |
|
2379 + unsigned short ParseEscapeChars(); |
|
2380 void GetAlphaNumericToken(); |
|
2381 bool IsNumericToken(); |
|
2382 void GetNumericToken(); |
|
2383 @@ -197,8 +201,8 @@ |
|
2384 |
|
2385 friend String wstring2string (const std::wstring& aWide); |
|
2386 friend std::wstring string2wstring (const String& aNarrow); |
|
2387 - friend int CompareTwoString(wchar_t* string ,wchar_t* option); |
|
2388 - friend int CompareNString(wchar_t* string ,wchar_t* option, int len); |
|
2389 + friend int CompareTwoString(wchar_t const * string ,wchar_t const * option); |
|
2390 + friend int CompareNString(wchar_t const * string ,wchar_t const * option, int len); |
|
2391 }; |
|
2392 |
|
2393 #endif //__PKGFILEPARSER_H__ |
|
2394 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/build/imgtools/sisutils/inc/pkglanguage.h |
|
2395 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/inc/pkglanguage.h 2010-05-10 19:22:13.849689642 +0100 |
|
2396 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/sisutils/inc/pkglanguage.h 2010-05-08 15:21:16.000000000 +0100 |
|
2397 @@ -26,7 +26,7 @@ |
|
2398 |
|
2399 typedef struct |
|
2400 { |
|
2401 - wchar_t* iName; |
|
2402 + wchar_t const * iName; |
|
2403 unsigned long iId; |
|
2404 } SKeyword; |
|
2405 |
|
2406 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/build/imgtools/sisutils/inc/sisutils.h |
|
2407 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/inc/sisutils.h 2010-05-10 19:22:13.849689642 +0100 |
|
2408 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/sisutils/inc/sisutils.h 2010-05-08 15:19:24.000000000 +0100 |
|
2409 @@ -40,6 +40,9 @@ |
|
2410 #ifdef WIN32 |
|
2411 #define PATHSEPARATOR "\\" |
|
2412 #endif |
|
2413 +#ifdef __LINUX__ |
|
2414 +#define PATHSEPARATOR "/" |
|
2415 +#endif |
|
2416 |
|
2417 //typedefs |
|
2418 typedef std::string String; |
|
2419 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/build/imgtools/sisutils/src/pkgfileparser.cpp |
|
2420 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/src/pkgfileparser.cpp 2010-05-10 19:22:13.852617598 +0100 |
|
2421 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/sisutils/src/pkgfileparser.cpp 2010-05-08 15:16:08.000000000 +0100 |
|
2422 @@ -18,13 +18,15 @@ |
|
2423 |
|
2424 #include "sisutils.h" |
|
2425 #include "pkgfileparser.h" |
|
2426 +#include <vector> |
|
2427 +#include <wchar.h> |
|
2428 |
|
2429 // Parse options lookups |
|
2430 #define MAXTOKENLEN 30 |
|
2431 struct SParseToken |
|
2432 { |
|
2433 - WCHAR pszOpt[MAXTOKENLEN]; |
|
2434 - DWORD dwOpt; |
|
2435 + wchar_t pszOpt[MAXTOKENLEN]; |
|
2436 + unsigned dwOpt; |
|
2437 }; |
|
2438 |
|
2439 const SParseToken KTokens[] = |
|
2440 @@ -46,6 +48,10 @@ |
|
2441 }; |
|
2442 #define NUMPARSETOKENS (sizeof(KTokens)/sizeof(SParseToken)) |
|
2443 |
|
2444 +std::wstring string2wstring (const String& aNarrow); |
|
2445 +String wstring2string (const std::wstring& aWide); |
|
2446 + |
|
2447 + |
|
2448 /** |
|
2449 Constructor: PkgParser class |
|
2450 Initilize the parameters to data members. |
|
2451 @@ -68,9 +74,9 @@ |
|
2452 */ |
|
2453 PkgParser::~PkgParser() |
|
2454 { |
|
2455 - if(iPkgHandle != INVALID_HANDLE_VALUE) |
|
2456 + if(iPkgHandle) |
|
2457 { |
|
2458 - ::CloseHandle(iPkgHandle); |
|
2459 + std::fclose(iPkgHandle); |
|
2460 } |
|
2461 |
|
2462 DeleteAll(); |
|
2463 @@ -84,9 +90,14 @@ |
|
2464 */ |
|
2465 int PkgParser::OpenFile() |
|
2466 { |
|
2467 - iPkgHandle = ::CreateFileW(string2wstring(iPkgFile).data(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); |
|
2468 +#ifdef WIN32 |
|
2469 + iPkgHandle = _wfopen(string2wstring(iPkgFile).c_str(),L"r"); |
|
2470 +#else |
|
2471 + // *nix fopen doesn't care about the filename encoding, as long as its NULL-terminated. |
|
2472 + iPkgHandle = std::fopen(iPkgFile.c_str(),"r"); |
|
2473 +#endif |
|
2474 + return iPkgHandle ? 1 : 0; |
|
2475 |
|
2476 - return (iPkgHandle != INVALID_HANDLE_VALUE) ? 1 : 0; |
|
2477 } |
|
2478 |
|
2479 /** |
|
2480 @@ -164,7 +175,7 @@ |
|
2481 { |
|
2482 if(!OpenFile()) |
|
2483 { |
|
2484 - throw SisUtilsException((char*)iPkgFile.data(), "Could not open file"); |
|
2485 + throw SisUtilsException((char*)iPkgFile.data(), const_cast<char *>("Could not open file")); |
|
2486 } |
|
2487 |
|
2488 GetNextChar(); |
|
2489 @@ -209,7 +220,7 @@ |
|
2490 case EOF_TOKEN: |
|
2491 break; |
|
2492 default: |
|
2493 - ParserError("Unexpected token"); |
|
2494 + ParserError(const_cast<char *>("Unexpected token")); |
|
2495 break; |
|
2496 } |
|
2497 } |
|
2498 @@ -273,7 +284,7 @@ |
|
2499 |
|
2500 // process application names |
|
2501 ExpectToken('{'); |
|
2502 - for (WORD wNumLangs = 0; wNumLangs < iLangList.size(); wNumLangs++) |
|
2503 + for (unsigned short wNumLangs = 0; wNumLangs < iLangList.size(); wNumLangs++) |
|
2504 { |
|
2505 GetNextToken (); |
|
2506 ExpectToken(QUOTED_STRING_TOKEN); |
|
2507 @@ -664,7 +675,7 @@ |
|
2508 aExpression.append("\""); |
|
2509 break; |
|
2510 case ALPHA_TOKEN: |
|
2511 - if(!CompareNString(m_tokenValue.pszString,L"option",6)) |
|
2512 + if(!CompareNString(m_tokenValue.pszString,const_cast<wchar_t *>(L"option"),6)) |
|
2513 { |
|
2514 aExpression.append(" defined("); |
|
2515 aExpression.append(wstring2string(m_tokenValue.pszString)); |
|
2516 @@ -687,7 +698,7 @@ |
|
2517 } |
|
2518 break; |
|
2519 default: |
|
2520 - ParserError("ErrBadCondFormat"); |
|
2521 + ParserError(const_cast<char *>("ErrBadCondFormat")); |
|
2522 } |
|
2523 GetNextToken (); |
|
2524 } |
|
2525 @@ -771,7 +782,7 @@ |
|
2526 */ |
|
2527 void PkgParser::ParseOptionsBlockL() |
|
2528 { |
|
2529 - WORD wNumLangs; |
|
2530 + unsigned short wNumLangs; |
|
2531 |
|
2532 ExpectToken('('); |
|
2533 GetNextToken (); |
|
2534 @@ -838,7 +849,7 @@ |
|
2535 void PkgParser::ParseVendorNameL() |
|
2536 { |
|
2537 ExpectToken('{'); |
|
2538 - for (WORD wNumLangs = 0; wNumLangs < iLangList.size(); wNumLangs++) |
|
2539 + for (unsigned short wNumLangs = 0; wNumLangs < iLangList.size(); wNumLangs++) |
|
2540 { |
|
2541 GetNextToken (); |
|
2542 ExpectToken(QUOTED_STRING_TOKEN); |
|
2543 @@ -990,14 +1001,8 @@ |
|
2544 */ |
|
2545 void PkgParser::GetNextChar() |
|
2546 { |
|
2547 -#ifdef WIN32 |
|
2548 - DWORD dwBytesRead; |
|
2549 - if (!::ReadFile(iPkgHandle, (LPVOID)&m_pkgChar, sizeof(WCHAR), &dwBytesRead, NULL) || |
|
2550 - dwBytesRead!=sizeof(wchar_t)) |
|
2551 - m_pkgChar='\0'; |
|
2552 -#else |
|
2553 -#error "TODO: Implement this function under other OS than Windows" |
|
2554 -#endif |
|
2555 + wint_t wch = std::fgetwc(iPkgHandle); |
|
2556 + m_pkgChar = (wch == WEOF) ? 0 : wch; |
|
2557 } |
|
2558 |
|
2559 /** |
|
2560 @@ -1012,7 +1017,7 @@ |
|
2561 { |
|
2562 if (m_token!=aToken) |
|
2563 { |
|
2564 - ParserError("Unexpected Token"); |
|
2565 + ParserError(const_cast<char *>("Unexpected Token")); |
|
2566 } |
|
2567 } |
|
2568 |
|
2569 @@ -1105,10 +1110,10 @@ |
|
2570 */ |
|
2571 bool PkgParser::GetStringToken() |
|
2572 { |
|
2573 - DWORD wCount = 0; |
|
2574 + unsigned wCount = 0; |
|
2575 bool done=false; |
|
2576 bool finished=false; |
|
2577 - DWORD escapeChars = 0; |
|
2578 + unsigned escapeChars = 0; |
|
2579 |
|
2580 while (!finished) |
|
2581 { |
|
2582 @@ -1120,11 +1125,11 @@ |
|
2583 if(wCount < (MAX_STRING - 1)) |
|
2584 m_tokenValue.pszString[wCount++] = m_pkgChar; |
|
2585 else //We dont want the string with length greater than MAX_STRING to be cut off silently |
|
2586 - ParserError("Bad String"); |
|
2587 + ParserError(const_cast<char *>("Bad String")); |
|
2588 GetNextChar(); |
|
2589 } |
|
2590 if(m_pkgChar == '\0') |
|
2591 - ParserError("Bad String"); |
|
2592 + ParserError(const_cast<char *>("Bad String")); |
|
2593 GetNextChar(); |
|
2594 done=true; |
|
2595 } |
|
2596 @@ -1153,15 +1158,16 @@ |
|
2597 @internalComponent |
|
2598 @released |
|
2599 */ |
|
2600 -WORD PkgParser::ParseEscapeChars() |
|
2601 +unsigned short PkgParser::ParseEscapeChars() |
|
2602 { |
|
2603 - WORD found=0; |
|
2604 - WCHAR temp[MAX_STRING]; |
|
2605 -#ifdef WIN32 |
|
2606 + unsigned short found=0; |
|
2607 + wchar_t temp[MAX_STRING]; |
|
2608 + |
|
2609 while (m_pkgChar == '<') |
|
2610 { |
|
2611 wcscpy(temp,m_tokenValue.pszString); |
|
2612 - DWORD fileOffset=::SetFilePointer(iPkgHandle, 0L, NULL, FILE_CURRENT); |
|
2613 + std::fpos_t foff; |
|
2614 + std::fgetpos(iPkgHandle,&foff); |
|
2615 try |
|
2616 { |
|
2617 GetNextChar(); |
|
2618 @@ -1170,32 +1176,29 @@ |
|
2619 found++; |
|
2620 else |
|
2621 { |
|
2622 - ::SetFilePointer(iPkgHandle, fileOffset, NULL, FILE_BEGIN); |
|
2623 + std::fsetpos(iPkgHandle,&foff); |
|
2624 break; |
|
2625 } |
|
2626 } |
|
2627 catch (...) |
|
2628 { |
|
2629 wcscpy(m_tokenValue.pszString,temp); |
|
2630 - ::SetFilePointer(iPkgHandle, fileOffset, NULL, FILE_BEGIN); |
|
2631 + std::fsetpos(iPkgHandle,&foff); |
|
2632 break; |
|
2633 } |
|
2634 - DWORD num=m_tokenValue.dwNumber; |
|
2635 + unsigned num=m_tokenValue.dwNumber; |
|
2636 // watch for CP1252 escapes which aren't appropriate for UNICODE |
|
2637 - if (num>=0x80 && num<=0x9F) ParserError("Invalid Escape"); |
|
2638 - DWORD len=wcslen(temp); |
|
2639 + if (num>=0x80 && num<=0x9F) ParserError(const_cast<char *>("Invalid Escape")); |
|
2640 + unsigned len=wcslen(temp); |
|
2641 wcscpy(m_tokenValue.pszString,temp); |
|
2642 if (len+2<=MAX_STRING) |
|
2643 { |
|
2644 - m_tokenValue.pszString[len]=(WCHAR)num; |
|
2645 + m_tokenValue.pszString[len]=(wchar_t)num; |
|
2646 len++; |
|
2647 m_tokenValue.pszString[len]='\0'; |
|
2648 } |
|
2649 GetNextChar(); |
|
2650 } |
|
2651 -#else |
|
2652 -#error "TODO: Implement this function under other OS than Windows" |
|
2653 -#endif |
|
2654 return found; |
|
2655 } |
|
2656 |
|
2657 @@ -1207,7 +1210,7 @@ |
|
2658 */ |
|
2659 void PkgParser::GetAlphaNumericToken() |
|
2660 { |
|
2661 - WORD wCount = 0; |
|
2662 + unsigned short wCount = 0; |
|
2663 while(m_pkgChar && (isalnum(m_pkgChar) || ((m_pkgChar) == '_'))) |
|
2664 { |
|
2665 if(wCount < (MAX_STRING - 1)) |
|
2666 @@ -1232,12 +1235,13 @@ |
|
2667 { |
|
2668 // we may have a number but we must look ahead one char to be certain |
|
2669 |
|
2670 - WCHAR oldChar = m_pkgChar; |
|
2671 - DWORD fileOffset=::SetFilePointer(iPkgHandle, 0L, NULL, FILE_CURRENT); |
|
2672 + wchar_t oldChar = m_pkgChar; |
|
2673 + std::fpos_t foff; |
|
2674 + std::fgetpos(iPkgHandle,&foff); |
|
2675 GetNextChar(); |
|
2676 lexemeIsNumber = iswdigit(m_pkgChar) != FALSE; |
|
2677 m_pkgChar = oldChar; |
|
2678 - ::SetFilePointer(iPkgHandle,fileOffset,NULL,FILE_BEGIN); |
|
2679 + std::fsetpos(iPkgHandle,&foff); |
|
2680 } |
|
2681 |
|
2682 return lexemeIsNumber; |
|
2683 @@ -1251,23 +1255,30 @@ |
|
2684 */ |
|
2685 void PkgParser::GetNumericToken() |
|
2686 { |
|
2687 - WCHAR temp[MAX_STRING]; |
|
2688 - LPWSTR end; |
|
2689 + wchar_t temp[MAX_STRING]; |
|
2690 + wchar_t * end; |
|
2691 bool hexString = false; |
|
2692 - DWORD dwBytesRead; |
|
2693 - DWORD fileOffset=::SetFilePointer(iPkgHandle, 0L, NULL, FILE_CURRENT); |
|
2694 + std::fpos_t foff; |
|
2695 + std::fgetpos(iPkgHandle,&foff); |
|
2696 |
|
2697 temp[0]=m_pkgChar; |
|
2698 - if (!::ReadFile(iPkgHandle, &temp[1], (MAX_STRING-2)*sizeof(WCHAR), &dwBytesRead, NULL) || |
|
2699 - dwBytesRead==0) |
|
2700 - ParserError("Read failed"); |
|
2701 - temp[1+dwBytesRead/sizeof(WCHAR)]='\0'; |
|
2702 - hexString = (!CompareNString(temp, L"0x", 2) || !CompareNString(&temp[1], L"0x", 2)); |
|
2703 + unsigned wchRead = fread(&temp[1],sizeof(wchar_t),MAX_STRING - 2,iPkgHandle); |
|
2704 + if (!wchRead) |
|
2705 + { |
|
2706 + ParserError(const_cast<char *>("Read failed")); |
|
2707 + } |
|
2708 + temp[1+wchRead] = 0; |
|
2709 + hexString = (!CompareNString(temp, const_cast<wchar_t *>(L"0x"), 2) || |
|
2710 + !CompareNString(&temp[1], const_cast<wchar_t *>(L"0x"), 2)); |
|
2711 |
|
2712 m_tokenValue.dwNumber = wcstoul(temp, &end, (hexString) ? 16 : 10); |
|
2713 |
|
2714 - if (end==temp) ParserError("Read failed"); |
|
2715 - ::SetFilePointer(iPkgHandle, fileOffset+(end-temp-1)*sizeof(WCHAR), NULL, FILE_BEGIN); |
|
2716 + if (end==temp) |
|
2717 + { |
|
2718 + ParserError(const_cast<char *>("Read failed")); |
|
2719 + } |
|
2720 + std::fsetpos(iPkgHandle,&foff); |
|
2721 + std::fseek(iPkgHandle,(end-temp-1) * sizeof(wchar_t),SEEK_CUR); |
|
2722 GetNextChar(); |
|
2723 } |
|
2724 |
|
2725 @@ -1344,7 +1355,7 @@ |
|
2726 |
|
2727 str << (char*)iPkgFile.data() << "(" << m_nLineNo << "): " << msg; |
|
2728 |
|
2729 - throw SisUtilsException("PakageFile-Parser Error", (char*)(str.str()).data()); |
|
2730 + throw SisUtilsException(const_cast<char *>("PackageFile-Parser Error"), (char*)(str.str()).data()); |
|
2731 } |
|
2732 |
|
2733 /** |
|
2734 @@ -1357,22 +1368,14 @@ |
|
2735 */ |
|
2736 String wstring2string (const std::wstring& aWide) |
|
2737 { |
|
2738 - int max = ::WideCharToMultiByte(CP_OEMCP,0,aWide.c_str(),aWide.length(),0,0,0,0); |
|
2739 - String reply; |
|
2740 - if (max > 0 ) |
|
2741 - { |
|
2742 - char* buffer = new char [max]; |
|
2743 - try |
|
2744 + std::vector<char> buffer((aWide.length() * sizeof(wchar_t)) + 1, '\0'); |
|
2745 + size_t nchars = wcstombs(&buffer[0],aWide.c_str(),buffer.size()); |
|
2746 + if (nchars == (size_t)-1) |
|
2747 { |
|
2748 - ::WideCharToMultiByte(CP_OEMCP,0,aWide.c_str(),aWide.length(),buffer,max,0,0); |
|
2749 - reply = String (buffer, max); |
|
2750 - } |
|
2751 - catch (...) |
|
2752 - { |
|
2753 - throw SisUtilsException("ParserError", "wstring to string conversion failed"); |
|
2754 - } |
|
2755 - delete [] buffer; |
|
2756 + throw SisUtilsException(const_cast<char *>("ParserError"), |
|
2757 + const_cast<char *>("wstring to string conversion failed")); |
|
2758 } |
|
2759 + String reply(&buffer[0]); |
|
2760 return reply; |
|
2761 } |
|
2762 |
|
2763 @@ -1386,22 +1389,14 @@ |
|
2764 */ |
|
2765 std::wstring string2wstring (const String& aNarrow) |
|
2766 { |
|
2767 - int max = ::MultiByteToWideChar(CP_OEMCP,0,aNarrow.c_str(),aNarrow.length(),0,0); |
|
2768 - std::wstring reply; |
|
2769 - if (max > 0 ) |
|
2770 + std::vector<char> buffer(mblen(aNarrow.c_str(),aNarrow.length()) + 2, '\0'); |
|
2771 + size_t nchars = mbstowcs((wchar_t *)&buffer[0],aNarrow.c_str(),buffer.size()); |
|
2772 + if (nchars == (size_t)-1) |
|
2773 { |
|
2774 - wchar_t* buffer = new wchar_t [max]; |
|
2775 - try |
|
2776 - { |
|
2777 - ::MultiByteToWideChar(CP_OEMCP,0,aNarrow.c_str(),aNarrow.length(),buffer,max); |
|
2778 - reply = std::wstring (buffer, max); |
|
2779 - } |
|
2780 - catch (...) |
|
2781 - { |
|
2782 - throw SisUtilsException("ParserError", "string to wstring conversion failed"); |
|
2783 - } |
|
2784 - delete [] buffer; |
|
2785 + throw SisUtilsException(const_cast<char *>("ParserError"), |
|
2786 + const_cast<char *>("string to wstring conversion failed")); |
|
2787 } |
|
2788 + std::wstring reply((wchar_t *)&buffer[0]); |
|
2789 return reply; |
|
2790 } |
|
2791 |
|
2792 @@ -1414,9 +1409,13 @@ |
|
2793 @param string - first string |
|
2794 @param option - second string |
|
2795 */ |
|
2796 -int CompareTwoString(wchar_t* string ,wchar_t* option) |
|
2797 +int CompareTwoString(wchar_t const * string ,wchar_t const * option) |
|
2798 { |
|
2799 +#if defined(WIN32) |
|
2800 return wcsicmp(string,option); |
|
2801 +#elif defined(__LINUX__) |
|
2802 + return wcscasecmp(string,option); |
|
2803 +#endif |
|
2804 } |
|
2805 |
|
2806 /** |
|
2807 @@ -1429,7 +1428,7 @@ |
|
2808 @param option - second string |
|
2809 @param len - no of wide characters to be compared |
|
2810 */ |
|
2811 -int CompareNString(wchar_t* string ,wchar_t* option, int len) |
|
2812 +int CompareNString(wchar_t const * string ,wchar_t const * option, int len) |
|
2813 { |
|
2814 - return wcsnicmp(string,option,len); |
|
2815 + return wmemcmp(string,option,len); |
|
2816 } |
|
2817 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/build/imgtools/sisutils/src/sis2iby.cpp |
|
2818 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/src/sis2iby.cpp 2010-05-10 19:22:13.852617598 +0100 |
|
2819 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/sisutils/src/sis2iby.cpp 2010-05-08 15:17:54.000000000 +0100 |
|
2820 @@ -86,12 +86,12 @@ |
|
2821 break; |
|
2822 case STAT_FAILURE: |
|
2823 { |
|
2824 - throw SisUtilsException((char*)sisFile.data(), "Failed to extract SIS file"); |
|
2825 + throw SisUtilsException((char*)sisFile.data(), const_cast<char *>("Failed to extract SIS file")); |
|
2826 } |
|
2827 } |
|
2828 } |
|
2829 else |
|
2830 - throw SisUtilsException((char*)sisFile.data(), "File not found"); |
|
2831 + throw SisUtilsException((char*)sisFile.data(), const_cast<char *>("File not found")); |
|
2832 } |
|
2833 |
|
2834 /** |
|
2835 @@ -128,7 +128,7 @@ |
|
2836 ibyFile.append(".iby"); |
|
2837 |
|
2838 if( !MakeDirectory(iOutputPath) ) |
|
2839 - throw SisUtilsException((char*)iOutputPath.data(), "Failed to create path"); |
|
2840 + throw SisUtilsException((char*)iOutputPath.data(), const_cast<char *>("Failed to create path")); |
|
2841 |
|
2842 if(IsVerboseMode()) |
|
2843 { |
|
2844 @@ -139,7 +139,7 @@ |
|
2845 |
|
2846 if(!ibyHandle.good()) |
|
2847 { |
|
2848 - throw SisUtilsException((char*)ibyFile.data(), "Failed to create IBY file"); |
|
2849 + throw SisUtilsException((char*)ibyFile.data(), const_cast<char *>("Failed to create IBY file")); |
|
2850 } |
|
2851 |
|
2852 // Generating Header |
|
2853 @@ -239,10 +239,11 @@ |
|
2854 } |
|
2855 } |
|
2856 else |
|
2857 - throw SisUtilsException((char*)pkgFileName.data(), "Could not create parser object"); |
|
2858 + throw SisUtilsException((char*)pkgFileName.data(), const_cast<char *>("Could not create parser object")); |
|
2859 } |
|
2860 else |
|
2861 - throw SisUtilsException((char*)pkgFileName.data(), "File not found"); |
|
2862 + throw SisUtilsException(const_cast<char *>(pkgFileName.data()), |
|
2863 + const_cast<char *>("File not found")); |
|
2864 } |
|
2865 |
|
2866 /** |
|
2867 @@ -551,7 +552,12 @@ |
|
2868 aFile.assign(fPath); |
|
2869 } |
|
2870 #else |
|
2871 -#error "TODO: Implement this function under other OS than Windows" |
|
2872 + char fPath[FILENAME_MAX]; |
|
2873 + if (realpath(aFile.c_str(),fPath)) |
|
2874 + { |
|
2875 + aFile.assign(fPath); |
|
2876 + } |
|
2877 + |
|
2878 #endif |
|
2879 return; |
|
2880 } |
|
2881 @@ -652,7 +658,8 @@ |
|
2882 |
|
2883 if( !aIfs.is_open() ) |
|
2884 { |
|
2885 - throw SisUtilsException((char*)aFile.data(), "Cannot open file"); |
|
2886 + throw SisUtilsException(const_cast<char *>(aFile.data()), |
|
2887 + const_cast<char *>("Cannot open file")); |
|
2888 } |
|
2889 |
|
2890 aIfs.seekg(0,std::ios::end); |
|
2891 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/build/imgtools/sisutils/src/sisutils.cpp |
|
2892 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/src/sisutils.cpp 2010-05-10 19:22:13.852617598 +0100 |
|
2893 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/sisutils/src/sisutils.cpp 2010-05-08 15:18:44.000000000 +0100 |
|
2894 @@ -20,6 +20,13 @@ |
|
2895 #include <windows.h> |
|
2896 #include <direct.h> |
|
2897 #endif |
|
2898 +#ifdef __LINUX__ |
|
2899 +#include <vector> |
|
2900 +#include <cerrno> |
|
2901 +#include <sys/wait.h> |
|
2902 +#include <sys/stat.h> |
|
2903 +#endif |
|
2904 + |
|
2905 |
|
2906 #include "sisutils.h" |
|
2907 |
|
2908 @@ -201,9 +208,47 @@ |
|
2909 ::CloseHandle( pi.hProcess ); |
|
2910 ::CloseHandle( pi.hThread ); |
|
2911 #else |
|
2912 -#error "TODO: Implement this function under other OS than Windows" |
|
2913 + String::iterator pch = cmd.begin(); |
|
2914 + String::iterator end = cmd.end(); |
|
2915 + char *token = NULL; |
|
2916 + std::vector<char *> args; |
|
2917 + for ( ;pch != end; ++pch) |
|
2918 + { |
|
2919 + if (isspace(*pch)) |
|
2920 + { |
|
2921 + *pch = '\0'; |
|
2922 + if (token) { |
|
2923 + token = NULL; |
|
2924 + } |
|
2925 + } |
|
2926 + else if (!token) |
|
2927 + { |
|
2928 + token = &*pch; |
|
2929 + args.push_back(token); |
|
2930 + } |
|
2931 + } |
|
2932 + args.push_back(NULL); |
|
2933 + pid_t pid = fork(); |
|
2934 + if (pid == 0) |
|
2935 + { |
|
2936 + execv(args[0],&args[0]); |
|
2937 + } |
|
2938 + else if (pid < 0) |
|
2939 + { |
|
2940 + iExitCode = static_cast<TUint32>(STAT_FAILURE); |
|
2941 + } |
|
2942 + else |
|
2943 + { |
|
2944 + int rtc; |
|
2945 + pid_t ws = waitpid( pid, &rtc, 0); |
|
2946 + if (ws != pid) { |
|
2947 + iExitCode = static_cast<TUint32>(STAT_FAILURE); |
|
2948 + } |
|
2949 + else { |
|
2950 + iExitCode = rtc; |
|
2951 + } |
|
2952 + } |
|
2953 #endif |
|
2954 - |
|
2955 return iExitCode; |
|
2956 } |
|
2957 |
|
2958 @@ -281,7 +326,13 @@ |
|
2959 } |
|
2960 } |
|
2961 #else |
|
2962 -#error "TODO: Implement this function under other OS than Windows" |
|
2963 + if(mkdir(dir.data(),777) != 0) |
|
2964 + { |
|
2965 + if(errno != EEXIST) |
|
2966 + { |
|
2967 + status = EFalse; |
|
2968 + } |
|
2969 + } |
|
2970 #endif |
|
2971 if(status == EFalse) |
|
2972 break; |
|
2973 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/build/sbsv2/cpp-raptor/group/exports.inf |
|
2974 --- /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 |
|
2975 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/cpp-raptor/group/exports.inf 2010-05-09 13:37:03.425787894 +0100 |
|
2976 @@ -15,6 +15,6 @@ |
|
2977 * |
|
2978 */ |
|
2979 |
|
2980 -../win32/bin/cpp.exe /tools/sbs/win32/bv/bin/cpp.exe |
|
2981 -../win32/i686-pc-mingw32/bin/cc1.exe /tools/sbs/win32/bv/i686-pc-mingw32/bin/cc1.exe |
|
2982 -../win32/i686-pc-mingw32/bin/libiconv-2.dll /tools/sbs/win32/bv/i686-pc-mingw32/bin/libiconv-2.dll |
|
2983 +../win32/bin/cpp.exe ../../tools/sbs/win32/bv/bin/cpp.exe |
|
2984 +../win32/i686-pc-mingw32/bin/cc1.exe ../../tools/sbs/win32/bv/i686-pc-mingw32/bin/cc1.exe |
|
2985 +../win32/i686-pc-mingw32/bin/libiconv-2.dll ../../tools/sbs/win32/bv/i686-pc-mingw32/bin/libiconv-2.dll |
|
2986 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/build/sbsv2/raptor/group/exports.inf |
|
2987 --- /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/sbsv2/raptor/group/exports.inf 2010-05-10 19:22:17.197117642 +0100 |
|
2988 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/group/exports.inf 2010-05-09 13:36:29.473288352 +0100 |
|
2989 @@ -15,209 +15,209 @@ |
|
2990 * |
|
2991 */ |
|
2992 |
|
2993 -../RELEASE-NOTES.txt /tools/sbs/RELEASE-NOTES.txt |
|
2994 -../bin/sbs /tools/sbs/bin/sbs |
|
2995 -../bin/fixmeta.py /tools/sbs/bin/fixmeta.py |
|
2996 -../bin/codetest_osbuild.sh /tools/sbs/bin/codetest_osbuild.sh |
|
2997 -../bin/countbinaries.sh /tools/sbs/bin/countbinaries.sh |
|
2998 -../bin/gethost.sh /tools/sbs/bin/gethost.sh |
|
2999 -../bin/failedstats.py /tools/sbs/bin/failedstats.py |
|
3000 -../bin/sbs.bat /tools/sbs/bin/sbs.bat |
|
3001 -../bin/unsplitdirs.py /tools/sbs/bin/unsplitdirs.py |
|
3002 -../bin/buildstats.py /tools/sbs/bin/buildstats.py |
|
3003 -../bin/speedtest_osbuild.sh /tools/sbs/bin/speedtest_osbuild.sh |
|
3004 -../bin/sbsv2cache.py /tools/sbs/bin/sbsv2cache.py |
|
3005 -../bin/whatsource.py /tools/sbs/bin/whatsource.py |
|
3006 -../bin/oby2linux.py /tools/sbs/bin/oby2linux.py |
|
3007 -../bin/createrfifile.pl /tools/sbs/bin/createrfifile.pl |
|
3008 -../bin/vartoxml.py /tools/sbs/bin/vartoxml.py |
|
3009 -../bin/readme.txt /tools/sbs/bin/readme.txt |
|
3010 -../bin/squashlog.py /tools/sbs/bin/squashlog.py |
|
3011 -../bin/statcollate.py /tools/sbs/bin/statcollate.py |
|
3012 -../bin/createvmap.py /tools/sbs/bin/createvmap.py |
|
3013 -../bin/raptorlog.py /tools/sbs/bin/raptorlog.py |
|
3014 -../bin/osbuild.sh /tools/sbs/bin/osbuild.sh |
|
3015 -../bin/setup_user.sh /tools/sbs/bin/setup_user.sh |
|
3016 -../bin/msvcr71.dll /tools/sbs/bin/msvcr71.dll |
|
3017 -../bin/install_raptor.sh /tools/sbs/bin/install_raptor.sh |
|
3018 -../bin/mkgetfailed.py /tools/sbs/bin/mkgetfailed.py |
|
3019 -../examples/os_properties.xml /tools/sbs/examples/os_properties.xml |
|
3020 -../examples/sbs_init.xml /tools/sbs/examples/sbs_init.xml |
|
3021 -../lib/flm/e32abiv2stdexe.flm /tools/sbs/lib/flm/e32abiv2stdexe.flm |
|
3022 -../lib/flm/user/default.flm_ex /tools/sbs/lib/flm/user/default.flm_ex |
|
3023 -../lib/flm/user/globals.mk_ex /tools/sbs/lib/flm/user/globals.mk_ex |
|
3024 -../lib/flm/e32abiv2dll.flm /tools/sbs/lib/flm/e32abiv2dll.flm |
|
3025 -../lib/flm/tracecompiler.mk /tools/sbs/lib/flm/tracecompiler.mk |
|
3026 -../lib/flm/win32exe.flm /tools/sbs/lib/flm/win32exe.flm |
|
3027 -../lib/flm/template_ext.flm /tools/sbs/lib/flm/template_ext.flm |
|
3028 -../lib/flm/e32abiv2ani.flm /tools/sbs/lib/flm/e32abiv2ani.flm |
|
3029 -../lib/flm/converged-comms/createcommdbs.flm /tools/sbs/lib/flm/converged-comms/createcommdbs.flm |
|
3030 -../lib/flm/converged-comms/installdefaultcommdb.flm /tools/sbs/lib/flm/converged-comms/installdefaultcommdb.flm |
|
3031 -../lib/flm/win32plugin.flm /tools/sbs/lib/flm/win32plugin.flm |
|
3032 -../lib/flm/win32klib.flm /tools/sbs/lib/flm/win32klib.flm |
|
3033 -../lib/flm/extensions.xml /tools/sbs/lib/flm/extensions.xml |
|
3034 -../lib/flm/stack.mk /tools/sbs/lib/flm/stack.mk |
|
3035 -../lib/flm/globals.mk /tools/sbs/lib/flm/globals.mk |
|
3036 -../lib/flm/win32stdexe.flm /tools/sbs/lib/flm/win32stdexe.flm |
|
3037 -../lib/flm/e32abiv2lib.flm /tools/sbs/lib/flm/e32abiv2lib.flm |
|
3038 -../lib/flm/win32resource.flm /tools/sbs/lib/flm/win32resource.flm |
|
3039 -../lib/flm/config/default.flm /tools/sbs/lib/flm/config/default.flm |
|
3040 -../lib/flm/win32lib.flm /tools/sbs/lib/flm/win32lib.flm |
|
3041 -../lib/flm/null.flm /tools/sbs/lib/flm/null.flm |
|
3042 -../lib/flm/tools/test_command_diff.sh /tools/sbs/lib/flm/tools/test_command_diff.sh |
|
3043 -../lib/flm/tools/stlport.flm /tools/sbs/lib/flm/tools/stlport.flm |
|
3044 -../lib/flm/tools/buildstubsis.flm /tools/sbs/lib/flm/tools/buildstubsis.flm |
|
3045 -../lib/flm/msvctools.xml /tools/sbs/lib/flm/msvctools.xml |
|
3046 -../lib/flm/tools2lib.flm /tools/sbs/lib/flm/tools2lib.flm |
|
3047 -../lib/flm/win32ldd.flm /tools/sbs/lib/flm/win32ldd.flm |
|
3048 -../lib/flm/tools.xml /tools/sbs/lib/flm/tools.xml |
|
3049 -../lib/flm/metaflm.mk /tools/sbs/lib/flm/metaflm.mk |
|
3050 -../lib/flm/e32abiv2ldd.flm /tools/sbs/lib/flm/e32abiv2ldd.flm |
|
3051 -../lib/flm/e32abiv2pdl.flm /tools/sbs/lib/flm/e32abiv2pdl.flm |
|
3052 -../lib/flm/e32abiv2stdlib.flm /tools/sbs/lib/flm/e32abiv2stdlib.flm |
|
3053 -../lib/flm/config.xml /tools/sbs/lib/flm/config.xml |
|
3054 -../lib/flm/win32stddll.flm /tools/sbs/lib/flm/win32stddll.flm |
|
3055 -../lib/flm/gccxmlresource.flm /tools/sbs/lib/flm/gccxmlresource.flm |
|
3056 -../lib/flm/e32abiv2textnotifier2.flm /tools/sbs/lib/flm/e32abiv2textnotifier2.flm |
|
3057 -../lib/flm/e32abiv2implib.flm /tools/sbs/lib/flm/e32abiv2implib.flm |
|
3058 -../lib/flm/e32abiv2exe.flm /tools/sbs/lib/flm/e32abiv2exe.flm |
|
3059 -../lib/flm/win32pdl.flm /tools/sbs/lib/flm/win32pdl.flm |
|
3060 -../lib/flm/win32.flm /tools/sbs/lib/flm/win32.flm |
|
3061 -../lib/flm/base.xml /tools/sbs/lib/flm/base.xml |
|
3062 -../lib/flm/grouping.flm /tools/sbs/lib/flm/grouping.flm |
|
3063 -../lib/flm/e32abiv2.flm /tools/sbs/lib/flm/e32abiv2.flm |
|
3064 -../lib/flm/e32abiv2exexp.flm /tools/sbs/lib/flm/e32abiv2exexp.flm |
|
3065 -../lib/flm/e32abiv2defaults.mk /tools/sbs/lib/flm/e32abiv2defaults.mk |
|
3066 -../lib/flm/e32abiv2fsy.flm /tools/sbs/lib/flm/e32abiv2fsy.flm |
|
3067 -../lib/flm/final.mk /tools/sbs/lib/flm/final.mk |
|
3068 -../lib/flm/none.flm /tools/sbs/lib/flm/none.flm |
|
3069 -../lib/flm/analysis.xml /tools/sbs/lib/flm/analysis.xml |
|
3070 -../lib/flm/e32abiv2var2.flm /tools/sbs/lib/flm/e32abiv2var2.flm |
|
3071 -../lib/flm/msvctools.flm /tools/sbs/lib/flm/msvctools.flm |
|
3072 -../lib/flm/win32kdll.flm /tools/sbs/lib/flm/win32kdll.flm |
|
3073 -../lib/flm/win32ani.flm /tools/sbs/lib/flm/win32ani.flm |
|
3074 -../lib/flm/e32abiv2plugin.flm /tools/sbs/lib/flm/e32abiv2plugin.flm |
|
3075 -../lib/flm/win32bitmap.flm /tools/sbs/lib/flm/win32bitmap.flm |
|
3076 -../lib/flm/tools2common.flm /tools/sbs/lib/flm/tools2common.flm |
|
3077 -../lib/flm/win32fsy.flm /tools/sbs/lib/flm/win32fsy.flm |
|
3078 -../lib/flm/readme.txt /tools/sbs/lib/flm/readme.txt |
|
3079 -../lib/flm/e32abiv2kext.flm /tools/sbs/lib/flm/e32abiv2kext.flm |
|
3080 -../lib/flm/e32abiv2stddll.flm /tools/sbs/lib/flm/e32abiv2stddll.flm |
|
3081 -../lib/flm/win32exexp.flm /tools/sbs/lib/flm/win32exexp.flm |
|
3082 -../lib/flm/stringtable.flm /tools/sbs/lib/flm/stringtable.flm |
|
3083 -../lib/flm/utils/utility.xml /tools/sbs/lib/flm/utils/utility.xml |
|
3084 -../lib/flm/utils/prebuilt.flm /tools/sbs/lib/flm/utils/prebuilt.flm |
|
3085 -../lib/flm/utils/copydir.flm /tools/sbs/lib/flm/utils/copydir.flm |
|
3086 -../lib/flm/win32pdd.flm /tools/sbs/lib/flm/win32pdd.flm |
|
3087 -../lib/flm/taggedrules.mk /tools/sbs/lib/flm/taggedrules.mk |
|
3088 -../lib/flm/booleanlogic.mk /tools/sbs/lib/flm/booleanlogic.mk |
|
3089 -../lib/flm/emulator.xml /tools/sbs/lib/flm/emulator.xml |
|
3090 -../lib/flm/win32kext.flm /tools/sbs/lib/flm/win32kext.flm |
|
3091 -../lib/flm/test/exeabiv2_2/test.cpp /tools/sbs/lib/flm/test/exeabiv2_2/test.cpp |
|
3092 -../lib/flm/test/exeabiv2_2/test_function.cpp /tools/sbs/lib/flm/test/exeabiv2_2/test_function.cpp |
|
3093 -../lib/flm/test/exeabiv2_2/exeabiv2_2.mk /tools/sbs/lib/flm/test/exeabiv2_2/exeabiv2_2.mk |
|
3094 -../lib/flm/test/templateext/temex.mk /tools/sbs/lib/flm/test/templateext/temex.mk |
|
3095 -../lib/flm/test/templateext/Makefile /tools/sbs/lib/flm/test/templateext/Makefile |
|
3096 -../lib/flm/test/Makefile /tools/sbs/lib/flm/test/Makefile |
|
3097 -../lib/flm/test/exeabiv2_4/test.cpp /tools/sbs/lib/flm/test/exeabiv2_4/test.cpp |
|
3098 -../lib/flm/test/exeabiv2_4/exeabiv2_4.mk /tools/sbs/lib/flm/test/exeabiv2_4/exeabiv2_4.mk |
|
3099 -../lib/flm/test/exeabiv2_4/test_big.cpp /tools/sbs/lib/flm/test/exeabiv2_4/test_big.cpp |
|
3100 -../lib/flm/test/flmtests.mk /tools/sbs/lib/flm/test/flmtests.mk |
|
3101 -../lib/flm/test/ciaabiv2_1/uc_exe.cia /tools/sbs/lib/flm/test/ciaabiv2_1/uc_exe.cia |
|
3102 -../lib/flm/test/ciaabiv2_1/uc_exe.cpp /tools/sbs/lib/flm/test/ciaabiv2_1/uc_exe.cpp |
|
3103 -../lib/flm/test/ciaabiv2_1/ciaabiv2_1.mk /tools/sbs/lib/flm/test/ciaabiv2_1/ciaabiv2_1.mk |
|
3104 -../lib/flm/test/export1/Makefile /tools/sbs/lib/flm/test/export1/Makefile |
|
3105 -../lib/flm/test/export1/t1e.h /tools/sbs/lib/flm/test/export1/t1e.h |
|
3106 -../lib/flm/test/export1/t4e.h /tools/sbs/lib/flm/test/export1/t4e.h |
|
3107 -../lib/flm/test/export1/t2e.h /tools/sbs/lib/flm/test/export1/t2e.h |
|
3108 -../lib/flm/test/export1/t3e.h /tools/sbs/lib/flm/test/export1/t3e.h |
|
3109 -../lib/flm/test/dllabiv2_1/test.cpp /tools/sbs/lib/flm/test/dllabiv2_1/test.cpp |
|
3110 -../lib/flm/test/dllabiv2_1/dllabiv2_1.mk /tools/sbs/lib/flm/test/dllabiv2_1/dllabiv2_1.mk |
|
3111 -../lib/flm/test/raptorglue/raptorglue.mk /tools/sbs/lib/flm/test/raptorglue/raptorglue.mk |
|
3112 -../lib/flm/test/dllbasictests.mk /tools/sbs/lib/flm/test/dllbasictests.mk |
|
3113 -../lib/flm/test/exeabiv2_1/test.cpp /tools/sbs/lib/flm/test/exeabiv2_1/test.cpp |
|
3114 -../lib/flm/test/exeabiv2_1/exeabiv2_1.mk /tools/sbs/lib/flm/test/exeabiv2_1/exeabiv2_1.mk |
|
3115 -../lib/flm/test/dllabiv2_defaults.mk /tools/sbs/lib/flm/test/dllabiv2_defaults.mk |
|
3116 -../lib/flm/test/exeperftests.mk /tools/sbs/lib/flm/test/exeperftests.mk |
|
3117 -../lib/flm/test/ciatests.mk /tools/sbs/lib/flm/test/ciatests.mk |
|
3118 -../lib/flm/test/environment/pvm/pvmtest.mk /tools/sbs/lib/flm/test/environment/pvm/pvmtest.mk |
|
3119 -../lib/flm/test/environment/make/test_variable_restore.mk /tools/sbs/lib/flm/test/environment/make/test_variable_restore.mk |
|
3120 -../lib/flm/test/exebasictests.mk /tools/sbs/lib/flm/test/exebasictests.mk |
|
3121 -../lib/flm/test/exeabiv2_defaults.mk /tools/sbs/lib/flm/test/exeabiv2_defaults.mk |
|
3122 -../lib/flm/test/exeabiv2_3/exeabiv2_3.mk /tools/sbs/lib/flm/test/exeabiv2_3/exeabiv2_3.mk |
|
3123 -../lib/flm/test/exeabiv2_3/test_big.cpp /tools/sbs/lib/flm/test/exeabiv2_3/test_big.cpp |
|
3124 -../lib/flm/win32stdlib.flm /tools/sbs/lib/flm/win32stdlib.flm |
|
3125 -../lib/flm/win32var2.flm /tools/sbs/lib/flm/win32var2.flm |
|
3126 -../lib/flm/win32implib.flm /tools/sbs/lib/flm/win32implib.flm |
|
3127 -../lib/flm/bitmap.flm /tools/sbs/lib/flm/bitmap.flm |
|
3128 -../lib/flm/build.flm /tools/sbs/lib/flm/build.flm |
|
3129 -../lib/flm/build.xml /tools/sbs/lib/flm/build.xml |
|
3130 -../lib/flm/tools2exe.flm /tools/sbs/lib/flm/tools2exe.flm |
|
3131 -../lib/flm/e32abiv2klib.flm /tools/sbs/lib/flm/e32abiv2klib.flm |
|
3132 -../lib/flm/standard.xml /tools/sbs/lib/flm/standard.xml |
|
3133 -../lib/flm/win32var.flm /tools/sbs/lib/flm/win32var.flm |
|
3134 -../lib/flm/e32abiv2pdd.flm /tools/sbs/lib/flm/e32abiv2pdd.flm |
|
3135 -../lib/flm/e32abiv2none.flm /tools/sbs/lib/flm/e32abiv2none.flm |
|
3136 -../lib/flm/romfile.mk /tools/sbs/lib/flm/romfile.mk |
|
3137 -../lib/flm/win32textnotifier2.flm /tools/sbs/lib/flm/win32textnotifier2.flm |
|
3138 -../lib/flm/resource.flm /tools/sbs/lib/flm/resource.flm |
|
3139 -../lib/flm/flmtools.mk /tools/sbs/lib/flm/flmtools.mk |
|
3140 -../lib/flm/gnumakefile.flm /tools/sbs/lib/flm/gnumakefile.flm |
|
3141 -../lib/flm/e32abiv2kdll.flm /tools/sbs/lib/flm/e32abiv2kdll.flm |
|
3142 -../lib/flm/e32abiv2var.flm /tools/sbs/lib/flm/e32abiv2var.flm |
|
3143 -../lib/flm/win32dll.flm /tools/sbs/lib/flm/win32dll.flm |
|
3144 -../lib/flm/gccxml.flm /tools/sbs/lib/flm/gccxml.flm |
|
3145 -../lib/flm/e32postlink.mk /tools/sbs/lib/flm/e32postlink.mk |
|
3146 -../lib/config/default.xml /tools/sbs/lib/config/default.xml |
|
3147 -../lib/config/build.xml /tools/sbs/lib/config/build.xml |
|
3148 -../lib/config/interfaces.xml /tools/sbs/lib/config/interfaces.xml |
|
3149 -../lib/config/gcc.xml /tools/sbs/lib/config/gcc.xml |
|
3150 -../lib/config/variants.xml /tools/sbs/lib/config/variants.xml |
|
3151 -../lib/config/coverity.xml /tools/sbs/lib/config/coverity.xml |
|
3152 -../lib/config/meta.xml /tools/sbs/lib/config/meta.xml |
|
3153 -../lib/config/locations.xml /tools/sbs/lib/config/locations.xml |
|
3154 -../lib/config/gccxml.xml /tools/sbs/lib/config/gccxml.xml |
|
3155 -../lib/config/carbide.xml /tools/sbs/lib/config/carbide.xml |
|
3156 -../lib/config/msvc.xml /tools/sbs/lib/config/msvc.xml |
|
3157 -../lib/config/make.xml /tools/sbs/lib/config/make.xml |
|
3158 -../lib/config/root.xml /tools/sbs/lib/config/root.xml |
|
3159 -../lib/config/winscw.xml /tools/sbs/lib/config/winscw.xml |
|
3160 -../lib/config/arm.xml /tools/sbs/lib/config/arm.xml |
|
3161 -../lib/config/gcce.xml /tools/sbs/lib/config/gcce.xml |
|
3162 -../lib/config/rvct.xml /tools/sbs/lib/config/rvct.xml |
|
3163 -../python/raptor_makefile.py /tools/sbs/python/raptor_makefile.py |
|
3164 -../python/filter_interface.py /tools/sbs/python/filter_interface.py |
|
3165 -../python/raptor_start.py /tools/sbs/python/raptor_start.py |
|
3166 -../python/pyparsing.py /tools/sbs/python/pyparsing.py |
|
3167 -../python/raptor_cli.py /tools/sbs/python/raptor_cli.py |
|
3168 -../python/raptor_cache.py /tools/sbs/python/raptor_cache.py |
|
3169 -../python/raptor_meta.py /tools/sbs/python/raptor_meta.py |
|
3170 -../python/raptor_xml.py /tools/sbs/python/raptor_xml.py |
|
3171 -../python/raptor_version.py /tools/sbs/python/raptor_version.py |
|
3172 -../python/generic_path.py /tools/sbs/python/generic_path.py |
|
3173 -../python/raptor_make.py /tools/sbs/python/raptor_make.py |
|
3174 -../python/plugins/filter_logfile.py /tools/sbs/python/plugins/filter_logfile.py |
|
3175 -../python/plugins/filter_terminal.py /tools/sbs/python/plugins/filter_terminal.py |
|
3176 -../python/plugins/filter_carbide.py /tools/sbs/python/plugins/filter_carbide.py |
|
3177 -../python/plugins/filter_what.py /tools/sbs/python/plugins/filter_what.py |
|
3178 -../python/plugins/dummyplugin.py /tools/sbs/python/plugins/dummyplugin.py |
|
3179 -../python/plugins/filter_clean.py /tools/sbs/python/plugins/filter_clean.py |
|
3180 -../python/plugins/filter_squashlog.py /tools/sbs/python/plugins/filter_squashlog.py |
|
3181 -../python/plugins/filter_checksource.py /tools/sbs/python/plugins/filter_checksource.py |
|
3182 -../python/plugins/filter_splitlog.py /tools/sbs/python/plugins/filter_splitlog.py |
|
3183 -../python/sbs_dist.py /tools/sbs/python/sbs_dist.py |
|
3184 -../python/raptor_utilities.py /tools/sbs/python/raptor_utilities.py |
|
3185 -../python/pluginbox.py /tools/sbs/python/pluginbox.py |
|
3186 -../python/dos2unix.py /tools/sbs/python/dos2unix.py |
|
3187 -../python/raptor_data.py /tools/sbs/python/raptor_data.py |
|
3188 -../python/filter_list.py /tools/sbs/python/filter_list.py |
|
3189 -../python/raptor.py /tools/sbs/python/raptor.py |
|
3190 -../python/mmpparser.py /tools/sbs/python/mmpparser.py |
|
3191 -../python/filter_utils.py /tools/sbs/python/filter_utils.py |
|
3192 -../schema/build/2_0.xsd /tools/sbs/schema/build/2_0.xsd |
|
3193 -../schema/build/log/1_0.xsd /tools/sbs/schema/build/log/1_0.xsd |
|
3194 -../schema/build/1_0.xsd /tools/sbs/schema/build/1_0.xsd |
|
3195 -../win32/bin/ransleep.exe /tools/sbs/win32/bin/ransleep.exe |
|
3196 -../win32/bin/sbs_descramble.exe /tools/sbs/win32/bin/sbs_descramble.exe |
|
3197 -../win32/bin/talonctl.exe /tools/sbs/win32/bin/talonctl.exe |
|
3198 -../win32/bin/talon.exe /tools/sbs/win32/bin/talon.exe |
|
3199 +../RELEASE-NOTES.txt ../../tools/sbs/RELEASE-NOTES.txt |
|
3200 +../bin/sbs ../../tools/sbs/bin/sbs |
|
3201 +../bin/fixmeta.py ../../tools/sbs/bin/fixmeta.py |
|
3202 +../bin/codetest_osbuild.sh ../../tools/sbs/bin/codetest_osbuild.sh |
|
3203 +../bin/countbinaries.sh ../../tools/sbs/bin/countbinaries.sh |
|
3204 +../bin/gethost.sh ../../tools/sbs/bin/gethost.sh |
|
3205 +../bin/failedstats.py ../../tools/sbs/bin/failedstats.py |
|
3206 +../bin/sbs.bat ../../tools/sbs/bin/sbs.bat |
|
3207 +../bin/unsplitdirs.py ../../tools/sbs/bin/unsplitdirs.py |
|
3208 +../bin/buildstats.py ../../tools/sbs/bin/buildstats.py |
|
3209 +../bin/speedtest_osbuild.sh ../../tools/sbs/bin/speedtest_osbuild.sh |
|
3210 +../bin/sbsv2cache.py ../../tools/sbs/bin/sbsv2cache.py |
|
3211 +../bin/whatsource.py ../../tools/sbs/bin/whatsource.py |
|
3212 +../bin/oby2linux.py ../../tools/sbs/bin/oby2linux.py |
|
3213 +../bin/createrfifile.pl ../../tools/sbs/bin/createrfifile.pl |
|
3214 +../bin/vartoxml.py ../../tools/sbs/bin/vartoxml.py |
|
3215 +../bin/readme.txt ../../tools/sbs/bin/readme.txt |
|
3216 +../bin/squashlog.py ../../tools/sbs/bin/squashlog.py |
|
3217 +../bin/statcollate.py ../../tools/sbs/bin/statcollate.py |
|
3218 +../bin/createvmap.py ../../tools/sbs/bin/createvmap.py |
|
3219 +../bin/raptorlog.py ../../tools/sbs/bin/raptorlog.py |
|
3220 +../bin/osbuild.sh ../../tools/sbs/bin/osbuild.sh |
|
3221 +../bin/setup_user.sh ../../tools/sbs/bin/setup_user.sh |
|
3222 +../bin/msvcr71.dll ../../tools/sbs/bin/msvcr71.dll |
|
3223 +../bin/install_raptor.sh ../../tools/sbs/bin/install_raptor.sh |
|
3224 +../bin/mkgetfailed.py ../../tools/sbs/bin/mkgetfailed.py |
|
3225 +../examples/os_properties.xml ../../tools/sbs/examples/os_properties.xml |
|
3226 +../examples/sbs_init.xml ../../tools/sbs/examples/sbs_init.xml |
|
3227 +../lib/flm/e32abiv2stdexe.flm ../../tools/sbs/lib/flm/e32abiv2stdexe.flm |
|
3228 +../lib/flm/user/default.flm_ex ../../tools/sbs/lib/flm/user/default.flm_ex |
|
3229 +../lib/flm/user/globals.mk_ex ../../tools/sbs/lib/flm/user/globals.mk_ex |
|
3230 +../lib/flm/e32abiv2dll.flm ../../tools/sbs/lib/flm/e32abiv2dll.flm |
|
3231 +../lib/flm/tracecompiler.mk ../../tools/sbs/lib/flm/tracecompiler.mk |
|
3232 +../lib/flm/win32exe.flm ../../tools/sbs/lib/flm/win32exe.flm |
|
3233 +../lib/flm/template_ext.flm ../../tools/sbs/lib/flm/template_ext.flm |
|
3234 +../lib/flm/e32abiv2ani.flm ../../tools/sbs/lib/flm/e32abiv2ani.flm |
|
3235 +../lib/flm/converged-comms/createcommdbs.flm ../../tools/sbs/lib/flm/converged-comms/createcommdbs.flm |
|
3236 +../lib/flm/converged-comms/installdefaultcommdb.flm ../../tools/sbs/lib/flm/converged-comms/installdefaultcommdb.flm |
|
3237 +../lib/flm/win32plugin.flm ../../tools/sbs/lib/flm/win32plugin.flm |
|
3238 +../lib/flm/win32klib.flm ../../tools/sbs/lib/flm/win32klib.flm |
|
3239 +../lib/flm/extensions.xml ../../tools/sbs/lib/flm/extensions.xml |
|
3240 +../lib/flm/stack.mk ../../tools/sbs/lib/flm/stack.mk |
|
3241 +../lib/flm/globals.mk ../../tools/sbs/lib/flm/globals.mk |
|
3242 +../lib/flm/win32stdexe.flm ../../tools/sbs/lib/flm/win32stdexe.flm |
|
3243 +../lib/flm/e32abiv2lib.flm ../../tools/sbs/lib/flm/e32abiv2lib.flm |
|
3244 +../lib/flm/win32resource.flm ../../tools/sbs/lib/flm/win32resource.flm |
|
3245 +../lib/flm/config/default.flm ../../tools/sbs/lib/flm/config/default.flm |
|
3246 +../lib/flm/win32lib.flm ../../tools/sbs/lib/flm/win32lib.flm |
|
3247 +../lib/flm/null.flm ../../tools/sbs/lib/flm/null.flm |
|
3248 +../lib/flm/tools/test_command_diff.sh ../../tools/sbs/lib/flm/tools/test_command_diff.sh |
|
3249 +../lib/flm/tools/stlport.flm ../../tools/sbs/lib/flm/tools/stlport.flm |
|
3250 +../lib/flm/tools/buildstubsis.flm ../../tools/sbs/lib/flm/tools/buildstubsis.flm |
|
3251 +../lib/flm/msvctools.xml ../../tools/sbs/lib/flm/msvctools.xml |
|
3252 +../lib/flm/tools2lib.flm ../../tools/sbs/lib/flm/tools2lib.flm |
|
3253 +../lib/flm/win32ldd.flm ../../tools/sbs/lib/flm/win32ldd.flm |
|
3254 +../lib/flm/tools.xml ../../tools/sbs/lib/flm/tools.xml |
|
3255 +../lib/flm/metaflm.mk ../../tools/sbs/lib/flm/metaflm.mk |
|
3256 +../lib/flm/e32abiv2ldd.flm ../../tools/sbs/lib/flm/e32abiv2ldd.flm |
|
3257 +../lib/flm/e32abiv2pdl.flm ../../tools/sbs/lib/flm/e32abiv2pdl.flm |
|
3258 +../lib/flm/e32abiv2stdlib.flm ../../tools/sbs/lib/flm/e32abiv2stdlib.flm |
|
3259 +../lib/flm/config.xml ../../tools/sbs/lib/flm/config.xml |
|
3260 +../lib/flm/win32stddll.flm ../../tools/sbs/lib/flm/win32stddll.flm |
|
3261 +../lib/flm/gccxmlresource.flm ../../tools/sbs/lib/flm/gccxmlresource.flm |
|
3262 +../lib/flm/e32abiv2textnotifier2.flm ../../tools/sbs/lib/flm/e32abiv2textnotifier2.flm |
|
3263 +../lib/flm/e32abiv2implib.flm ../../tools/sbs/lib/flm/e32abiv2implib.flm |
|
3264 +../lib/flm/e32abiv2exe.flm ../../tools/sbs/lib/flm/e32abiv2exe.flm |
|
3265 +../lib/flm/win32pdl.flm ../../tools/sbs/lib/flm/win32pdl.flm |
|
3266 +../lib/flm/win32.flm ../../tools/sbs/lib/flm/win32.flm |
|
3267 +../lib/flm/base.xml ../../tools/sbs/lib/flm/base.xml |
|
3268 +../lib/flm/grouping.flm ../../tools/sbs/lib/flm/grouping.flm |
|
3269 +../lib/flm/e32abiv2.flm ../../tools/sbs/lib/flm/e32abiv2.flm |
|
3270 +../lib/flm/e32abiv2exexp.flm ../../tools/sbs/lib/flm/e32abiv2exexp.flm |
|
3271 +../lib/flm/e32abiv2defaults.mk ../../tools/sbs/lib/flm/e32abiv2defaults.mk |
|
3272 +../lib/flm/e32abiv2fsy.flm ../../tools/sbs/lib/flm/e32abiv2fsy.flm |
|
3273 +../lib/flm/final.mk ../../tools/sbs/lib/flm/final.mk |
|
3274 +../lib/flm/none.flm ../../tools/sbs/lib/flm/none.flm |
|
3275 +../lib/flm/analysis.xml ../../tools/sbs/lib/flm/analysis.xml |
|
3276 +../lib/flm/e32abiv2var2.flm ../../tools/sbs/lib/flm/e32abiv2var2.flm |
|
3277 +../lib/flm/msvctools.flm ../../tools/sbs/lib/flm/msvctools.flm |
|
3278 +../lib/flm/win32kdll.flm ../../tools/sbs/lib/flm/win32kdll.flm |
|
3279 +../lib/flm/win32ani.flm ../../tools/sbs/lib/flm/win32ani.flm |
|
3280 +../lib/flm/e32abiv2plugin.flm ../../tools/sbs/lib/flm/e32abiv2plugin.flm |
|
3281 +../lib/flm/win32bitmap.flm ../../tools/sbs/lib/flm/win32bitmap.flm |
|
3282 +../lib/flm/tools2common.flm ../../tools/sbs/lib/flm/tools2common.flm |
|
3283 +../lib/flm/win32fsy.flm ../../tools/sbs/lib/flm/win32fsy.flm |
|
3284 +../lib/flm/readme.txt ../../tools/sbs/lib/flm/readme.txt |
|
3285 +../lib/flm/e32abiv2kext.flm ../../tools/sbs/lib/flm/e32abiv2kext.flm |
|
3286 +../lib/flm/e32abiv2stddll.flm ../../tools/sbs/lib/flm/e32abiv2stddll.flm |
|
3287 +../lib/flm/win32exexp.flm ../../tools/sbs/lib/flm/win32exexp.flm |
|
3288 +../lib/flm/stringtable.flm ../../tools/sbs/lib/flm/stringtable.flm |
|
3289 +../lib/flm/utils/utility.xml ../../tools/sbs/lib/flm/utils/utility.xml |
|
3290 +../lib/flm/utils/prebuilt.flm ../../tools/sbs/lib/flm/utils/prebuilt.flm |
|
3291 +../lib/flm/utils/copydir.flm ../../tools/sbs/lib/flm/utils/copydir.flm |
|
3292 +../lib/flm/win32pdd.flm ../../tools/sbs/lib/flm/win32pdd.flm |
|
3293 +../lib/flm/taggedrules.mk ../../tools/sbs/lib/flm/taggedrules.mk |
|
3294 +../lib/flm/booleanlogic.mk ../../tools/sbs/lib/flm/booleanlogic.mk |
|
3295 +../lib/flm/emulator.xml ../../tools/sbs/lib/flm/emulator.xml |
|
3296 +../lib/flm/win32kext.flm ../../tools/sbs/lib/flm/win32kext.flm |
|
3297 +../lib/flm/test/exeabiv2_2/test.cpp ../../tools/sbs/lib/flm/test/exeabiv2_2/test.cpp |
|
3298 +../lib/flm/test/exeabiv2_2/test_function.cpp ../../tools/sbs/lib/flm/test/exeabiv2_2/test_function.cpp |
|
3299 +../lib/flm/test/exeabiv2_2/exeabiv2_2.mk ../../tools/sbs/lib/flm/test/exeabiv2_2/exeabiv2_2.mk |
|
3300 +../lib/flm/test/templateext/temex.mk ../../tools/sbs/lib/flm/test/templateext/temex.mk |
|
3301 +../lib/flm/test/templateext/Makefile ../../tools/sbs/lib/flm/test/templateext/Makefile |
|
3302 +../lib/flm/test/Makefile ../../tools/sbs/lib/flm/test/Makefile |
|
3303 +../lib/flm/test/exeabiv2_4/test.cpp ../../tools/sbs/lib/flm/test/exeabiv2_4/test.cpp |
|
3304 +../lib/flm/test/exeabiv2_4/exeabiv2_4.mk ../../tools/sbs/lib/flm/test/exeabiv2_4/exeabiv2_4.mk |
|
3305 +../lib/flm/test/exeabiv2_4/test_big.cpp ../../tools/sbs/lib/flm/test/exeabiv2_4/test_big.cpp |
|
3306 +../lib/flm/test/flmtests.mk ../../tools/sbs/lib/flm/test/flmtests.mk |
|
3307 +../lib/flm/test/ciaabiv2_1/uc_exe.cia ../../tools/sbs/lib/flm/test/ciaabiv2_1/uc_exe.cia |
|
3308 +../lib/flm/test/ciaabiv2_1/uc_exe.cpp ../../tools/sbs/lib/flm/test/ciaabiv2_1/uc_exe.cpp |
|
3309 +../lib/flm/test/ciaabiv2_1/ciaabiv2_1.mk ../../tools/sbs/lib/flm/test/ciaabiv2_1/ciaabiv2_1.mk |
|
3310 +../lib/flm/test/export1/Makefile ../../tools/sbs/lib/flm/test/export1/Makefile |
|
3311 +../lib/flm/test/export1/t1e.h ../../tools/sbs/lib/flm/test/export1/t1e.h |
|
3312 +../lib/flm/test/export1/t4e.h ../../tools/sbs/lib/flm/test/export1/t4e.h |
|
3313 +../lib/flm/test/export1/t2e.h ../../tools/sbs/lib/flm/test/export1/t2e.h |
|
3314 +../lib/flm/test/export1/t3e.h ../../tools/sbs/lib/flm/test/export1/t3e.h |
|
3315 +../lib/flm/test/dllabiv2_1/test.cpp ../../tools/sbs/lib/flm/test/dllabiv2_1/test.cpp |
|
3316 +../lib/flm/test/dllabiv2_1/dllabiv2_1.mk ../../tools/sbs/lib/flm/test/dllabiv2_1/dllabiv2_1.mk |
|
3317 +../lib/flm/test/raptorglue/raptorglue.mk ../../tools/sbs/lib/flm/test/raptorglue/raptorglue.mk |
|
3318 +../lib/flm/test/dllbasictests.mk ../../tools/sbs/lib/flm/test/dllbasictests.mk |
|
3319 +../lib/flm/test/exeabiv2_1/test.cpp ../../tools/sbs/lib/flm/test/exeabiv2_1/test.cpp |
|
3320 +../lib/flm/test/exeabiv2_1/exeabiv2_1.mk ../../tools/sbs/lib/flm/test/exeabiv2_1/exeabiv2_1.mk |
|
3321 +../lib/flm/test/dllabiv2_defaults.mk ../../tools/sbs/lib/flm/test/dllabiv2_defaults.mk |
|
3322 +../lib/flm/test/exeperftests.mk ../../tools/sbs/lib/flm/test/exeperftests.mk |
|
3323 +../lib/flm/test/ciatests.mk ../../tools/sbs/lib/flm/test/ciatests.mk |
|
3324 +../lib/flm/test/environment/pvm/pvmtest.mk ../../tools/sbs/lib/flm/test/environment/pvm/pvmtest.mk |
|
3325 +../lib/flm/test/environment/make/test_variable_restore.mk ../../tools/sbs/lib/flm/test/environment/make/test_variable_restore.mk |
|
3326 +../lib/flm/test/exebasictests.mk ../../tools/sbs/lib/flm/test/exebasictests.mk |
|
3327 +../lib/flm/test/exeabiv2_defaults.mk ../../tools/sbs/lib/flm/test/exeabiv2_defaults.mk |
|
3328 +../lib/flm/test/exeabiv2_3/exeabiv2_3.mk ../../tools/sbs/lib/flm/test/exeabiv2_3/exeabiv2_3.mk |
|
3329 +../lib/flm/test/exeabiv2_3/test_big.cpp ../../tools/sbs/lib/flm/test/exeabiv2_3/test_big.cpp |
|
3330 +../lib/flm/win32stdlib.flm ../../tools/sbs/lib/flm/win32stdlib.flm |
|
3331 +../lib/flm/win32var2.flm ../../tools/sbs/lib/flm/win32var2.flm |
|
3332 +../lib/flm/win32implib.flm ../../tools/sbs/lib/flm/win32implib.flm |
|
3333 +../lib/flm/bitmap.flm ../../tools/sbs/lib/flm/bitmap.flm |
|
3334 +../lib/flm/build.flm ../../tools/sbs/lib/flm/build.flm |
|
3335 +../lib/flm/build.xml ../../tools/sbs/lib/flm/build.xml |
|
3336 +../lib/flm/tools2exe.flm ../../tools/sbs/lib/flm/tools2exe.flm |
|
3337 +../lib/flm/e32abiv2klib.flm ../../tools/sbs/lib/flm/e32abiv2klib.flm |
|
3338 +../lib/flm/standard.xml ../../tools/sbs/lib/flm/standard.xml |
|
3339 +../lib/flm/win32var.flm ../../tools/sbs/lib/flm/win32var.flm |
|
3340 +../lib/flm/e32abiv2pdd.flm ../../tools/sbs/lib/flm/e32abiv2pdd.flm |
|
3341 +../lib/flm/e32abiv2none.flm ../../tools/sbs/lib/flm/e32abiv2none.flm |
|
3342 +../lib/flm/romfile.mk ../../tools/sbs/lib/flm/romfile.mk |
|
3343 +../lib/flm/win32textnotifier2.flm ../../tools/sbs/lib/flm/win32textnotifier2.flm |
|
3344 +../lib/flm/resource.flm ../../tools/sbs/lib/flm/resource.flm |
|
3345 +../lib/flm/flmtools.mk ../../tools/sbs/lib/flm/flmtools.mk |
|
3346 +../lib/flm/gnumakefile.flm ../../tools/sbs/lib/flm/gnumakefile.flm |
|
3347 +../lib/flm/e32abiv2kdll.flm ../../tools/sbs/lib/flm/e32abiv2kdll.flm |
|
3348 +../lib/flm/e32abiv2var.flm ../../tools/sbs/lib/flm/e32abiv2var.flm |
|
3349 +../lib/flm/win32dll.flm ../../tools/sbs/lib/flm/win32dll.flm |
|
3350 +../lib/flm/gccxml.flm ../../tools/sbs/lib/flm/gccxml.flm |
|
3351 +../lib/flm/e32postlink.mk ../../tools/sbs/lib/flm/e32postlink.mk |
|
3352 +../lib/config/default.xml ../../tools/sbs/lib/config/default.xml |
|
3353 +../lib/config/build.xml ../../tools/sbs/lib/config/build.xml |
|
3354 +../lib/config/interfaces.xml ../../tools/sbs/lib/config/interfaces.xml |
|
3355 +../lib/config/gcc.xml ../../tools/sbs/lib/config/gcc.xml |
|
3356 +../lib/config/variants.xml ../../tools/sbs/lib/config/variants.xml |
|
3357 +../lib/config/coverity.xml ../../tools/sbs/lib/config/coverity.xml |
|
3358 +../lib/config/meta.xml ../../tools/sbs/lib/config/meta.xml |
|
3359 +../lib/config/locations.xml ../../tools/sbs/lib/config/locations.xml |
|
3360 +../lib/config/gccxml.xml ../../tools/sbs/lib/config/gccxml.xml |
|
3361 +../lib/config/carbide.xml ../../tools/sbs/lib/config/carbide.xml |
|
3362 +../lib/config/msvc.xml ../../tools/sbs/lib/config/msvc.xml |
|
3363 +../lib/config/make.xml ../../tools/sbs/lib/config/make.xml |
|
3364 +../lib/config/root.xml ../../tools/sbs/lib/config/root.xml |
|
3365 +../lib/config/winscw.xml ../../tools/sbs/lib/config/winscw.xml |
|
3366 +../lib/config/arm.xml ../../tools/sbs/lib/config/arm.xml |
|
3367 +../lib/config/gcce.xml ../../tools/sbs/lib/config/gcce.xml |
|
3368 +../lib/config/rvct.xml ../../tools/sbs/lib/config/rvct.xml |
|
3369 +../python/raptor_makefile.py ../../tools/sbs/python/raptor_makefile.py |
|
3370 +../python/filter_interface.py ../../tools/sbs/python/filter_interface.py |
|
3371 +../python/raptor_start.py ../../tools/sbs/python/raptor_start.py |
|
3372 +../python/pyparsing.py ../../tools/sbs/python/pyparsing.py |
|
3373 +../python/raptor_cli.py ../../tools/sbs/python/raptor_cli.py |
|
3374 +../python/raptor_cache.py ../../tools/sbs/python/raptor_cache.py |
|
3375 +../python/raptor_meta.py ../../tools/sbs/python/raptor_meta.py |
|
3376 +../python/raptor_xml.py ../../tools/sbs/python/raptor_xml.py |
|
3377 +../python/raptor_version.py ../../tools/sbs/python/raptor_version.py |
|
3378 +../python/generic_path.py ../../tools/sbs/python/generic_path.py |
|
3379 +../python/raptor_make.py ../../tools/sbs/python/raptor_make.py |
|
3380 +../python/plugins/filter_logfile.py ../../tools/sbs/python/plugins/filter_logfile.py |
|
3381 +../python/plugins/filter_terminal.py ../../tools/sbs/python/plugins/filter_terminal.py |
|
3382 +../python/plugins/filter_carbide.py ../../tools/sbs/python/plugins/filter_carbide.py |
|
3383 +../python/plugins/filter_what.py ../../tools/sbs/python/plugins/filter_what.py |
|
3384 +../python/plugins/dummyplugin.py ../../tools/sbs/python/plugins/dummyplugin.py |
|
3385 +../python/plugins/filter_clean.py ../../tools/sbs/python/plugins/filter_clean.py |
|
3386 +../python/plugins/filter_squashlog.py ../../tools/sbs/python/plugins/filter_squashlog.py |
|
3387 +../python/plugins/filter_checksource.py ../../tools/sbs/python/plugins/filter_checksource.py |
|
3388 +../python/plugins/filter_splitlog.py ../../tools/sbs/python/plugins/filter_splitlog.py |
|
3389 +../python/sbs_dist.py ../../tools/sbs/python/sbs_dist.py |
|
3390 +../python/raptor_utilities.py ../../tools/sbs/python/raptor_utilities.py |
|
3391 +../python/pluginbox.py ../../tools/sbs/python/pluginbox.py |
|
3392 +../python/dos2unix.py ../../tools/sbs/python/dos2unix.py |
|
3393 +../python/raptor_data.py ../../tools/sbs/python/raptor_data.py |
|
3394 +../python/filter_list.py ../../tools/sbs/python/filter_list.py |
|
3395 +../python/raptor.py ../../tools/sbs/python/raptor.py |
|
3396 +../python/mmpparser.py ../../tools/sbs/python/mmpparser.py |
|
3397 +../python/filter_utils.py ../../tools/sbs/python/filter_utils.py |
|
3398 +../schema/build/2_0.xsd ../../tools/sbs/schema/build/2_0.xsd |
|
3399 +../schema/build/log/1_0.xsd ../../tools/sbs/schema/build/log/1_0.xsd |
|
3400 +../schema/build/1_0.xsd ../../tools/sbs/schema/build/1_0.xsd |
|
3401 +../win32/bin/ransleep.exe ../../tools/sbs/win32/bin/ransleep.exe |
|
3402 +../win32/bin/sbs_descramble.exe ../../tools/sbs/win32/bin/sbs_descramble.exe |
|
3403 +../win32/bin/talonctl.exe ../../tools/sbs/win32/bin/talonctl.exe |
|
3404 +../win32/bin/talon.exe ../../tools/sbs/win32/bin/talon.exe |
|
3405 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/build/sbsv2/raptor/lib/config/gcc.xml |
|
3406 --- /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 |
|
3407 +++ /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/lib/config/gcc.xml 2010-05-08 13:35:13.030060000 +0100 |
|
3408 @@ -26,7 +26,7 @@ |
|
3409 <!-- used by FLM code --> |
|
3410 <set name='COMPILER' value='$(GCC) -c' type='tool' versionCommand='$(GCC) -v' versionResult='gcc version (3.[456])|(4.[0-9])'/> |
|
3411 |
|
3412 - <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'/> |
|
3413 + <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'/> |
|
3414 |
|
3415 <!-- msys based programs sometimes don't search the path properly. |
|
3416 COMPILER_PATH can be set to tell gcc where to find |
|
3417 @@ -45,7 +45,7 @@ |
|
3418 <set name='CDEFS.WIN32' value='$(CDEFS.DEFAULT) _WIN32 WIN32 _WINDOWS __TOOLS2_WINDOWS__'/> |
|
3419 <set name='CDEFS.LINUX' value='$(CDEFS.DEFAULT) __LINUX__ __TOOLS2_LINUX__'/> |
|
3420 |
|
3421 - <set name='INC.COMPILER' value='$(EPOCINCLUDE)/gcc_mingw/gcc_mingw_3_4_2.h'/> |
|
3422 + <set name='INC.COMPILER' value='$(EPOCINCLUDE)/gcc/gcc.h'/> |
|
3423 |
|
3424 <set name='OPT.D' value='-D'/> |
|
3425 <set name='OPT.L' value='-L'/> |
|
3426 @@ -55,12 +55,11 @@ |
|
3427 <set name='OPT.SYSTEMINCLUDE' value='-isystem '/> |
|
3428 <set name='OPT.USERINCLUDE' value='-I '/> |
|
3429 |
|
3430 - <!-- always use stlport headers --> |
|
3431 - <set name='SYSTEMINCLUDE' value='$(EPOCINCLUDE)/tools/stlport'/> |
|
3432 + <set name='SYSTEMINCLUDE' value=''/> |
|
3433 |
|
3434 <set name='LINKER' value='$(GCC)'/> |
|
3435 <set name='LFLAGS' value=''/> |
|
3436 - <set name='STATICLIBRARY' value='stlport.5.1'/> |
|
3437 + <set name='STATICLIBRARY' value=''/> |
|
3438 <set name='LIBS' value=''/> |
|
3439 <set name='LIBS.WIN32' value='$(LIBS)'/> |
|
3440 <set name='LIBS.LINUX' value='$(LIBS) pthread'/> |
|
3441 Only in /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/sbsv2/raptor/python: raptor_version.py.bak |
|
3442 Only in /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util: build |