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