1 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/checklib/library/library.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/checklib/library/library.cpp |
|
2 27a28 |
|
3 > #include <cstring> |
|
4 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/checklib/main.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/checklib/main.cpp |
|
5 24a25 |
|
6 > #include <cstring> |
|
7 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/checklib/object/coff_object.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/checklib/object/coff_object.cpp |
|
8 23a24 |
|
9 > #include <cstring> |
|
10 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/checklib/object/elf_object.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/checklib/object/elf_object.cpp |
|
11 24a25 |
|
12 > #include <cstring> |
|
13 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/localise.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/rcomp/src/localise.cpp |
|
14 30c30 |
|
15 < #include <stdio.h> |
|
16 --- |
|
17 > #include <cstdio> |
|
18 32a33,34 |
|
19 > #include <cstring> |
|
20 > #include <cstdlib> |
|
21 1789a1792,1797 |
|
22 > #ifdef __LINUX__ |
|
23 > char LocalisationOutputFileName[sizeof("/tmp/rcomp_temp_XXXXXX")]; |
|
24 > strcpy(LocalisationOutputFileName,"/tmp/rcomp_temp_XXXXXX"); |
|
25 > int fd = mkstemp(LocalisationOutputFileName); close(fd); |
|
26 > #endif |
|
27 > #ifdef WIN32 |
|
28 1791a1800,1801 |
|
29 > #endif |
|
30 > |
|
31 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/rcomp.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/rcomp/src/rcomp.cpp |
|
32 93,94c93,94 |
|
33 < #include "resource.h" |
|
34 < #include "parser.h" |
|
35 --- |
|
36 > #include "RESOURCE.H" |
|
37 > #include "Parser.h" |
|
38 103,110c103,110 |
|
39 < #include "datatype.h" |
|
40 < #include "mem.h" |
|
41 < #include "rcbinstr.h" |
|
42 < #include "rcscan.h" |
|
43 < #include "errorhan.h" |
|
44 < #include "fileacc.h" |
|
45 < #include "version.h" |
|
46 < #include "ctable.h" |
|
47 --- |
|
48 > #include "DATATYPE.H" |
|
49 > #include "MEM.H" |
|
50 > #include "RCBINSTR.H" |
|
51 > #include "RCSCAN.H" |
|
52 > #include "ERRORHAN.H" |
|
53 > #include "FILEACC.H" |
|
54 > #include "VERSION.H" |
|
55 > #include "CTABLE.H" |
|
56 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/rcompl.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/rcomp/src/rcompl.cpp |
|
57 665,666c665,666 |
|
58 < #include "structst.h" |
|
59 < #include "parser.h" |
|
60 --- |
|
61 > #include "STRUCTST.H" |
|
62 > #include "Parser.h" |
|
63 699c699 |
|
64 < #include "fileline.h" |
|
65 --- |
|
66 > #include "FILELINE.H" |
|
67 737c737 |
|
68 < #include "errorhan.h" |
|
69 --- |
|
70 > #include "ERRORHAN.H" |
|
71 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/RCOMP.LEX /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/rcomp/src/RCOMP.LEX |
|
72 23,25c23,25 |
|
73 < #include "structst.h" |
|
74 < #include "parser.h" |
|
75 < #include "localise.h" |
|
76 --- |
|
77 > #include "STRUCTST.H" |
|
78 > #include "PARSER.H" |
|
79 > #include "LOCALISE.H" |
|
80 95c95 |
|
81 < #include "errorhan.h" |
|
82 --- |
|
83 > #include "ERRORHAN.H" |
|
84 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/bintools/rcomp/src/RCOMP.YACC /home/imk/symbian/epocroot-pdk-3.0.h/build/bintools/rcomp/src/RCOMP.YACC |
|
85 38,39c38,39 |
|
86 < #include "resource.h" |
|
87 < #include "parser.h" |
|
88 --- |
|
89 > #include "RESOURCE.H" |
|
90 > #include "PARSER.H" |
|
91 48,55c48,55 |
|
92 < #include "datatype.h" |
|
93 < #include "mem.h" |
|
94 < #include "rcbinstr.h" |
|
95 < #include "rcscan.h" |
|
96 < #include "errorhan.h" |
|
97 < #include "fileacc.h" |
|
98 < #include "version.h" |
|
99 < #include "ctable.h" |
|
100 --- |
|
101 > #include "DATATYPE.H" |
|
102 > #include "MEM.H" |
|
103 > #include "RCBINSTR.H" |
|
104 > #include "RSCAN.H" |
|
105 > #include "ERRORHAN.H" |
|
106 > #include "FILEACC.H" |
|
107 > #include "VERSION.H" |
|
108 > #include "CTABLE.H" |
|
109 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/buildtoolguides/romtoolsguide/group/bld.inf /home/imk/symbian/epocroot-pdk-3.0.h/build/buildtoolguides/romtoolsguide/group/bld.inf |
|
110 3c3 |
|
111 < ../com.nokia.rombuild_0.1.jar /plugins/com.nokia.rombuild_0.1.jar |
|
112 \ No newline at end of file |
|
113 --- |
|
114 > ../com.nokia.rombuild_0.1.jar ../../plugins/com.nokia.rombuild_0.1.jar |
|
115 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/buildtoolguides/sbsv2guide/group/bld.inf /home/imk/symbian/epocroot-pdk-3.0.h/build/buildtoolguides/sbsv2guide/group/bld.inf |
|
116 3c3 |
|
117 < ../com.nokia.sysbuild_0.1.jar /plugins/com.nokia.sysbuild_0.1.jar |
|
118 \ No newline at end of file |
|
119 --- |
|
120 > ../com.nokia.sysbuild_0.1.jar ../../plugins/com.nokia.sysbuild_0.1.jar |
|
121 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/e32lib/e32image/deflate/deflate.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/e32lib/e32image/deflate/deflate.cpp |
|
122 90c90 |
|
123 < return new(HMem::Alloc(0,_FOFF(HDeflateHash,iOffset[Min(aLinks,KDeflateMaxDistance)]))) HDeflateHash; |
|
124 --- |
|
125 > return new(HMem::Alloc(0,_FOFF(HDeflateHash,iOffset[0]) + (sizeof(TOffset) * Min(aLinks,KDeflateMaxDistance)))) HDeflateHash; |
|
126 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/e32lib/group/seclib.mmp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/e32lib/group/seclib.mmp |
|
127 47a48 |
|
128 > systeminclude /epoc32/include/platform |
|
129 49a51,52 |
|
130 > option GCC -w |
|
131 > |
|
132 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/group/elf2e32.mmp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/group/elf2e32.mmp |
|
133 30a31 |
|
134 > systeminclude /epoc32/include/platform |
|
135 31a33 |
|
136 > userinclude ../../../bintools/elftools/inc |
|
137 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/deffile.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/deffile.cpp |
|
138 21c21,22 |
|
139 < #include <stdio.h> |
|
140 --- |
|
141 > #include <cstdio> |
|
142 > #include <cstring> |
|
143 23c24,25 |
|
144 < #include <stdlib.h> |
|
145 --- |
|
146 > #include <cstdlib> |
|
147 > |
|
148 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/deflatecompress.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/deflatecompress.cpp |
|
149 129c129,130 |
|
150 < return new(new char[_FOFF(HDeflateHash,iOffset[Min(aLinks,KDeflateMaxDistance)])]) HDeflateHash; |
|
151 --- |
|
152 > return new(new char[_FOFF(HDeflateHash,iOffset[0]) + |
|
153 > (sizeof(TOffset) * Min(aLinks,KDeflateMaxDistance))]) HDeflateHash; |
|
154 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/e32exporttable.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/e32exporttable.cpp |
|
155 20a21 |
|
156 > #include <cstring> |
|
157 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/e32imagefile.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/e32imagefile.cpp |
|
158 23a24 |
|
159 > #include <cstdio> |
|
160 43,44d43 |
|
161 < #else |
|
162 < #include <time.h> |
|
163 46,47c45,46 |
|
164 < #include <time.h> |
|
165 < #include <stdio.h> |
|
166 --- |
|
167 > #include <ctime> |
|
168 > |
|
169 368c367 |
|
170 < memcpy(iImportSection, aImportSection.begin(), aImportSectionSize); |
|
171 --- |
|
172 > memcpy(iImportSection, &*aImportSection.begin(), aImportSectionSize); |
|
173 1925c1924 |
|
174 < memcpy(aInfo+aPos, iSymAddrTab.begin(), iSymAddrTab.size()*sizeof(uint32)); |
|
175 --- |
|
176 > memcpy(aInfo+aPos, &*iSymAddrTab.begin(), iSymAddrTab.size()*sizeof(uint32)); |
|
177 1936c1935 |
|
178 < memcpy( ((void*)(aInfo+aPos)), ((void*)Iter), aOffLen); |
|
179 --- |
|
180 > memcpy( ((void*)(aInfo+aPos)), &*Iter, aOffLen); |
|
181 1942c1941 |
|
182 < memcpy(aInfo+aPos, iSymbolNames.begin(), iSymbolNames.size()); |
|
183 --- |
|
184 > memcpy(aInfo+aPos, &*iSymbolNames.begin(), iSymbolNames.size()); |
|
185 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/elffilesupplied.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/elffilesupplied.cpp |
|
186 28c28,36 |
|
187 < #include<hash_set> |
|
188 --- |
|
189 > #if __GNUC__ < 4 |
|
190 > #include <ext/hash_set> |
|
191 > #define SET_TYPE __gnu_cxx::hash_set |
|
192 > #define HASH_FUN __gnu_cxx::hash |
|
193 > #else |
|
194 > #include <unordered_set> |
|
195 > #define SET_TYPE std::unordered_set |
|
196 > #define HASH_FUN std::hash |
|
197 > #endif |
|
198 641c649 |
|
199 < static hash_set<const char*, hash<const char*>, eqstr> aSymbolSet; |
|
200 --- |
|
201 > static SET_TYPE<const char*, HASH_FUN<const char*>, eqstr> aSymbolSet; |
|
202 652c660 |
|
203 < hash_set<const char*, hash<const char*>, eqstr>::const_iterator it |
|
204 --- |
|
205 > SET_TYPE<const char*, HASH_FUN<const char*>, eqstr>::const_iterator it |
|
206 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/errorhandler.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/errorhandler.cpp |
|
207 29c29,31 |
|
208 < #include <stdio.h> |
|
209 --- |
|
210 > #include <cstdio> |
|
211 > #include <cstring> |
|
212 > |
|
213 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/huffman.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/huffman.cpp |
|
214 24a25 |
|
215 > #include <cstring> |
|
216 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/h_utl.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/h_utl.cpp |
|
217 20,21c20,22 |
|
218 < #include <stdlib.h> |
|
219 < #include <stdio.h> |
|
220 --- |
|
221 > #include <cstdlib> |
|
222 > #include <cstdio> |
|
223 > #include <cstring> |
|
224 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/inflate.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/inflate.cpp |
|
225 25a26,27 |
|
226 > #include <cstring> |
|
227 > |
|
228 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/messageimplementation.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/messageimplementation.cpp |
|
229 26c26,27 |
|
230 < #include <stdio.h> |
|
231 --- |
|
232 > #include <cstring> |
|
233 > |
|
234 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/parametermanager.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/parametermanager.cpp |
|
235 2250c2250 |
|
236 < memcpy(symbol, p, len); |
|
237 --- |
|
238 > memcpy(symbol, &*p, len); |
|
239 2390c2390 |
|
240 < ParseCapability1(b, e, aCapabilities, invert); |
|
241 --- |
|
242 > ParseCapability1(&*b, &*e, aCapabilities, invert); |
|
243 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_elfexecutable.h /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/pl_elfexecutable.h |
|
244 25c25,31 |
|
245 < #include <hash_map> |
|
246 --- |
|
247 > #if __GNUC__ < 4 |
|
248 > #include <ext/hash_map> |
|
249 > #define MAP_TYPE __gnu_cxx::hash_map |
|
250 > #else |
|
251 > #include <unordered_map> |
|
252 > #define MAP_TYPE std::unordered_map |
|
253 > #endif |
|
254 31c37 |
|
255 < using std::hash_map; |
|
256 --- |
|
257 > using MAP_TYPE; |
|
258 125c131 |
|
259 < hash_map<PLUINT32, DllSymbol*> iSymbolTable; //The representation |
|
260 --- |
|
261 > MAP_TYPE<PLUINT32, DllSymbol*> iSymbolTable; //The representation |
|
262 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_elfexports.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/pl_elfexports.cpp |
|
263 22a23 |
|
264 > #include <cstring> |
|
265 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_elfimports.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/pl_elfimports.cpp |
|
266 21a22 |
|
267 > #include <cstring> |
|
268 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_elfproducer.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/pl_elfproducer.cpp |
|
269 24a25 |
|
270 > #include <cstring> |
|
271 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/e32tools/elf2e32/source/pl_symbol.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/e32tools/elf2e32/source/pl_symbol.cpp |
|
272 20a21 |
|
273 > #include <cstring> |
|
274 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/group/bld.inf /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/group/bld.inf |
|
275 23a24 |
|
276 > #ifndef TOOLS2_LINUX |
|
277 25a27 |
|
278 > #endif |
|
279 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/group/imgcheck.mmp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/group/imgcheck.mmp |
|
280 27a28 |
|
281 > #ifndef TOOLS2_LINUX |
|
282 28a30 |
|
283 > #endif |
|
284 30a33 |
|
285 > #ifndef TOOLS2_LINUX |
|
286 31a35 |
|
287 > #endif |
|
288 35d38 |
|
289 < STATICLIBRARY imgutils xml2 wsock32 stlport.5.1 patchdataprocessor |
|
290 37,38c40,45 |
|
291 < STATICLIBRARY boost_thread-mgw34-mt-1_39_linux |
|
292 < OPTION GCC -pthread -O2 -Wno-uninitialized |
|
293 --- |
|
294 > STATICLIBRARY imgutils patchdataprocessor |
|
295 > #else |
|
296 > STATICLIBRARY imgutils xml2 wsock32 patchdataprocessor |
|
297 > #endif |
|
298 > #ifdef TOOLS2_LINUX |
|
299 > OPTION GCC -pthread -O2 -Wno-uninitialized -isystem /usr/include/libxml2 -lxml2 -lboost_thread-mt |
|
300 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/cmdlinehandler.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/inc/cmdlinehandler.h |
|
301 123c123 |
|
302 < typedef enum Suppress |
|
303 --- |
|
304 > enum Suppress |
|
305 139c139 |
|
306 < typedef enum NumberOfValue |
|
307 --- |
|
308 > enum NumberOfValue |
|
309 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/common.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/inc/common.h |
|
310 89c89 |
|
311 < typedef enum ReturnType |
|
312 --- |
|
313 > enum ReturnType |
|
314 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/exceptionimplementation.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/inc/exceptionimplementation.h |
|
315 94c94 |
|
316 < char* iMessage; |
|
317 --- |
|
318 > char const * iMessage; |
|
319 113c113 |
|
320 < ofstream iLogStream; |
|
321 --- |
|
322 > Ofstream iLogStream; |
|
323 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/inc/xmlwriter.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/inc/xmlwriter.h |
|
324 27c27,32 |
|
325 < #include "libxml/xmlwriter.h" |
|
326 --- |
|
327 > #if defined(__LINUX__) |
|
328 > #include <libxml/xmlwriter.h> |
|
329 > #endif |
|
330 > #if defined(WIN32) |
|
331 > #include "libxml/xmlwriter.h" |
|
332 > #endif |
|
333 110c115 |
|
334 < ofstream iXmlFile; |
|
335 --- |
|
336 > Ofstream iXmlFile; |
|
337 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/libimgutils/inc/typedefs.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/libimgutils/inc/typedefs.h |
|
338 31,32c31,32 |
|
339 < #include <fstream.h> |
|
340 < #include <iostream.h> |
|
341 --- |
|
342 > #include <fstream> |
|
343 > #include <iostream> |
|
344 56c56 |
|
345 < typedef ios Ios; |
|
346 --- |
|
347 > typedef std::ios Ios; |
|
348 58,59c58,59 |
|
349 < typedef ofstream Ofstream; |
|
350 < typedef ifstream Ifstream; |
|
351 --- |
|
352 > typedef std::ofstream Ofstream; |
|
353 > typedef std::ifstream Ifstream; |
|
354 98c98 |
|
355 < typedef enum EImageType |
|
356 --- |
|
357 > enum EImageType |
|
358 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/libimgutils/src/dirreader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/libimgutils/src/dirreader.cpp |
|
359 122c122 |
|
360 < getcwd(cwd,MAXPATHLEN); |
|
361 --- |
|
362 > char *cp = getcwd(cwd,MAXPATHLEN); (void)cp; |
|
363 124c124 |
|
364 < chdir(cwd); |
|
365 --- |
|
366 > int i = chdir(cwd); (void)i; |
|
367 141a142 |
|
368 > #ifndef __LINUX__ |
|
369 143a145,146 |
|
370 > #endif |
|
371 > |
|
372 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/libimgutils/src/romreader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/libimgutils/src/romreader.cpp |
|
373 56c56 |
|
374 < iRomImageRootDirEntry = new RomImageDirEntry(""); |
|
375 --- |
|
376 > iRomImageRootDirEntry = new RomImageDirEntry(const_cast<char *>("")); |
|
377 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/cmdlinehandler.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/src/cmdlinehandler.cpp |
|
378 27a28 |
|
379 > #include <cstring> |
|
380 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/cmdlinewriter.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/src/cmdlinewriter.cpp |
|
381 26a27 |
|
382 > #include <cstring> |
|
383 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/exceptionimplementation.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/src/exceptionimplementation.cpp |
|
384 190c190 |
|
385 < cout << aMsg.c_str() << endl; |
|
386 --- |
|
387 > std::cout << aMsg.c_str() << std::endl; |
|
388 210c210 |
|
389 < cout << aMsg.c_str() << endl; |
|
390 --- |
|
391 > std::cout << aMsg.c_str() << std::endl; |
|
392 214c214 |
|
393 < cerr << aMsg.c_str() << endl; |
|
394 --- |
|
395 > std::cerr << aMsg.c_str() << std::endl; |
|
396 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/sidchecker.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/src/sidchecker.cpp |
|
397 252,253c252,253 |
|
398 < if((iAllExecutables |
|
399 < || (exeAtt->iAttStatus == KDuplicate)) && !exeAtt->iAttStatus.empty() |
|
400 --- |
|
401 > if(((iAllExecutables |
|
402 > || (exeAtt->iAttStatus == KDuplicate)) && !exeAtt->iAttStatus.empty()) |
|
403 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imgcheck/src/xmlwriter.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imgcheck/src/xmlwriter.cpp |
|
404 26a27 |
|
405 > #include <cstring> |
|
406 29c30 |
|
407 < #include "/epoc32/gcc_mingw/include/windows.h" |
|
408 --- |
|
409 > #include <windows.h> |
|
410 102c103 |
|
411 < ifstream xslSourceHandle; |
|
412 --- |
|
413 > Ifstream xslSourceHandle; |
|
414 119c120 |
|
415 < ofstream xslDestHandle(xslDestPath.c_str(), Ios::binary | Ios::out); |
|
416 --- |
|
417 > Ofstream xslDestHandle(xslDestPath.c_str(), Ios::binary | Ios::out); |
|
418 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/boostlibrary/boost/thread/pthread/thread_data.hpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/boostlibrary/boost/thread/pthread/thread_data.hpp |
|
419 11c11 |
|
420 < #include <boost/enable_shared_from_this.hpp> |
|
421 --- |
|
422 > #include <boost/smart_ptr/enable_shared_from_this.hpp> |
|
423 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/e32image/deflate/deflate.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/e32image/deflate/deflate.cpp |
|
424 22a23 |
|
425 > #define OFFSETOF(c,f) (((TInt)&(((c *)0x1000)->f))-0x1000) |
|
426 92c93,94 |
|
427 < return new(HMem::Alloc(0,_FOFF(HDeflateHash,iOffset[Min(aLinks,KDeflateMaxDistance)]))) HDeflateHash; |
|
428 --- |
|
429 > return new(new char[OFFSETOF(HDeflateHash,iOffset[0]) + |
|
430 > (sizeof(TOffset) * Min(aLinks,KDeflateMaxDistance))]) HDeflateHash; |
|
431 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/e32image/deflate/panic.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/e32image/deflate/panic.cpp |
|
432 24c24 |
|
433 < char* HuffmanError[]= { |
|
434 --- |
|
435 > char const * HuffmanError[]= { |
|
436 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/e32uid/uidcrc.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/e32uid/uidcrc.cpp |
|
437 58c58 |
|
438 < char* endptr = "failed"; |
|
439 --- |
|
440 > char * endptr; |
|
441 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/cluster.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/cluster.cpp |
|
442 146c146,148 |
|
443 < throw ErrorHandler(IMAGESIZETOOBIG,"Occupied number of clusters count exceeded than available clusters",__FILE__,__LINE__); |
|
444 --- |
|
445 > throw ErrorHandler(IMAGESIZETOOBIG, |
|
446 > const_cast<char *>("Occupied number of clusters count exceeded than available clusters"), |
|
447 > const_cast<char *>(__FILE__),__LINE__); |
|
448 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/dirregion.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/dirregion.cpp |
|
449 52c52,54 |
|
450 < throw ErrorHandler(CLUSTERERROR,"Instance creation error", __FILE__, __LINE__); |
|
451 --- |
|
452 > throw ErrorHandler(CLUSTERERROR, |
|
453 > const_cast<char *>("Instance creation error"), |
|
454 > const_cast<char *>( __FILE__), __LINE__); |
|
455 120c122,123 |
|
456 < throw ErrorHandler(FILEWRITEERROR, __FILE__, __LINE__); |
|
457 --- |
|
458 > throw ErrorHandler(FILEWRITEERROR, const_cast<char *>(__FILE__), __LINE__); |
|
459 > |
|
460 178c181 |
|
461 < throw ErrorHandler(EMPTYFILENAME, __FILE__, __LINE__); |
|
462 --- |
|
463 > throw ErrorHandler(EMPTYFILENAME, const_cast<char *>(__FILE__), __LINE__); |
|
464 250c253 |
|
465 < throw ErrorHandler(EMPTYFILENAME, __FILE__, __LINE__); |
|
466 --- |
|
467 > throw ErrorHandler(EMPTYFILENAME, const_cast<char *>(__FILE__), __LINE__); |
|
468 317c320,321 |
|
469 < throw ErrorHandler(FILEOPENERROR,(char*)aEntry->GetFilePath().c_str(),__FILE__,__LINE__); |
|
470 --- |
|
471 > throw ErrorHandler(FILEOPENERROR,const_cast<char *>(aEntry->GetFilePath().c_str()), |
|
472 > const_cast<char *>(__FILE__),__LINE__); |
|
473 327c331,332 |
|
474 < throw ErrorHandler(MEMORYALLOCATIONERROR, __FILE__, __LINE__); |
|
475 --- |
|
476 > throw ErrorHandler(MEMORYALLOCATIONERROR, |
|
477 > const_cast<char *>(__FILE__), __LINE__); |
|
478 335c340,341 |
|
479 < throw ErrorHandler(FILEREADERROR,(char*)aEntry->GetFilePath().c_str(), __FILE__, __LINE__); |
|
480 --- |
|
481 > throw ErrorHandler(FILEREADERROR,const_cast<char *>(aEntry->GetFilePath().c_str()), |
|
482 > const_cast<char *>(__FILE__), __LINE__); |
|
483 547c553 |
|
484 < throw ErrorHandler(NOENTRIESFOUND, __FILE__, __LINE__); |
|
485 --- |
|
486 > throw ErrorHandler(NOENTRIESFOUND, const_cast<char *>(__FILE__), __LINE__); |
|
487 552c558 |
|
488 < throw ErrorHandler(ROOTNOTFOUND, __FILE__, __LINE__); |
|
489 --- |
|
490 > throw ErrorHandler(ROOTNOTFOUND, const_cast<char *>(__FILE__), __LINE__); |
|
491 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/errorhandler.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/errorhandler.cpp |
|
492 24a25 |
|
493 > #include <cstring> |
|
494 26,27c27,28 |
|
495 < char *errMssgPrefix="FileSystem : Error:"; |
|
496 < char *Gspace=" "; |
|
497 --- |
|
498 > char const *errMssgPrefix="FileSystem : Error:"; |
|
499 > char const *Gspace=" "; |
|
500 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fat16bootsector.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/fat16bootsector.cpp |
|
501 23a24 |
|
502 > #include <cstring> |
|
503 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fat16filesystem.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/fat16filesystem.cpp |
|
504 24c24 |
|
505 < |
|
506 --- |
|
507 > #include <cstring> |
|
508 79c79 |
|
509 < memcpy(&iData[pos],JmpBoot,3); |
|
510 --- |
|
511 > memmove(&iData[pos],JmpBoot,3); |
|
512 81c81 |
|
513 < memcpy(&iData[pos],OEMName,8); |
|
514 --- |
|
515 > memmove(&iData[pos],OEMName,8); |
|
516 83c83 |
|
517 < memcpy(&iData[pos],&BytesPerSector,2); |
|
518 --- |
|
519 > memmove(&iData[pos],&BytesPerSector,2); |
|
520 85c85 |
|
521 < memcpy(&iData[pos],&SectorsPerCluster,1); |
|
522 --- |
|
523 > memmove(&iData[pos],&SectorsPerCluster,1); |
|
524 87c87 |
|
525 < memcpy(&iData[pos],&ReservedSectors,2); |
|
526 --- |
|
527 > memmove(&iData[pos],&ReservedSectors,2); |
|
528 89c89 |
|
529 < memcpy(&iData[pos],&NumFats,1); |
|
530 --- |
|
531 > memmove(&iData[pos],&NumFats,1); |
|
532 91c91 |
|
533 < memcpy(&iData[pos],&RootDirEntries,2); |
|
534 --- |
|
535 > memmove(&iData[pos],&RootDirEntries,2); |
|
536 93c93 |
|
537 < memcpy(&iData[pos],&LowSectors,2); |
|
538 --- |
|
539 > memmove(&iData[pos],&LowSectors,2); |
|
540 95c95 |
|
541 < memcpy(&iData[pos],&Media,1); |
|
542 --- |
|
543 > memmove(&iData[pos],&Media,1); |
|
544 97c97 |
|
545 < memcpy(&iData[pos],&FatSectors,2); |
|
546 --- |
|
547 > memmove(&iData[pos],&FatSectors,2); |
|
548 99c99 |
|
549 < memcpy(&iData[pos],&SectorPerTrack,2); |
|
550 --- |
|
551 > memmove(&iData[pos],&SectorPerTrack,2); |
|
552 101c101 |
|
553 < memcpy(&iData[pos],&NumberOfHeads,2); |
|
554 --- |
|
555 > memmove(&iData[pos],&NumberOfHeads,2); |
|
556 103c103 |
|
557 < memcpy(&iData[pos],&HiddenSectors,4); |
|
558 --- |
|
559 > memmove(&iData[pos],&HiddenSectors,4); |
|
560 105c105 |
|
561 < memcpy(&iData[pos],&HighSectorsCount,4); |
|
562 --- |
|
563 > memmove(&iData[pos],&HighSectorsCount,4); |
|
564 107c107 |
|
565 < memcpy(&iData[pos],&BootSectorDriveNumber,1); |
|
566 --- |
|
567 > memmove(&iData[pos],&BootSectorDriveNumber,1); |
|
568 109c109 |
|
569 < memcpy(&iData[pos],&ReservedByte,1); |
|
570 --- |
|
571 > memmove(&iData[pos],&ReservedByte,1); |
|
572 111c111 |
|
573 < memcpy(&iData[pos],&BootSignature,1); |
|
574 --- |
|
575 > memmove(&iData[pos],&BootSignature,1); |
|
576 113c113 |
|
577 < memcpy(&iData[pos],&VolumeId,4); |
|
578 --- |
|
579 > memmove(&iData[pos],&VolumeId,4); |
|
580 115c115 |
|
581 < memcpy(&iData[pos],VolumeLab,11); |
|
582 --- |
|
583 > memmove(&iData[pos],VolumeLab,11); |
|
584 117c117 |
|
585 < memcpy(&iData[pos],FileSysType,8); |
|
586 --- |
|
587 > memmove(&iData[pos],FileSysType,8); |
|
588 136c136 |
|
589 < MessageHandler::ReportMessage (INFORMATION,BOOTSECTORCREATEMSG, "FAT16"); |
|
590 --- |
|
591 > MessageHandler::ReportMessage (INFORMATION,BOOTSECTORCREATEMSG, const_cast<char *>("FAT16")); |
|
592 148c148 |
|
593 < MessageHandler::ReportMessage (INFORMATION,BOOTSECTORWRITEMSG,"FAT16"); |
|
594 --- |
|
595 > MessageHandler::ReportMessage (INFORMATION,BOOTSECTORWRITEMSG,const_cast<char *>("FAT16")); |
|
596 198,199c198,199 |
|
597 < MessageHandler::ReportMessage (INFORMATION,FATTABLEWRITEMSG, |
|
598 < "FAT16"); |
|
599 --- |
|
600 > |
|
601 > MessageHandler::ReportMessage (INFORMATION,FATTABLEWRITEMSG,const_cast<char *>("FAT16")); |
|
602 261c261,263 |
|
603 < throw ErrorHandler(BOOTSECTORERROR,"Low Partition Size",__FILE__,__LINE__); |
|
604 --- |
|
605 > throw ErrorHandler(BOOTSECTORERROR, |
|
606 > const_cast<char *>("Low Partition Size"), |
|
607 > const_cast<char *>(__FILE__),__LINE__); |
|
608 265c267,269 |
|
609 < throw ErrorHandler(BOOTSECTORERROR,"High Partition Size",__FILE__,__LINE__); |
|
610 --- |
|
611 > throw ErrorHandler(BOOTSECTORERROR, |
|
612 > const_cast<char *>("High Partition Size"), |
|
613 > const_cast<char *>(__FILE__),__LINE__); |
|
614 316c320 |
|
615 < throw ErrorHandler(UNKNOWNERROR, __FILE__, __LINE__); |
|
616 --- |
|
617 > throw ErrorHandler(UNKNOWNERROR, const_cast<char *>(__FILE__), __LINE__); |
|
618 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fat32bootsector.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/fat32bootsector.cpp |
|
619 23a24 |
|
620 > #include <cstring> |
|
621 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fat32filesystem.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/fat32filesystem.cpp |
|
622 23a24 |
|
623 > #include <cstring> |
|
624 93c94 |
|
625 < memcpy(&iData[pos],JmpBoot,3); |
|
626 --- |
|
627 > memmove(&iData[pos],JmpBoot,3); |
|
628 95c96 |
|
629 < memcpy(&iData[pos],OEMName,8); |
|
630 --- |
|
631 > memmove(&iData[pos],OEMName,8); |
|
632 97c98 |
|
633 < memcpy(&iData[pos],&BytesPerSector,2); |
|
634 --- |
|
635 > memmove(&iData[pos],&BytesPerSector,2); |
|
636 99c100 |
|
637 < memcpy(&iData[pos],&SectorsPerCluster,1); |
|
638 --- |
|
639 > memmove(&iData[pos],&SectorsPerCluster,1); |
|
640 101c102 |
|
641 < memcpy(&iData[pos],&ReservedSectors,2); |
|
642 --- |
|
643 > memmove(&iData[pos],&ReservedSectors,2); |
|
644 103c104 |
|
645 < memcpy(&iData[pos],&NumFats,1); |
|
646 --- |
|
647 > memmove(&iData[pos],&NumFats,1); |
|
648 105c106 |
|
649 < memcpy(&iData[pos],&RootDirEntries,2); |
|
650 --- |
|
651 > memmove(&iData[pos],&RootDirEntries,2); |
|
652 107c108 |
|
653 < memcpy(&iData[pos],&LowSectors,2); |
|
654 --- |
|
655 > memmove(&iData[pos],&LowSectors,2); |
|
656 109c110 |
|
657 < memcpy(&iData[pos],&Media,1); |
|
658 --- |
|
659 > memmove(&iData[pos],&Media,1); |
|
660 111c112 |
|
661 < memcpy(&iData[pos],&FatSectors,2); |
|
662 --- |
|
663 > memmove(&iData[pos],&FatSectors,2); |
|
664 113c114 |
|
665 < memcpy(&iData[pos],&SectorPerTrack,2); |
|
666 --- |
|
667 > memmove(&iData[pos],&SectorPerTrack,2); |
|
668 115c116 |
|
669 < memcpy(&iData[pos],&NumberOfHeads,2); |
|
670 --- |
|
671 > memmove(&iData[pos],&NumberOfHeads,2); |
|
672 117c118 |
|
673 < memcpy(&iData[pos],&HiddenSectors,4); |
|
674 --- |
|
675 > memmove(&iData[pos],&HiddenSectors,4); |
|
676 119c120 |
|
677 < memcpy(&iData[pos],&HighSectorsCount,4); |
|
678 --- |
|
679 > memmove(&iData[pos],&HighSectorsCount,4); |
|
680 121c122 |
|
681 < memcpy(&iData[pos],&FatSectors32,4); |
|
682 --- |
|
683 > memmove(&iData[pos],&FatSectors32,4); |
|
684 123c124 |
|
685 < memcpy(&iData[pos],&ExtFlags,2); |
|
686 --- |
|
687 > memmove(&iData[pos],&ExtFlags,2); |
|
688 125c126 |
|
689 < memcpy(&iData[pos],&FileSystemVersion,2); |
|
690 --- |
|
691 > memmove(&iData[pos],&FileSystemVersion,2); |
|
692 127c128 |
|
693 < memcpy(&iData[pos],&RootCluster,4); |
|
694 --- |
|
695 > memmove(&iData[pos],&RootCluster,4); |
|
696 129c130 |
|
697 < memcpy(&iData[pos],&FSInfo,2); |
|
698 --- |
|
699 > memmove(&iData[pos],&FSInfo,2); |
|
700 131c132 |
|
701 < memcpy(&iData[pos],&BackUpBootSector,2); |
|
702 --- |
|
703 > memmove(&iData[pos],&BackUpBootSector,2); |
|
704 133c134 |
|
705 < memcpy(&iData[pos],FutureReserved,12); |
|
706 --- |
|
707 > memmove(&iData[pos],FutureReserved,12); |
|
708 135c136 |
|
709 < memcpy(&iData[pos],&BootSectorDriveNumber,1); |
|
710 --- |
|
711 > memmove(&iData[pos],&BootSectorDriveNumber,1); |
|
712 137c138 |
|
713 < memcpy(&iData[pos],&ReservedByte,1); |
|
714 --- |
|
715 > memmove(&iData[pos],&ReservedByte,1); |
|
716 139c140 |
|
717 < memcpy(&iData[pos],&BootSignature,1); |
|
718 --- |
|
719 > memmove(&iData[pos],&BootSignature,1); |
|
720 141c142 |
|
721 < memcpy(&iData[pos],&VolumeId,4); |
|
722 --- |
|
723 > memmove(&iData[pos],&VolumeId,4); |
|
724 143c144 |
|
725 < memcpy(&iData[pos],VolumeLab,11); |
|
726 --- |
|
727 > memmove(&iData[pos],VolumeLab,11); |
|
728 145c146 |
|
729 < memcpy(&iData[pos],FileSystemType,8); |
|
730 --- |
|
731 > memmove(&iData[pos],FileSystemType,8); |
|
732 162c163 |
|
733 < MessageHandler::ReportMessage (INFORMATION,BOOTSECTORCREATEMSG, "FAT32"); |
|
734 --- |
|
735 > MessageHandler::ReportMessage (INFORMATION,BOOTSECTORCREATEMSG, const_cast<char *>("FAT32")); |
|
736 175c176 |
|
737 < MessageHandler::ReportMessage (INFORMATION,BOOTSECTORWRITEMSG, "FAT32"); |
|
738 --- |
|
739 > MessageHandler::ReportMessage (INFORMATION,BOOTSECTORWRITEMSG, const_cast<char *>("FAT32")); |
|
740 231,232c232,234 |
|
741 < MessageHandler::ReportMessage (INFORMATION,FATTABLEWRITEMSG, |
|
742 < "FAT32"); |
|
743 --- |
|
744 > |
|
745 > MessageHandler::ReportMessage (INFORMATION,FATTABLEWRITEMSG,const_cast<char *>("FAT32")); |
|
746 > |
|
747 257c259 |
|
748 < memcpy(&FSinfoData[counter], &iFSInfo.FSI_LeadSign,4); |
|
749 --- |
|
750 > memmove(&FSinfoData[counter], &iFSInfo.FSI_LeadSign,4); |
|
751 259c261 |
|
752 < memcpy(&FSinfoData[counter], &iFSInfo.FSI_Reserved,480); |
|
753 --- |
|
754 > memmove(&FSinfoData[counter], &iFSInfo.FSI_Reserved,480); |
|
755 261c263 |
|
756 < memcpy(&FSinfoData[counter], &iFSInfo.FSI_StrucSig,4); |
|
757 --- |
|
758 > memmove(&FSinfoData[counter], &iFSInfo.FSI_StrucSig,4); |
|
759 263c265 |
|
760 < memcpy(&FSinfoData[counter], &iFSInfo.FSI_Free_Count,4); |
|
761 --- |
|
762 > memmove(&FSinfoData[counter], &iFSInfo.FSI_Free_Count,4); |
|
763 265c267 |
|
764 < memcpy(&FSinfoData[counter], &iFSInfo.FSI_Nxt_Free,4); |
|
765 --- |
|
766 > memmove(&FSinfoData[counter], &iFSInfo.FSI_Nxt_Free,4); |
|
767 267c269 |
|
768 < memcpy(&FSinfoData[counter], &iFSInfo.FSI_Reserved2,12); |
|
769 --- |
|
770 > memmove(&FSinfoData[counter], &iFSInfo.FSI_Reserved2,12); |
|
771 269c271 |
|
772 < memcpy(&FSinfoData[counter], &iFSInfo.FSI_TrailSig,4); |
|
773 --- |
|
774 > memmove(&FSinfoData[counter], &iFSInfo.FSI_TrailSig,4); |
|
775 370c372,374 |
|
776 < throw ErrorHandler(BOOTSECTORERROR,"Low Partition Size",__FILE__, __LINE__); |
|
777 --- |
|
778 > throw ErrorHandler(BOOTSECTORERROR, |
|
779 > const_cast<char *>("Low Partition Size"), |
|
780 > const_cast<char *>(__FILE__), __LINE__); |
|
781 374c378,380 |
|
782 < throw ErrorHandler(BOOTSECTORERROR,"high Partition Size",__FILE__, __LINE__); |
|
783 --- |
|
784 > throw ErrorHandler(BOOTSECTORERROR, |
|
785 > const_cast<char *>("high Partition Size"), |
|
786 > const_cast<char *>(__FILE__), __LINE__); |
|
787 427c433 |
|
788 < throw ErrorHandler(UNKNOWNERROR, __FILE__, __LINE__); |
|
789 --- |
|
790 > throw ErrorHandler(UNKNOWNERROR, const_cast<char *>(__FILE__), __LINE__); |
|
791 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/fatbasebootsector.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/fatbasebootsector.cpp |
|
792 24a25 |
|
793 > #include <cstring> |
|
794 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/filesysteminterface.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/filesysteminterface.cpp |
|
795 65c65,67 |
|
796 < throw ErrorHandler(FILEOPENERROR,aImageFileName,__FILE__, __LINE__); |
|
797 --- |
|
798 > throw ErrorHandler(FILEOPENERROR, |
|
799 > const_cast<char *>(aImageFileName), |
|
800 > const_cast<char *>(__FILE__), __LINE__); |
|
801 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/longname.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/longname.cpp |
|
802 23a24 |
|
803 > #include <cstring> |
|
804 51c52 |
|
805 < throw ErrorHandler(EMPTYFILENAME, __FILE__, __LINE__); |
|
806 --- |
|
807 > throw ErrorHandler(EMPTYFILENAME, const_cast<char *>(__FILE__), __LINE__); |
|
808 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/filesystem/source/messageimplementation.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/filesystem/source/messageimplementation.cpp |
|
809 25a26 |
|
810 > #include <cstring> |
|
811 31,34c32,36 |
|
812 < char *errorMssgPrefix="FileSystem : Error:"; |
|
813 < char *warnMssgPrefix="FileSystem : Warning:"; |
|
814 < char *infoMssgPrefix="FileSystem : Information:"; |
|
815 < char *Space=" "; |
|
816 --- |
|
817 > char const *errorMssgPrefix="FileSystem : Error:"; |
|
818 > char const *warnMssgPrefix="FileSystem : Warning:"; |
|
819 > char const *infoMssgPrefix="FileSystem : Information:"; |
|
820 > char const *Space=" "; |
|
821 > |
|
822 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/host/h_utl.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/host/h_utl.cpp |
|
823 180c180 |
|
824 < memset(&aVersion, sizeof(TVersion), 0); |
|
825 --- |
|
826 > memset(&aVersion, 0, sizeof(TVersion)); |
|
827 195c195 |
|
828 < char* pMinor = strchr(str, '.'); |
|
829 --- |
|
830 > char const * pMinor = strchr(str, '.'); |
|
831 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/inc/h_utl.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/inc/h_utl.h |
|
832 68,70d67 |
|
833 < // to fix the linux problem: memcpy does not work with overlapped areas. |
|
834 < #define memcpy memmove |
|
835 < |
|
836 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/imglib/parameterfileprocessor/source/parameterfileprocessor.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/imglib/parameterfileprocessor/source/parameterfileprocessor.cpp |
|
837 23a24 |
|
838 > #include <cstring> |
|
839 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/group/BLD.INF /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/group/BLD.INF |
|
840 17a18 |
|
841 > #include <productvariant.hrh> |
|
842 24c25 |
|
843 < ../maksym/fixupsym.bat /epoc32/tools/fixupsym.bat |
|
844 --- |
|
845 > ../maksym/fixupsym.bat EPOCROOT_EXPORT_PATH(epoc32/tools/fixupsym.bat) |
|
846 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/group/readimage.mmp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/group/readimage.mmp |
|
847 47a48 |
|
848 > #ifndef TOOLS2_LINUX |
|
849 48a50 |
|
850 > #endif |
|
851 55,56c57 |
|
852 < STATICLIBRARY boost_thread-mgw34-mt-1_39_linux |
|
853 < OPTION GCC -pthread -O2 -Wno-uninitialized |
|
854 --- |
|
855 > OPTION GCC -pthread -O2 -Wno-uninitialized -lboost_thread-mt |
|
856 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/inc/common.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/inc/common.h |
|
857 49c49 |
|
858 < typedef enum EImageType |
|
859 --- |
|
860 > enum EImageType |
|
861 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/inc/image_reader.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/inc/image_reader.h |
|
862 30c30,42 |
|
863 < #include <direct.h> |
|
864 --- |
|
865 > #if defined(WIN32) |
|
866 > #include <direct.h> |
|
867 > #define GETCWD _getcwd |
|
868 > #define CHDIR _chdir |
|
869 > #define MKDIR(dir) _mkdir(dir) |
|
870 > #elif defined(__LINUX__) |
|
871 > #include <sys/stat.h> |
|
872 > #include <unistd.h> |
|
873 > #define GETCWD getcwd |
|
874 > #define CHDIR chdir |
|
875 > #define MKDIR(dir) mkdir((dir),S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) |
|
876 > #endif |
|
877 > |
|
878 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/inc/rofs_image_reader.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/inc/rofs_image_reader.h |
|
879 68c68 |
|
880 < void SetSeek(streampos aOff, ios::seek_dir aStartPos=ios::beg); |
|
881 --- |
|
882 > void SetSeek(streampos aOff, std::ios_base::seekdir aStartPos); |
|
883 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/e32_image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/src/e32_image_reader.cpp |
|
884 77,97c77,97 |
|
885 < DumpInHex("Size", aE32Image.iSize ) << endl; |
|
886 < DumpInHex("Uids",aE32Image.iOrigHdr->iUid1); |
|
887 < DumpInHex(" ",aE32Image.iOrigHdr->iUid2, aContinue); |
|
888 < DumpInHex(" ",aE32Image.iOrigHdr->iUid3, aContinue); |
|
889 < DumpInHex(" ",aE32Image.iOrigHdr->iUidChecksum, aContinue) << endl; |
|
890 < |
|
891 < |
|
892 < DumpInHex("Entry point", aE32Image.iOrigHdr->iEntryPoint ) << endl; |
|
893 < DumpInHex("Code start addr" ,aE32Image.iOrigHdr->iCodeBase)<< endl; |
|
894 < DumpInHex("Data start addr" ,aE32Image.iOrigHdr->iDataBase) << endl; |
|
895 < DumpInHex("Text size" ,aE32Image.iOrigHdr->iTextSize) << endl; |
|
896 < DumpInHex("Code size" ,aE32Image.iOrigHdr->iCodeSize) << endl; |
|
897 < DumpInHex("Data size" ,aE32Image.iOrigHdr->iDataSize) << endl; |
|
898 < DumpInHex("Bss size" ,aE32Image.iOrigHdr->iBssSize) << endl; |
|
899 < DumpInHex("Total data size" ,(aE32Image.iOrigHdr->iBssSize + aE32Image.iOrigHdr->iDataSize)) << endl; |
|
900 < DumpInHex("Heap min" ,aE32Image.iOrigHdr->iHeapSizeMin) << endl; |
|
901 < DumpInHex("Heap max" ,aE32Image.iOrigHdr->iHeapSizeMax) << endl; |
|
902 < DumpInHex("Stack size" ,aE32Image.iOrigHdr->iStackSize) << endl; |
|
903 < DumpInHex("Export directory" ,aE32Image.iOrigHdr->iExportDirOffset) << endl; |
|
904 < DumpInHex("Export dir count" ,aE32Image.iOrigHdr->iExportDirCount) << endl; |
|
905 < DumpInHex("Flags" ,aE32Image.iOrigHdr->iFlags) << endl; |
|
906 --- |
|
907 > DumpInHex(const_cast<char *>("Size"), aE32Image.iSize ) << endl; |
|
908 > DumpInHex(const_cast<char *>("Uids"),aE32Image.iOrigHdr->iUid1); |
|
909 > DumpInHex(const_cast<char *>(" "),aE32Image.iOrigHdr->iUid2, aContinue); |
|
910 > DumpInHex(const_cast<char *>(" "),aE32Image.iOrigHdr->iUid3, aContinue); |
|
911 > DumpInHex(const_cast<char *>(" "),aE32Image.iOrigHdr->iUidChecksum, aContinue) << endl; |
|
912 > |
|
913 > |
|
914 > DumpInHex(const_cast<char *>("Entry point"), aE32Image.iOrigHdr->iEntryPoint ) << endl; |
|
915 > DumpInHex(const_cast<char *>("Code start addr") ,aE32Image.iOrigHdr->iCodeBase)<< endl; |
|
916 > DumpInHex(const_cast<char *>("Data start addr") ,aE32Image.iOrigHdr->iDataBase) << endl; |
|
917 > DumpInHex(const_cast<char *>("Text size") ,aE32Image.iOrigHdr->iTextSize) << endl; |
|
918 > DumpInHex(const_cast<char *>("Code size") ,aE32Image.iOrigHdr->iCodeSize) << endl; |
|
919 > DumpInHex(const_cast<char *>("Data size") ,aE32Image.iOrigHdr->iDataSize) << endl; |
|
920 > DumpInHex(const_cast<char *>("Bss size") ,aE32Image.iOrigHdr->iBssSize) << endl; |
|
921 > DumpInHex(const_cast<char *>("Total data size") ,(aE32Image.iOrigHdr->iBssSize + aE32Image.iOrigHdr->iDataSize)) << endl; |
|
922 > DumpInHex(const_cast<char *>("Heap min") ,aE32Image.iOrigHdr->iHeapSizeMin) << endl; |
|
923 > DumpInHex(const_cast<char *>("Heap max") ,aE32Image.iOrigHdr->iHeapSizeMax) << endl; |
|
924 > DumpInHex(const_cast<char *>("Stack size") ,aE32Image.iOrigHdr->iStackSize) << endl; |
|
925 > DumpInHex(const_cast<char *>("Export directory") ,aE32Image.iOrigHdr->iExportDirOffset) << endl; |
|
926 > DumpInHex(const_cast<char *>("Export dir count") ,aE32Image.iOrigHdr->iExportDirCount) << endl; |
|
927 > DumpInHex(const_cast<char *>("Flags") ,aE32Image.iOrigHdr->iFlags) << endl; |
|
928 108,111c108,111 |
|
929 < DumpInHex("Secure ID", v->iS.iSecureId) << endl; |
|
930 < DumpInHex("Vendor ID", v->iS.iVendorId) << endl; |
|
931 < DumpInHex("Capability", v->iS.iCaps[1]); |
|
932 < DumpInHex(" ", v->iS.iCaps[0], aContinue) << endl; |
|
933 --- |
|
934 > DumpInHex(const_cast<char *>("Secure ID"), v->iS.iSecureId) << endl; |
|
935 > DumpInHex(const_cast<char *>("Vendor ID"), v->iS.iVendorId) << endl; |
|
936 > DumpInHex(const_cast<char *>("Capability"), v->iS.iCaps[1]); |
|
937 > DumpInHex(const_cast<char *>(" "), v->iS.iCaps[0], aContinue) << endl; |
|
938 122c122 |
|
939 < DumpInHex("Compression", aE32Image.iOrigHdr->iCompressionType) << endl; |
|
940 --- |
|
941 > DumpInHex(const_cast<char *>("Compression"), aE32Image.iOrigHdr->iCompressionType) << endl; |
|
942 127,128c127,129 |
|
943 < DumpInHex("Exception Descriptor", v->iExceptionDescriptor) << endl; |
|
944 < DumpInHex("Code offset", v->iCodeOffset) << endl; |
|
945 --- |
|
946 > DumpInHex(const_cast<char *>("Exception Descriptor"), v->iExceptionDescriptor) << endl; |
|
947 > DumpInHex(const_cast<char *>("Code offset"), v->iCodeOffset) << endl; |
|
948 > |
|
949 132c133 |
|
950 < DumpInHex("Dll ref table size", aE32Image.iOrigHdr->iDllRefTableCount) << endl << endl << endl; |
|
951 --- |
|
952 > DumpInHex(const_cast<char *>("Dll ref table size"), aE32Image.iOrigHdr->iDllRefTableCount) << endl << endl << endl; |
|
953 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/image_handler.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/src/image_handler.cpp |
|
954 395c395,396 |
|
955 < throw SisUtilsException("Usage Error", "No SIS file passed"); |
|
956 --- |
|
957 > throw SisUtilsException(const_cast<char *>("Usage Error"), |
|
958 > const_cast<char *>("No SIS file passed")); |
|
959 412c413,414 |
|
960 < throw SisUtilsException("Error:", "Cannot create Sis2Iby object"); |
|
961 --- |
|
962 > throw SisUtilsException(const_cast<char *>("Error:"), |
|
963 > const_cast<char *>("Cannot create Sis2Iby object")); |
|
964 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/src/image_reader.cpp |
|
965 176c176 |
|
966 < if( _getcwd(currWorkingDir,_MAX_BUFFER_SIZE_) == NULL ) |
|
967 --- |
|
968 > if( GETCWD(currWorkingDir,_MAX_BUFFER_SIZE_) == NULL ) |
|
969 194c194 |
|
970 < if( _chdir(changeToDrive.c_str()) ) |
|
971 --- |
|
972 > if( CHDIR(changeToDrive.c_str()) ) |
|
973 203c203 |
|
974 < _mkdir(cPtr); |
|
975 --- |
|
976 > MKDIR(cPtr); |
|
977 205c205 |
|
978 < _chdir(cPtr); |
|
979 --- |
|
980 > int r = CHDIR(cPtr); (void)r; |
|
981 210c210 |
|
982 < if (cPtr = strtok(NULL,aDelimiter)) |
|
983 --- |
|
984 > if ((cPtr = strtok(NULL,aDelimiter)) != NULL) |
|
985 213c213 |
|
986 < _mkdir(cPtr); |
|
987 --- |
|
988 > MKDIR(cPtr); |
|
989 215c215 |
|
990 < _chdir(cPtr); |
|
991 --- |
|
992 > int r = CHDIR(cPtr); (void)r; |
|
993 219c219 |
|
994 < _chdir(currWorkingDir); |
|
995 --- |
|
996 > int r = CHDIR(currWorkingDir); (void)r; |
|
997 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/rofs_image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/src/rofs_image_reader.cpp |
|
998 45c45 |
|
999 < void RofsImageReader::SetSeek(streampos aOff, ios::seek_dir aStartPos) |
|
1000 --- |
|
1001 > void RofsImageReader::SetSeek(streampos aOff, std::ios_base::seekdir aStartPos) |
|
1002 293c293 |
|
1003 < GetCompleteNodePath(aNode,iPath,"/"); |
|
1004 --- |
|
1005 > GetCompleteNodePath(aNode,iPath,const_cast<char *>("/")); |
|
1006 420c420,421 |
|
1007 < GetCompleteNodePath( aNode, path, "\\\\" ); |
|
1008 --- |
|
1009 > GetCompleteNodePath( aNode, path, const_cast<char *>("\\\\") ); |
|
1010 > |
|
1011 499c500 |
|
1012 < GetCompleteNodePath( aNode, path, "\\" ); |
|
1013 --- |
|
1014 > GetCompleteNodePath( aNode, path, const_cast<char *>("\\") ); |
|
1015 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/readimage/src/rom_image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/readimage/src/rom_image_reader.cpp |
|
1016 22a23,28 |
|
1017 > #if defined(WIN32) |
|
1018 > #define ALLOCA _alloca |
|
1019 > #elif defined(__LINUX__) |
|
1020 > #include <alloca.h> |
|
1021 > #define ALLOCA alloca |
|
1022 > #endif |
|
1023 89,90c95,96 |
|
1024 < DumpInHex("Timestamp", (iRomHdr->iTime >> 32)) ; |
|
1025 < DumpInHex(" ", (iRomHdr->iTime &0xffffffff), aContinue) << endl; |
|
1026 --- |
|
1027 > DumpInHex(const_cast<char *>("Timestamp"), (iRomHdr->iTime >> 32)) ; |
|
1028 > DumpInHex(const_cast<char *>(" "), (iRomHdr->iTime &0xffffffff), aContinue) << endl; |
|
1029 92c98 |
|
1030 < DumpInHex("RomBase", iRomHdr->iRomBase) << endl; |
|
1031 --- |
|
1032 > DumpInHex(const_cast<char *>("RomBase"), iRomHdr->iRomBase) << endl; |
|
1033 94,120c100,126 |
|
1034 < DumpInHex("RomSize", iRomHdr->iRomSize) << endl; |
|
1035 < DumpInHex("KernelDataAddress", iRomHdr->iKernDataAddress) << endl; |
|
1036 < DumpInHex("KernelLimit", iRomHdr->iKernelLimit) << endl; |
|
1037 < DumpInHex("PrimaryFile", iRomHdr->iPrimaryFile) << endl; |
|
1038 < DumpInHex("SecondaryFile", iRomHdr->iSecondaryFile) << endl; |
|
1039 < DumpInHex("CheckSum", iRomHdr->iCheckSum) << endl; |
|
1040 < DumpInHex("Hardware", iRomHdr->iHardware) << endl; |
|
1041 < |
|
1042 < DumpInHex("Language", (TUint)(iRomHdr->iLanguage >> 32)); |
|
1043 < DumpInHex(" ", ((TUint)(iRomHdr->iLanguage & 0xffffffff)), aContinue) <<endl; |
|
1044 < |
|
1045 < DumpInHex("KernelConfigFlags", iRomHdr->iKernelConfigFlags) << endl; |
|
1046 < DumpInHex("RomExceptionSearchTable", iRomHdr->iRomExceptionSearchTable) << endl; |
|
1047 < DumpInHex("RomHeaderSize", iRomHdr->iRomHeaderSize) << endl; |
|
1048 < DumpInHex("RomSectionHeader", iRomHdr->iRomSectionHeader) << endl; |
|
1049 < DumpInHex("TotalSvDataSize", iRomHdr->iTotalSvDataSize) << endl; |
|
1050 < DumpInHex("VariantFile", iRomHdr->iVariantFile) << endl; |
|
1051 < DumpInHex("ExtensionFile", iRomHdr->iExtensionFile) << endl; |
|
1052 < DumpInHex("RelocInfo", iRomHdr->iRelocInfo) << endl; |
|
1053 < DumpInHex("OldTraceMask", iRomHdr->iOldTraceMask) << endl; |
|
1054 < DumpInHex("UserDataAddress", iRomHdr->iUserDataAddress) << endl; |
|
1055 < DumpInHex("TotalUserDataSize", iRomHdr->iTotalUserDataSize) << endl; |
|
1056 < DumpInHex("DebugPort", iRomHdr->iDebugPort) << endl; |
|
1057 < |
|
1058 < DumpInHex("Version", iRomHdr->iVersion.iMajor, false, 2); |
|
1059 < DumpInHex(".", iRomHdr->iVersion.iMinor, aContinue, 2); |
|
1060 < DumpInHex("(" ,iRomHdr->iVersion.iBuild, aContinue, 2); |
|
1061 --- |
|
1062 > DumpInHex(const_cast<char *>("RomSize"), iRomHdr->iRomSize) << endl; |
|
1063 > DumpInHex(const_cast<char *>("KernelDataAddress"), iRomHdr->iKernDataAddress) << endl; |
|
1064 > DumpInHex(const_cast<char *>("KernelLimit"), iRomHdr->iKernelLimit) << endl; |
|
1065 > DumpInHex(const_cast<char *>("PrimaryFile"), iRomHdr->iPrimaryFile) << endl; |
|
1066 > DumpInHex(const_cast<char *>("SecondaryFile"), iRomHdr->iSecondaryFile) << endl; |
|
1067 > DumpInHex(const_cast<char *>("CheckSum"), iRomHdr->iCheckSum) << endl; |
|
1068 > DumpInHex(const_cast<char *>("Hardware"), iRomHdr->iHardware) << endl; |
|
1069 > |
|
1070 > DumpInHex(const_cast<char *>("Language"), (TUint)(iRomHdr->iLanguage >> 32)); |
|
1071 > DumpInHex(const_cast<char *>(" "), ((TUint)(iRomHdr->iLanguage & 0xffffffff)), aContinue) <<endl; |
|
1072 > |
|
1073 > DumpInHex(const_cast<char *>("KernelConfigFlags"), iRomHdr->iKernelConfigFlags) << endl; |
|
1074 > DumpInHex(const_cast<char *>("RomExceptionSearchTable"), iRomHdr->iRomExceptionSearchTable) << endl; |
|
1075 > DumpInHex(const_cast<char *>("RomHeaderSize"), iRomHdr->iRomHeaderSize) << endl; |
|
1076 > DumpInHex(const_cast<char *>("RomSectionHeader"), iRomHdr->iRomSectionHeader) << endl; |
|
1077 > DumpInHex(const_cast<char *>("TotalSvDataSize"), iRomHdr->iTotalSvDataSize) << endl; |
|
1078 > DumpInHex(const_cast<char *>("VariantFile"), iRomHdr->iVariantFile) << endl; |
|
1079 > DumpInHex(const_cast<char *>("ExtensionFile"), iRomHdr->iExtensionFile) << endl; |
|
1080 > DumpInHex(const_cast<char *>("RelocInfo"), iRomHdr->iRelocInfo) << endl; |
|
1081 > DumpInHex(const_cast<char *>("OldTraceMask"), iRomHdr->iOldTraceMask) << endl; |
|
1082 > DumpInHex(const_cast<char *>("UserDataAddress"), iRomHdr->iUserDataAddress) << endl; |
|
1083 > DumpInHex(const_cast<char *>("TotalUserDataSize"), iRomHdr->iTotalUserDataSize) << endl; |
|
1084 > DumpInHex(const_cast<char *>("DebugPort"), iRomHdr->iDebugPort) << endl; |
|
1085 > |
|
1086 > DumpInHex(const_cast<char *>("Version"), iRomHdr->iVersion.iMajor, false, 2); |
|
1087 > DumpInHex(const_cast<char *>("."), iRomHdr->iVersion.iMinor, aContinue, 2); |
|
1088 > DumpInHex(const_cast<char *>("(") ,iRomHdr->iVersion.iBuild, aContinue, 2); |
|
1089 123,126c129,132 |
|
1090 < DumpInHex("CompressionType", iRomHdr->iCompressionType) << endl; |
|
1091 < DumpInHex("CompressedSize", iRomHdr->iCompressedSize) << endl; |
|
1092 < DumpInHex("UncompressedSize", iRomHdr->iUncompressedSize) << endl; |
|
1093 < DumpInHex("HcrFileAddress", iRomHdr->iHcrFileAddress) << endl; |
|
1094 --- |
|
1095 > DumpInHex(const_cast<char *>("CompressionType"), iRomHdr->iCompressionType) << endl; |
|
1096 > DumpInHex(const_cast<char *>("CompressedSize"), iRomHdr->iCompressedSize) << endl; |
|
1097 > DumpInHex(const_cast<char *>("UncompressedSize"), iRomHdr->iUncompressedSize) << endl; |
|
1098 > DumpInHex(const_cast<char *>("HcrFileAddress"), iRomHdr->iHcrFileAddress) << endl; |
|
1099 128,129c134,137 |
|
1100 < DumpInHex("DisabledCapabilities", iRomHdr->iDisabledCapabilities[0]); |
|
1101 < DumpInHex(" ", iRomHdr->iDisabledCapabilities[1], aContinue) << endl; |
|
1102 --- |
|
1103 > DumpInHex(const_cast<char *>("DisabledCapabilities"), iRomHdr->iDisabledCapabilities[0]); |
|
1104 > DumpInHex(const_cast<char *>(" "), iRomHdr->iDisabledCapabilities[1], aContinue) << endl; |
|
1105 > |
|
1106 > DumpInHex(const_cast<char *>("TraceMask"), iRomHdr->iTraceMask[0]); |
|
1107 131d138 |
|
1108 < DumpInHex("TraceMask", iRomHdr->iTraceMask[0]); |
|
1109 137c144 |
|
1110 < DumpInHex(" ", iRomHdr->iTraceMask[aPos++], aContinue); |
|
1111 --- |
|
1112 > DumpInHex(const_cast<char *>(" "), iRomHdr->iTraceMask[aPos++], aContinue); |
|
1113 141c148 |
|
1114 < DumpInHex(" ", iRomHdr->iTraceMask[aPos++], aContinue, 1); |
|
1115 --- |
|
1116 > DumpInHex(const_cast<char *>(" "), iRomHdr->iTraceMask[aPos++], aContinue, 1); |
|
1117 154,155c161,162 |
|
1118 < DumpInHex("Timestamp", (iExtRomHdr->iTime >> 32)) ; |
|
1119 < DumpInHex(" ", (iExtRomHdr->iTime &0xffffffff), aContinue) << endl; |
|
1120 --- |
|
1121 > DumpInHex(const_cast<char *>("Timestamp"), (iExtRomHdr->iTime >> 32)) ; |
|
1122 > DumpInHex(const_cast<char *>(" "), (iExtRomHdr->iTime &0xffffffff), aContinue) << endl; |
|
1123 157c164 |
|
1124 < DumpInHex("RomBase", iExtRomHdr->iRomBase) << endl; |
|
1125 --- |
|
1126 > DumpInHex(const_cast<char *>("RomBase"), iExtRomHdr->iRomBase) << endl; |
|
1127 159,160c166,167 |
|
1128 < DumpInHex("RomSize", iExtRomHdr->iRomSize) << endl; |
|
1129 < DumpInHex("CheckSum", iExtRomHdr->iCheckSum) << endl; |
|
1130 --- |
|
1131 > DumpInHex(const_cast<char *>("RomSize"), iExtRomHdr->iRomSize) << endl; |
|
1132 > DumpInHex(const_cast<char *>("CheckSum"), iExtRomHdr->iCheckSum) << endl; |
|
1133 162,164c169,171 |
|
1134 < DumpInHex("Version", iExtRomHdr->iVersion.iMajor, false, 2); |
|
1135 < DumpInHex(".", iExtRomHdr->iVersion.iMinor, aContinue, 2); |
|
1136 < DumpInHex("(" ,iExtRomHdr->iVersion.iBuild, aContinue, 2); |
|
1137 --- |
|
1138 > DumpInHex(const_cast<char *>("Version"), iExtRomHdr->iVersion.iMajor, false, 2); |
|
1139 > DumpInHex(const_cast<char *>("."), iExtRomHdr->iVersion.iMinor, aContinue, 2); |
|
1140 > DumpInHex(const_cast<char *>("(") ,iExtRomHdr->iVersion.iBuild, aContinue, 2); |
|
1141 167,169c174,176 |
|
1142 < DumpInHex("CompressionType", iExtRomHdr->iCompressionType) << endl; |
|
1143 < DumpInHex("CompressedSize", iExtRomHdr->iCompressedSize) << endl; |
|
1144 < DumpInHex("UncompressedSize", iExtRomHdr->iUncompressedSize) << endl; |
|
1145 --- |
|
1146 > DumpInHex(const_cast<char *>("CompressionType"), iExtRomHdr->iCompressionType) << endl; |
|
1147 > DumpInHex(const_cast<char *>("CompressedSize"), iExtRomHdr->iCompressedSize) << endl; |
|
1148 > DumpInHex(const_cast<char *>("UncompressedSize"), iExtRomHdr->iUncompressedSize) << endl; |
|
1149 498c505 |
|
1150 < char* temp = (char*)_alloca((aLen << 1) + 1) ; |
|
1151 --- |
|
1152 > char* temp = (char*)ALLOCA((aLen << 1) + 1) ; |
|
1153 579,580c586,587 |
|
1154 < DumpInHex("Load Address", aEntry->iTRomEntryPtr->iAddressLin) << endl; |
|
1155 < DumpInHex("Size", aEntry->iTRomEntryPtr->iSize) << endl; |
|
1156 --- |
|
1157 > DumpInHex(const_cast<char *>("Load Address"), aEntry->iTRomEntryPtr->iAddressLin) << endl; |
|
1158 > DumpInHex(const_cast<char *>("Size"), aEntry->iTRomEntryPtr->iSize) << endl; |
|
1159 587,603c594,610 |
|
1160 < DumpInHex("Uids", aRomImgEntry->iUid1); |
|
1161 < DumpInHex(" ", aRomImgEntry->iUid2, aContinue); |
|
1162 < DumpInHex(" ", aRomImgEntry->iUid3, aContinue); |
|
1163 < DumpInHex(" ", aRomImgEntry->iUidChecksum, aContinue) << endl; |
|
1164 < |
|
1165 < DumpInHex("Entry point", aRomImgEntry->iEntryPoint) << endl; |
|
1166 < DumpInHex("Code start addr", aRomImgEntry->iCodeAddress) << endl; |
|
1167 < DumpInHex("Data start addr", aRomImgEntry->iDataAddress) << endl; |
|
1168 < DumpInHex("DataBssLinearBase", aRomImgEntry->iDataBssLinearBase) << endl; |
|
1169 < DumpInHex("Text size", aRomImgEntry->iTextSize) << endl; |
|
1170 < DumpInHex("Code size", aRomImgEntry->iCodeSize) << endl; |
|
1171 < DumpInHex("Data size", aRomImgEntry->iDataSize) << endl; |
|
1172 < DumpInHex("Bss size", (aRomImgEntry->iBssSize)) << endl; |
|
1173 < DumpInHex("Total data size", aRomImgEntry->iTotalDataSize) << endl; |
|
1174 < DumpInHex("Heap min", aRomImgEntry->iHeapSizeMin) << endl; |
|
1175 < DumpInHex("Heap max", aRomImgEntry->iHeapSizeMax) << endl; |
|
1176 < DumpInHex("Stack size", aRomImgEntry->iStackSize) << endl; |
|
1177 --- |
|
1178 > DumpInHex(const_cast<char *>("Uids"), aRomImgEntry->iUid1); |
|
1179 > DumpInHex(const_cast<char *>(" "), aRomImgEntry->iUid2, aContinue); |
|
1180 > DumpInHex(const_cast<char *>(" "), aRomImgEntry->iUid3, aContinue); |
|
1181 > DumpInHex(const_cast<char *>(" "), aRomImgEntry->iUidChecksum, aContinue) << endl; |
|
1182 > |
|
1183 > DumpInHex(const_cast<char *>("Entry point"), aRomImgEntry->iEntryPoint) << endl; |
|
1184 > DumpInHex(const_cast<char *>("Code start addr"), aRomImgEntry->iCodeAddress) << endl; |
|
1185 > DumpInHex(const_cast<char *>("Data start addr"), aRomImgEntry->iDataAddress) << endl; |
|
1186 > DumpInHex(const_cast<char *>("DataBssLinearBase"), aRomImgEntry->iDataBssLinearBase) << endl; |
|
1187 > DumpInHex(const_cast<char *>("Text size"), aRomImgEntry->iTextSize) << endl; |
|
1188 > DumpInHex(const_cast<char *>("Code size"), aRomImgEntry->iCodeSize) << endl; |
|
1189 > DumpInHex(const_cast<char *>("Data size"), aRomImgEntry->iDataSize) << endl; |
|
1190 > DumpInHex(const_cast<char *>("Bss size"), (aRomImgEntry->iBssSize)) << endl; |
|
1191 > DumpInHex(const_cast<char *>("Total data size"), aRomImgEntry->iTotalDataSize) << endl; |
|
1192 > DumpInHex(const_cast<char *>("Heap min"), aRomImgEntry->iHeapSizeMin) << endl; |
|
1193 > DumpInHex(const_cast<char *>("Heap max"), aRomImgEntry->iHeapSizeMax) << endl; |
|
1194 > DumpInHex(const_cast<char *>("Stack size"), aRomImgEntry->iStackSize) << endl; |
|
1195 611c618 |
|
1196 < DumpInHex("Dll ref table", aVirtualAddr) << endl; |
|
1197 --- |
|
1198 > DumpInHex(const_cast<char *>("Dll ref table"), aVirtualAddr) << endl; |
|
1199 614,619c621,626 |
|
1200 < DumpInHex("Export directory", aRomImgEntry->iExportDir) << endl; |
|
1201 < DumpInHex("Export dir count", aRomImgEntry->iExportDirCount) << endl; |
|
1202 < DumpInHex("Hardware variant", aRomImgEntry->iHardwareVariant) << endl; |
|
1203 < DumpInHex("Flags", aRomImgEntry->iFlags) << endl; |
|
1204 < DumpInHex("Secure ID", aRomImgEntry->iS.iSecureId) << endl; |
|
1205 < DumpInHex("Vendor ID", aRomImgEntry->iS.iVendorId) << endl; |
|
1206 --- |
|
1207 > DumpInHex(const_cast<char *>("Export directory"), aRomImgEntry->iExportDir) << endl; |
|
1208 > DumpInHex(const_cast<char *>("Export dir count"), aRomImgEntry->iExportDirCount) << endl; |
|
1209 > DumpInHex(const_cast<char *>("Hardware variant"), aRomImgEntry->iHardwareVariant) << endl; |
|
1210 > DumpInHex(const_cast<char *>("Flags"), aRomImgEntry->iFlags) << endl; |
|
1211 > DumpInHex(const_cast<char *>("Secure ID"), aRomImgEntry->iS.iSecureId) << endl; |
|
1212 > DumpInHex(const_cast<char *>("Vendor ID"), aRomImgEntry->iS.iVendorId) << endl; |
|
1213 621,622c628,629 |
|
1214 < DumpInHex("Capability", aRomImgEntry->iS.iCaps[1]); |
|
1215 < DumpInHex(" ", aRomImgEntry->iS.iCaps[0], aContinue) << endl; |
|
1216 --- |
|
1217 > DumpInHex(const_cast<char *>("Capability"), aRomImgEntry->iS.iCaps[1]); |
|
1218 > DumpInHex(const_cast<char *>(" "), aRomImgEntry->iS.iCaps[0], aContinue) << endl; |
|
1219 633c640 |
|
1220 < DumpInHex("Exception Descriptor", aRomImgEntry->iExceptionDescriptor) << endl; |
|
1221 --- |
|
1222 > DumpInHex(const_cast<char *>("Exception Descriptor"), aRomImgEntry->iExceptionDescriptor) << endl; |
|
1223 637c644 |
|
1224 < DumpInHex("Dll ref table size", aRefTbl->iNumberOfEntries*8) << endl; |
|
1225 --- |
|
1226 > DumpInHex(const_cast<char *>("Dll ref table size"), aRefTbl->iNumberOfEntries*8) << endl; |
|
1227 639c646 |
|
1228 < DumpInHex("Dll ref table size", 0) << endl; |
|
1229 --- |
|
1230 > DumpInHex(const_cast<char *>("Dll ref table size"), 0) << endl; |
|
1231 698,699c705,706 |
|
1232 < DumpInHex( "", aRomImgEntry->iHardwareVariant, true) << "] "; |
|
1233 < DumpInHex( " DataSize=", (aRomImgEntry->iBssSize + aRomImgEntry->iDataSize), true) << endl; |
|
1234 --- |
|
1235 > DumpInHex( const_cast<char *>(""), aRomImgEntry->iHardwareVariant, true) << "] "; |
|
1236 > DumpInHex( const_cast<char *>(" DataSize="), (aRomImgEntry->iBssSize + aRomImgEntry->iDataSize), true) << endl; |
|
1237 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_build.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_build.cpp |
|
1238 32c32 |
|
1239 < #include <strstream> |
|
1240 --- |
|
1241 > #include <sstream> |
|
1242 1221,1231c1221 |
|
1243 < char * buffer = new char [size]; |
|
1244 < // need to check if the compressed file will fit in the image |
|
1245 < #if defined(__LINUX__) |
|
1246 < ostrstream os((char*)aDest, aMaxSize, (ios::openmode)(ios::out+ios::binary)); |
|
1247 < #elif defined(__TOOLS2__) && defined (_STLP_THREADS) |
|
1248 < ostrstream os((char*)buffer, size,(ios::out+ios::binary)); |
|
1249 < #elif defined( __TOOLS2__) |
|
1250 < ostrstream os((char*)buffer, size,(ios::out+ios::binary)); |
|
1251 < #else |
|
1252 < ostrstream os( (char*)buffer, size, (ios::out+ios::binary)); |
|
1253 < #endif |
|
1254 --- |
|
1255 > ostringstream os(ios_base::out|ios_base::binary); |
|
1256 1233c1223 |
|
1257 < TUint compressedSize = os.pcount(); |
|
1258 --- |
|
1259 > TUint compressedSize = os.str().size(); |
|
1260 1236d1225 |
|
1261 < delete[] buffer; |
|
1262 1245,1251c1234 |
|
1263 < #if defined(__TOOLS2__) && defined (_STLP_THREADS) |
|
1264 < ostrstream os((char*)aDest, aMaxSize,(ios::out+ios::binary)); |
|
1265 < #elif __TOOLS2__ |
|
1266 < ostrstream os((char*)aDest, aMaxSize, (std::_Ios_Openmode)(ios::out+ios::binary)); |
|
1267 < #else |
|
1268 < ostrstream os((char*)aDest, aMaxSize, (ios::out+ios::binary)); |
|
1269 < #endif |
|
1270 --- |
|
1271 > ostringstream os(ios_base::out|ios_base::binary); |
|
1272 1253c1236 |
|
1273 < size = os.pcount(); |
|
1274 --- |
|
1275 > size = os.str().size(); |
|
1276 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_coreimage.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_coreimage.cpp |
|
1277 102c102 |
|
1278 < TInt result = ImageError(itemsRead, K_ID_SIZE, "Read Identifier"); |
|
1279 --- |
|
1280 > TInt result = ImageError(itemsRead, K_ID_SIZE, const_cast<char *>("Read Identifier")); |
|
1281 120c120 |
|
1282 < TInt result = ImageError(itemsRead, 1, "Read Core Header"); |
|
1283 --- |
|
1284 > TInt result = ImageError(itemsRead, 1, const_cast<char *>("Read Core Header")); |
|
1285 140c140 |
|
1286 < TInt result = ImageError(itemsRead, 1, "Read Extension Header"); |
|
1287 --- |
|
1288 > TInt result = ImageError(itemsRead, 1, const_cast<char *>("Read Extension Header")); |
|
1289 202c202 |
|
1290 < if (ImageError(itemsRead, 1, "Read Dir") == KErrNone) |
|
1291 --- |
|
1292 > if (ImageError(itemsRead, 1, const_cast<char *>("Read Dir")) == KErrNone) |
|
1293 236c236 |
|
1294 < int result = ImageError(itemsRead, 1, "Read Entry Size"); |
|
1295 --- |
|
1296 > int result = ImageError(itemsRead, 1, const_cast<char *>("Read Entry Size")); |
|
1297 242c242 |
|
1298 < result = ImageError(itemsRead, 1, "Rest of Entry"); |
|
1299 --- |
|
1300 > result = ImageError(itemsRead, 1, const_cast<char *>("Rest of Entry")); |
|
1301 273c273 |
|
1302 < return ImageError(itemsRead, aLength, "Rof Entry Name"); |
|
1303 --- |
|
1304 > return ImageError(itemsRead, aLength, const_cast<char *>("Rof Entry Name")); |
|
1305 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_driveimage.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_driveimage.cpp |
|
1306 257c257 |
|
1307 < while(dirEntry = readdir(dirHandler)) |
|
1308 --- |
|
1309 > while((dirEntry = readdir(dirHandler)) != NULL) |
|
1310 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_driveutl.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_driveutl.cpp |
|
1311 85c85 |
|
1312 < TAny GetLocalTime(TAny) |
|
1313 --- |
|
1314 > TAny GetLocalTime() |
|
1315 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_driveutl.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_driveutl.h |
|
1316 27c27 |
|
1317 < TAny GetLocalTime(TAny); |
|
1318 --- |
|
1319 > TAny GetLocalTime(); |
|
1320 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_obey.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_obey.cpp |
|
1321 286c286 |
|
1322 < fgets((char*)iLine,imaxLength+1,iObeyFile); |
|
1323 --- |
|
1324 > char *cp = fgets((char*)iLine,imaxLength+1,iObeyFile); (void)cp; |
|
1325 649,655c649 |
|
1326 < #if defined(__TOOLS2__) && defined (_STLP_THREADS) |
|
1327 < istringstream val(iReader.Word(1),(ios_base::in+ios_base::out)); |
|
1328 < #elif __TOOLS2__ |
|
1329 < istringstream val(iReader.Word(1),(std::_Ios_Openmode)(ios_base::in+ios_base::out)); |
|
1330 < #else |
|
1331 < istrstream val(iReader.Word(1),strlen(iReader.Word(1))); |
|
1332 < #endif |
|
1333 --- |
|
1334 > istringstream val(iReader.Word(1),ios_base::in|ios_base::out); |
|
1335 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/rofsbuild.mmp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/rofsbuild.mmp |
|
1336 45a46 |
|
1337 > #ifndef TOOLS2_LINUX |
|
1338 46a48 |
|
1339 > #endif |
|
1340 53,54c55 |
|
1341 < STATICLIBRARY boost_thread-mgw34-mt-1_39_linux |
|
1342 < OPTION GCC -pthread -O2 -Wno-uninitialized |
|
1343 --- |
|
1344 > OPTION GCC -pthread -O2 -Wno-uninitialized -lboost_thread-mt |
|
1345 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rofsbuild/r_rofs.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rofsbuild/r_rofs.cpp |
|
1346 587,589c587,590 |
|
1347 < *(TUint32 *) (&coffhead[0x18]) = ALIGN4K(iSizeUsed); |
|
1348 < *(TUint32 *) (&coffhead[0x40]) = ALIGN4K(iSizeUsed); |
|
1349 < |
|
1350 --- |
|
1351 > TUint32 * p0x18 = reinterpret_cast<TUint32 *>(&coffhead[0x18]); |
|
1352 > *p0x18 = ALIGN4K(iSizeUsed); |
|
1353 > TUint32 * p0x40 = reinterpret_cast<TUint32 *>(&coffhead[0x40]); |
|
1354 > *p0x40 = ALIGN4K(iSizeUsed); |
|
1355 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rombuild/r_obey.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rombuild/r_obey.cpp |
|
1356 304c304 |
|
1357 < fgets((char*)iLine,imaxLength+1,iObeyFile); |
|
1358 --- |
|
1359 > char * cp = fgets((char*)iLine,imaxLength+1,iObeyFile); (void)cp; |
|
1360 2976,2982c2976 |
|
1361 < #if defined(__TOOLS2__) && defined (_STLP_THREADS) |
|
1362 < istringstream val(iReader.Word(1),(ios_base::in+ios_base::out)); |
|
1363 < #elif __TOOLS2__ |
|
1364 < istringstream val(iReader.Word(1),(std::_Ios_Openmode)(ios_base::in+ios_base::out)); |
|
1365 < #else |
|
1366 < istrstream val(iReader.Word(1),strlen(iReader.Word(1))); |
|
1367 < #endif |
|
1368 --- |
|
1369 > istringstream val(iReader.Word(1),ios_base::in|ios_base::out); |
|
1370 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rombuild/rombuild.mmp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rombuild/rombuild.mmp |
|
1371 43a44 |
|
1372 > #ifndef TOOLS2_LINUX |
|
1373 44a46 |
|
1374 > #endif |
|
1375 53,54c55 |
|
1376 < STATICLIBRARY boost_thread-mgw34-mt-1_39_linux |
|
1377 < OPTION GCC -O2 -Wno-uninitialized -pthread |
|
1378 --- |
|
1379 > OPTION GCC -pthread -O2 -Wno-uninitialized -lboost_thread-mt |
|
1380 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/romtools/rombuild/r_rom.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/romtools/rombuild/r_rom.cpp |
|
1381 1838c1838 |
|
1382 < if (!e->IsDll() && (nx>1 || nx==1 && l[-1]!=rf)) |
|
1383 --- |
|
1384 > if (!e->IsDll() && (nx>1 || (nx==1 && l[-1]!=rf))) |
|
1385 2201,2202c2201,2205 |
|
1386 < *(TUint32 *) (&coffhead[0x18]) = ALIGN4K(iSizeUsed); |
|
1387 < *(TUint32 *) (&coffhead[0x40]) = ALIGN4K(iSizeUsed); |
|
1388 --- |
|
1389 > TUint32 * p0x18 = reinterpret_cast<TUint32 *>(&coffhead[0x18]); |
|
1390 > *p0x18 = ALIGN4K(iSizeUsed); |
|
1391 > TUint32 * p0x40 = reinterpret_cast<TUint32 *>(&coffhead[0x40]); |
|
1392 > *p0x40 = ALIGN4K(iSizeUsed); |
|
1393 > |
|
1394 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/inc/pkgfileparser.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/sisutils/inc/pkgfileparser.h |
|
1395 35a36,39 |
|
1396 > int CompareTwoString(wchar_t const * string ,wchar_t const * option); |
|
1397 > int CompareNString(wchar_t const * string ,wchar_t const * option, int len); |
|
1398 > |
|
1399 > |
|
1400 150c154 |
|
1401 < HANDLE iPkgHandle; |
|
1402 --- |
|
1403 > FILE * iPkgHandle; |
|
1404 165c169 |
|
1405 < WORD ParseEscapeChars(); |
|
1406 --- |
|
1407 > unsigned short ParseEscapeChars(); |
|
1408 200,201c204,205 |
|
1409 < friend int CompareTwoString(wchar_t* string ,wchar_t* option); |
|
1410 < friend int CompareNString(wchar_t* string ,wchar_t* option, int len); |
|
1411 --- |
|
1412 > friend int CompareTwoString(wchar_t const * string ,wchar_t const * option); |
|
1413 > friend int CompareNString(wchar_t const * string ,wchar_t const * option, int len); |
|
1414 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/inc/pkglanguage.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/sisutils/inc/pkglanguage.h |
|
1415 29c29 |
|
1416 < wchar_t* iName; |
|
1417 --- |
|
1418 > wchar_t const * iName; |
|
1419 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/inc/sisutils.h /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/sisutils/inc/sisutils.h |
|
1420 42a43,45 |
|
1421 > #ifdef __LINUX__ |
|
1422 > #define PATHSEPARATOR "/" |
|
1423 > #endif |
|
1424 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/src/pkgfileparser.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/sisutils/src/pkgfileparser.cpp |
|
1425 20a21,22 |
|
1426 > #include <vector> |
|
1427 > #include <wchar.h> |
|
1428 26,27c28,29 |
|
1429 < WCHAR pszOpt[MAXTOKENLEN]; |
|
1430 < DWORD dwOpt; |
|
1431 --- |
|
1432 > wchar_t pszOpt[MAXTOKENLEN]; |
|
1433 > unsigned dwOpt; |
|
1434 48a51,54 |
|
1435 > std::wstring string2wstring (const String& aNarrow); |
|
1436 > String wstring2string (const std::wstring& aWide); |
|
1437 > |
|
1438 > |
|
1439 71c77 |
|
1440 < if(iPkgHandle != INVALID_HANDLE_VALUE) |
|
1441 --- |
|
1442 > if(iPkgHandle) |
|
1443 73c79 |
|
1444 < ::CloseHandle(iPkgHandle); |
|
1445 --- |
|
1446 > std::fclose(iPkgHandle); |
|
1447 87c93,99 |
|
1448 < iPkgHandle = ::CreateFileW(string2wstring(iPkgFile).data(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); |
|
1449 --- |
|
1450 > #ifdef WIN32 |
|
1451 > iPkgHandle = _wfopen(string2wstring(iPkgFile).c_str(),L"r"); |
|
1452 > #else |
|
1453 > // *nix fopen doesn't care about the filename encoding, as long as its NULL-terminated. |
|
1454 > iPkgHandle = std::fopen(iPkgFile.c_str(),"r"); |
|
1455 > #endif |
|
1456 > return iPkgHandle ? 1 : 0; |
|
1457 89d100 |
|
1458 < return (iPkgHandle != INVALID_HANDLE_VALUE) ? 1 : 0; |
|
1459 167c178 |
|
1460 < throw SisUtilsException((char*)iPkgFile.data(), "Could not open file"); |
|
1461 --- |
|
1462 > throw SisUtilsException((char*)iPkgFile.data(), const_cast<char *>("Could not open file")); |
|
1463 212c223 |
|
1464 < ParserError("Unexpected token"); |
|
1465 --- |
|
1466 > ParserError(const_cast<char *>("Unexpected token")); |
|
1467 276c287 |
|
1468 < for (WORD wNumLangs = 0; wNumLangs < iLangList.size(); wNumLangs++) |
|
1469 --- |
|
1470 > for (unsigned short wNumLangs = 0; wNumLangs < iLangList.size(); wNumLangs++) |
|
1471 667c678 |
|
1472 < if(!CompareNString(m_tokenValue.pszString,L"option",6)) |
|
1473 --- |
|
1474 > if(!CompareNString(m_tokenValue.pszString,const_cast<wchar_t *>(L"option"),6)) |
|
1475 690c701 |
|
1476 < ParserError("ErrBadCondFormat"); |
|
1477 --- |
|
1478 > ParserError(const_cast<char *>("ErrBadCondFormat")); |
|
1479 774c785 |
|
1480 < WORD wNumLangs; |
|
1481 --- |
|
1482 > unsigned short wNumLangs; |
|
1483 841c852 |
|
1484 < for (WORD wNumLangs = 0; wNumLangs < iLangList.size(); wNumLangs++) |
|
1485 --- |
|
1486 > for (unsigned short wNumLangs = 0; wNumLangs < iLangList.size(); wNumLangs++) |
|
1487 993,1000c1004,1005 |
|
1488 < #ifdef WIN32 |
|
1489 < DWORD dwBytesRead; |
|
1490 < if (!::ReadFile(iPkgHandle, (LPVOID)&m_pkgChar, sizeof(WCHAR), &dwBytesRead, NULL) || |
|
1491 < dwBytesRead!=sizeof(wchar_t)) |
|
1492 < m_pkgChar='\0'; |
|
1493 < #else |
|
1494 < #error "TODO: Implement this function under other OS than Windows" |
|
1495 < #endif |
|
1496 --- |
|
1497 > wint_t wch = std::fgetwc(iPkgHandle); |
|
1498 > m_pkgChar = (wch == WEOF) ? 0 : wch; |
|
1499 1015c1020 |
|
1500 < ParserError("Unexpected Token"); |
|
1501 --- |
|
1502 > ParserError(const_cast<char *>("Unexpected Token")); |
|
1503 1108c1113 |
|
1504 < DWORD wCount = 0; |
|
1505 --- |
|
1506 > unsigned wCount = 0; |
|
1507 1111c1116 |
|
1508 < DWORD escapeChars = 0; |
|
1509 --- |
|
1510 > unsigned escapeChars = 0; |
|
1511 1123c1128 |
|
1512 < ParserError("Bad String"); |
|
1513 --- |
|
1514 > ParserError(const_cast<char *>("Bad String")); |
|
1515 1127c1132 |
|
1516 < ParserError("Bad String"); |
|
1517 --- |
|
1518 > ParserError(const_cast<char *>("Bad String")); |
|
1519 1156c1161 |
|
1520 < WORD PkgParser::ParseEscapeChars() |
|
1521 --- |
|
1522 > unsigned short PkgParser::ParseEscapeChars() |
|
1523 1158,1160c1163,1165 |
|
1524 < WORD found=0; |
|
1525 < WCHAR temp[MAX_STRING]; |
|
1526 < #ifdef WIN32 |
|
1527 --- |
|
1528 > unsigned short found=0; |
|
1529 > wchar_t temp[MAX_STRING]; |
|
1530 > |
|
1531 1164c1169,1170 |
|
1532 < DWORD fileOffset=::SetFilePointer(iPkgHandle, 0L, NULL, FILE_CURRENT); |
|
1533 --- |
|
1534 > std::fpos_t foff; |
|
1535 > std::fgetpos(iPkgHandle,&foff); |
|
1536 1173c1179 |
|
1537 < ::SetFilePointer(iPkgHandle, fileOffset, NULL, FILE_BEGIN); |
|
1538 --- |
|
1539 > std::fsetpos(iPkgHandle,&foff); |
|
1540 1180c1186 |
|
1541 < ::SetFilePointer(iPkgHandle, fileOffset, NULL, FILE_BEGIN); |
|
1542 --- |
|
1543 > std::fsetpos(iPkgHandle,&foff); |
|
1544 1183c1189 |
|
1545 < DWORD num=m_tokenValue.dwNumber; |
|
1546 --- |
|
1547 > unsigned num=m_tokenValue.dwNumber; |
|
1548 1185,1186c1191,1192 |
|
1549 < if (num>=0x80 && num<=0x9F) ParserError("Invalid Escape"); |
|
1550 < DWORD len=wcslen(temp); |
|
1551 --- |
|
1552 > if (num>=0x80 && num<=0x9F) ParserError(const_cast<char *>("Invalid Escape")); |
|
1553 > unsigned len=wcslen(temp); |
|
1554 1190c1196 |
|
1555 < m_tokenValue.pszString[len]=(WCHAR)num; |
|
1556 --- |
|
1557 > m_tokenValue.pszString[len]=(wchar_t)num; |
|
1558 1196,1198d1201 |
|
1559 < #else |
|
1560 < #error "TODO: Implement this function under other OS than Windows" |
|
1561 < #endif |
|
1562 1210c1213 |
|
1563 < WORD wCount = 0; |
|
1564 --- |
|
1565 > unsigned short wCount = 0; |
|
1566 1235,1236c1238,1240 |
|
1567 < WCHAR oldChar = m_pkgChar; |
|
1568 < DWORD fileOffset=::SetFilePointer(iPkgHandle, 0L, NULL, FILE_CURRENT); |
|
1569 --- |
|
1570 > wchar_t oldChar = m_pkgChar; |
|
1571 > std::fpos_t foff; |
|
1572 > std::fgetpos(iPkgHandle,&foff); |
|
1573 1240c1244 |
|
1574 < ::SetFilePointer(iPkgHandle,fileOffset,NULL,FILE_BEGIN); |
|
1575 --- |
|
1576 > std::fsetpos(iPkgHandle,&foff); |
|
1577 1254,1255c1258,1259 |
|
1578 < WCHAR temp[MAX_STRING]; |
|
1579 < LPWSTR end; |
|
1580 --- |
|
1581 > wchar_t temp[MAX_STRING]; |
|
1582 > wchar_t * end; |
|
1583 1257,1258c1261,1262 |
|
1584 < DWORD dwBytesRead; |
|
1585 < DWORD fileOffset=::SetFilePointer(iPkgHandle, 0L, NULL, FILE_CURRENT); |
|
1586 --- |
|
1587 > std::fpos_t foff; |
|
1588 > std::fgetpos(iPkgHandle,&foff); |
|
1589 1261,1265c1265,1272 |
|
1590 < if (!::ReadFile(iPkgHandle, &temp[1], (MAX_STRING-2)*sizeof(WCHAR), &dwBytesRead, NULL) || |
|
1591 < dwBytesRead==0) |
|
1592 < ParserError("Read failed"); |
|
1593 < temp[1+dwBytesRead/sizeof(WCHAR)]='\0'; |
|
1594 < hexString = (!CompareNString(temp, L"0x", 2) || !CompareNString(&temp[1], L"0x", 2)); |
|
1595 --- |
|
1596 > unsigned wchRead = fread(&temp[1],sizeof(wchar_t),MAX_STRING - 2,iPkgHandle); |
|
1597 > if (!wchRead) |
|
1598 > { |
|
1599 > ParserError(const_cast<char *>("Read failed")); |
|
1600 > } |
|
1601 > temp[1+wchRead] = 0; |
|
1602 > hexString = (!CompareNString(temp, const_cast<wchar_t *>(L"0x"), 2) || |
|
1603 > !CompareNString(&temp[1], const_cast<wchar_t *>(L"0x"), 2)); |
|
1604 1269,1270c1276,1281 |
|
1605 < if (end==temp) ParserError("Read failed"); |
|
1606 < ::SetFilePointer(iPkgHandle, fileOffset+(end-temp-1)*sizeof(WCHAR), NULL, FILE_BEGIN); |
|
1607 --- |
|
1608 > if (end==temp) |
|
1609 > { |
|
1610 > ParserError(const_cast<char *>("Read failed")); |
|
1611 > } |
|
1612 > std::fsetpos(iPkgHandle,&foff); |
|
1613 > std::fseek(iPkgHandle,(end-temp-1) * sizeof(wchar_t),SEEK_CUR); |
|
1614 1347c1358 |
|
1615 < throw SisUtilsException("PakageFile-Parser Error", (char*)(str.str()).data()); |
|
1616 --- |
|
1617 > throw SisUtilsException(const_cast<char *>("PackageFile-Parser Error"), (char*)(str.str()).data()); |
|
1618 1360,1365c1371,1373 |
|
1619 < int max = ::WideCharToMultiByte(CP_OEMCP,0,aWide.c_str(),aWide.length(),0,0,0,0); |
|
1620 < String reply; |
|
1621 < if (max > 0 ) |
|
1622 < { |
|
1623 < char* buffer = new char [max]; |
|
1624 < try |
|
1625 --- |
|
1626 > std::vector<char> buffer((aWide.length() * sizeof(wchar_t)) + 1, '\0'); |
|
1627 > size_t nchars = wcstombs(&buffer[0],aWide.c_str(),buffer.size()); |
|
1628 > if (nchars == (size_t)-1) |
|
1629 1367,1374c1375,1376 |
|
1630 < ::WideCharToMultiByte(CP_OEMCP,0,aWide.c_str(),aWide.length(),buffer,max,0,0); |
|
1631 < reply = String (buffer, max); |
|
1632 < } |
|
1633 < catch (...) |
|
1634 < { |
|
1635 < throw SisUtilsException("ParserError", "wstring to string conversion failed"); |
|
1636 < } |
|
1637 < delete [] buffer; |
|
1638 --- |
|
1639 > throw SisUtilsException(const_cast<char *>("ParserError"), |
|
1640 > const_cast<char *>("wstring to string conversion failed")); |
|
1641 1375a1378 |
|
1642 > String reply(&buffer[0]); |
|
1643 1389,1391c1392,1394 |
|
1644 < int max = ::MultiByteToWideChar(CP_OEMCP,0,aNarrow.c_str(),aNarrow.length(),0,0); |
|
1645 < std::wstring reply; |
|
1646 < if (max > 0 ) |
|
1647 --- |
|
1648 > std::vector<char> buffer(mblen(aNarrow.c_str(),aNarrow.length()) + 2, '\0'); |
|
1649 > size_t nchars = mbstowcs((wchar_t *)&buffer[0],aNarrow.c_str(),buffer.size()); |
|
1650 > if (nchars == (size_t)-1) |
|
1651 1393,1403c1396,1397 |
|
1652 < wchar_t* buffer = new wchar_t [max]; |
|
1653 < try |
|
1654 < { |
|
1655 < ::MultiByteToWideChar(CP_OEMCP,0,aNarrow.c_str(),aNarrow.length(),buffer,max); |
|
1656 < reply = std::wstring (buffer, max); |
|
1657 < } |
|
1658 < catch (...) |
|
1659 < { |
|
1660 < throw SisUtilsException("ParserError", "string to wstring conversion failed"); |
|
1661 < } |
|
1662 < delete [] buffer; |
|
1663 --- |
|
1664 > throw SisUtilsException(const_cast<char *>("ParserError"), |
|
1665 > const_cast<char *>("string to wstring conversion failed")); |
|
1666 1404a1399 |
|
1667 > std::wstring reply((wchar_t *)&buffer[0]); |
|
1668 1417c1412 |
|
1669 < int CompareTwoString(wchar_t* string ,wchar_t* option) |
|
1670 --- |
|
1671 > int CompareTwoString(wchar_t const * string ,wchar_t const * option) |
|
1672 1418a1414 |
|
1673 > #if defined(WIN32) |
|
1674 1419a1416,1418 |
|
1675 > #elif defined(__LINUX__) |
|
1676 > return wcscasecmp(string,option); |
|
1677 > #endif |
|
1678 1432c1431 |
|
1679 < int CompareNString(wchar_t* string ,wchar_t* option, int len) |
|
1680 --- |
|
1681 > int CompareNString(wchar_t const * string ,wchar_t const * option, int len) |
|
1682 1434c1433 |
|
1683 < return wcsnicmp(string,option,len); |
|
1684 --- |
|
1685 > return wmemcmp(string,option,len); |
|
1686 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/src/sis2iby.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/sisutils/src/sis2iby.cpp |
|
1687 89c89 |
|
1688 < throw SisUtilsException((char*)sisFile.data(), "Failed to extract SIS file"); |
|
1689 --- |
|
1690 > throw SisUtilsException((char*)sisFile.data(), const_cast<char *>("Failed to extract SIS file")); |
|
1691 94c94 |
|
1692 < throw SisUtilsException((char*)sisFile.data(), "File not found"); |
|
1693 --- |
|
1694 > throw SisUtilsException((char*)sisFile.data(), const_cast<char *>("File not found")); |
|
1695 131c131 |
|
1696 < throw SisUtilsException((char*)iOutputPath.data(), "Failed to create path"); |
|
1697 --- |
|
1698 > throw SisUtilsException((char*)iOutputPath.data(), const_cast<char *>("Failed to create path")); |
|
1699 142c142 |
|
1700 < throw SisUtilsException((char*)ibyFile.data(), "Failed to create IBY file"); |
|
1701 --- |
|
1702 > throw SisUtilsException((char*)ibyFile.data(), const_cast<char *>("Failed to create IBY file")); |
|
1703 242c242 |
|
1704 < throw SisUtilsException((char*)pkgFileName.data(), "Could not create parser object"); |
|
1705 --- |
|
1706 > throw SisUtilsException((char*)pkgFileName.data(), const_cast<char *>("Could not create parser object")); |
|
1707 245c245,246 |
|
1708 < throw SisUtilsException((char*)pkgFileName.data(), "File not found"); |
|
1709 --- |
|
1710 > throw SisUtilsException(const_cast<char *>(pkgFileName.data()), |
|
1711 > const_cast<char *>("File not found")); |
|
1712 554c555,560 |
|
1713 < #error "TODO: Implement this function under other OS than Windows" |
|
1714 --- |
|
1715 > char fPath[FILENAME_MAX]; |
|
1716 > if (realpath(aFile.c_str(),fPath)) |
|
1717 > { |
|
1718 > aFile.assign(fPath); |
|
1719 > } |
|
1720 > |
|
1721 655c661,662 |
|
1722 < throw SisUtilsException((char*)aFile.data(), "Cannot open file"); |
|
1723 --- |
|
1724 > throw SisUtilsException(const_cast<char *>(aFile.data()), |
|
1725 > const_cast<char *>("Cannot open file")); |
|
1726 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/imgtools/sisutils/src/sisutils.cpp /home/imk/symbian/epocroot-pdk-3.0.h/build/imgtools/sisutils/src/sisutils.cpp |
|
1727 22a23,29 |
|
1728 > #ifdef __LINUX__ |
|
1729 > #include <vector> |
|
1730 > #include <cerrno> |
|
1731 > #include <sys/wait.h> |
|
1732 > #include <sys/stat.h> |
|
1733 > #endif |
|
1734 > |
|
1735 204c211,250 |
|
1736 < #error "TODO: Implement this function under other OS than Windows" |
|
1737 --- |
|
1738 > String::iterator pch = cmd.begin(); |
|
1739 > String::iterator end = cmd.end(); |
|
1740 > char *token = NULL; |
|
1741 > std::vector<char *> args; |
|
1742 > for ( ;pch != end; ++pch) |
|
1743 > { |
|
1744 > if (isspace(*pch)) |
|
1745 > { |
|
1746 > *pch = '\0'; |
|
1747 > if (token) { |
|
1748 > token = NULL; |
|
1749 > } |
|
1750 > } |
|
1751 > else if (!token) |
|
1752 > { |
|
1753 > token = &*pch; |
|
1754 > args.push_back(token); |
|
1755 > } |
|
1756 > } |
|
1757 > args.push_back(NULL); |
|
1758 > pid_t pid = fork(); |
|
1759 > if (pid == 0) |
|
1760 > { |
|
1761 > execv(args[0],&args[0]); |
|
1762 > } |
|
1763 > else if (pid < 0) |
|
1764 > { |
|
1765 > iExitCode = static_cast<TUint32>(STAT_FAILURE); |
|
1766 > } |
|
1767 > else |
|
1768 > { |
|
1769 > int rtc; |
|
1770 > pid_t ws = waitpid( pid, &rtc, 0); |
|
1771 > if (ws != pid) { |
|
1772 > iExitCode = static_cast<TUint32>(STAT_FAILURE); |
|
1773 > } |
|
1774 > else { |
|
1775 > iExitCode = rtc; |
|
1776 > } |
|
1777 > } |
|
1778 284c329,335 |
|
1779 < #error "TODO: Implement this function under other OS than Windows" |
|
1780 --- |
|
1781 > if(mkdir(dir.data(),777) != 0) |
|
1782 > { |
|
1783 > if(errno != EEXIST) |
|
1784 > { |
|
1785 > status = EFalse; |
|
1786 > } |
|
1787 > } |
|
1788 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/sbsv2/cpp-raptor/group/exports.inf /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/cpp-raptor/group/exports.inf |
|
1789 18,20c18,20 |
|
1790 < ../win32/bin/cpp.exe /tools/sbs/win32/bv/bin/cpp.exe |
|
1791 < ../win32/i686-pc-mingw32/bin/cc1.exe /tools/sbs/win32/bv/i686-pc-mingw32/bin/cc1.exe |
|
1792 < ../win32/i686-pc-mingw32/bin/libiconv-2.dll /tools/sbs/win32/bv/i686-pc-mingw32/bin/libiconv-2.dll |
|
1793 --- |
|
1794 > ../win32/bin/cpp.exe ../../tools/sbs/win32/bv/bin/cpp.exe |
|
1795 > ../win32/i686-pc-mingw32/bin/cc1.exe ../../tools/sbs/win32/bv/i686-pc-mingw32/bin/cc1.exe |
|
1796 > ../win32/i686-pc-mingw32/bin/libiconv-2.dll ../../tools/sbs/win32/bv/i686-pc-mingw32/bin/libiconv-2.dll |
|
1797 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/sbsv2/raptor/group/exports.inf /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/group/exports.inf |
|
1798 18,223c18,223 |
|
1799 < ../RELEASE-NOTES.txt /tools/sbs/RELEASE-NOTES.txt |
|
1800 < ../bin/sbs /tools/sbs/bin/sbs |
|
1801 < ../bin/fixmeta.py /tools/sbs/bin/fixmeta.py |
|
1802 < ../bin/codetest_osbuild.sh /tools/sbs/bin/codetest_osbuild.sh |
|
1803 < ../bin/countbinaries.sh /tools/sbs/bin/countbinaries.sh |
|
1804 < ../bin/gethost.sh /tools/sbs/bin/gethost.sh |
|
1805 < ../bin/failedstats.py /tools/sbs/bin/failedstats.py |
|
1806 < ../bin/sbs.bat /tools/sbs/bin/sbs.bat |
|
1807 < ../bin/unsplitdirs.py /tools/sbs/bin/unsplitdirs.py |
|
1808 < ../bin/buildstats.py /tools/sbs/bin/buildstats.py |
|
1809 < ../bin/speedtest_osbuild.sh /tools/sbs/bin/speedtest_osbuild.sh |
|
1810 < ../bin/sbsv2cache.py /tools/sbs/bin/sbsv2cache.py |
|
1811 < ../bin/whatsource.py /tools/sbs/bin/whatsource.py |
|
1812 < ../bin/oby2linux.py /tools/sbs/bin/oby2linux.py |
|
1813 < ../bin/createrfifile.pl /tools/sbs/bin/createrfifile.pl |
|
1814 < ../bin/vartoxml.py /tools/sbs/bin/vartoxml.py |
|
1815 < ../bin/readme.txt /tools/sbs/bin/readme.txt |
|
1816 < ../bin/squashlog.py /tools/sbs/bin/squashlog.py |
|
1817 < ../bin/statcollate.py /tools/sbs/bin/statcollate.py |
|
1818 < ../bin/createvmap.py /tools/sbs/bin/createvmap.py |
|
1819 < ../bin/raptorlog.py /tools/sbs/bin/raptorlog.py |
|
1820 < ../bin/osbuild.sh /tools/sbs/bin/osbuild.sh |
|
1821 < ../bin/setup_user.sh /tools/sbs/bin/setup_user.sh |
|
1822 < ../bin/msvcr71.dll /tools/sbs/bin/msvcr71.dll |
|
1823 < ../bin/install_raptor.sh /tools/sbs/bin/install_raptor.sh |
|
1824 < ../bin/mkgetfailed.py /tools/sbs/bin/mkgetfailed.py |
|
1825 < ../examples/os_properties.xml /tools/sbs/examples/os_properties.xml |
|
1826 < ../examples/sbs_init.xml /tools/sbs/examples/sbs_init.xml |
|
1827 < ../lib/flm/e32abiv2stdexe.flm /tools/sbs/lib/flm/e32abiv2stdexe.flm |
|
1828 < ../lib/flm/user/default.flm_ex /tools/sbs/lib/flm/user/default.flm_ex |
|
1829 < ../lib/flm/user/globals.mk_ex /tools/sbs/lib/flm/user/globals.mk_ex |
|
1830 < ../lib/flm/e32abiv2dll.flm /tools/sbs/lib/flm/e32abiv2dll.flm |
|
1831 < ../lib/flm/tracecompiler.mk /tools/sbs/lib/flm/tracecompiler.mk |
|
1832 < ../lib/flm/win32exe.flm /tools/sbs/lib/flm/win32exe.flm |
|
1833 < ../lib/flm/template_ext.flm /tools/sbs/lib/flm/template_ext.flm |
|
1834 < ../lib/flm/e32abiv2ani.flm /tools/sbs/lib/flm/e32abiv2ani.flm |
|
1835 < ../lib/flm/converged-comms/createcommdbs.flm /tools/sbs/lib/flm/converged-comms/createcommdbs.flm |
|
1836 < ../lib/flm/converged-comms/installdefaultcommdb.flm /tools/sbs/lib/flm/converged-comms/installdefaultcommdb.flm |
|
1837 < ../lib/flm/win32plugin.flm /tools/sbs/lib/flm/win32plugin.flm |
|
1838 < ../lib/flm/win32klib.flm /tools/sbs/lib/flm/win32klib.flm |
|
1839 < ../lib/flm/extensions.xml /tools/sbs/lib/flm/extensions.xml |
|
1840 < ../lib/flm/stack.mk /tools/sbs/lib/flm/stack.mk |
|
1841 < ../lib/flm/globals.mk /tools/sbs/lib/flm/globals.mk |
|
1842 < ../lib/flm/win32stdexe.flm /tools/sbs/lib/flm/win32stdexe.flm |
|
1843 < ../lib/flm/e32abiv2lib.flm /tools/sbs/lib/flm/e32abiv2lib.flm |
|
1844 < ../lib/flm/win32resource.flm /tools/sbs/lib/flm/win32resource.flm |
|
1845 < ../lib/flm/config/default.flm /tools/sbs/lib/flm/config/default.flm |
|
1846 < ../lib/flm/win32lib.flm /tools/sbs/lib/flm/win32lib.flm |
|
1847 < ../lib/flm/null.flm /tools/sbs/lib/flm/null.flm |
|
1848 < ../lib/flm/tools/test_command_diff.sh /tools/sbs/lib/flm/tools/test_command_diff.sh |
|
1849 < ../lib/flm/tools/stlport.flm /tools/sbs/lib/flm/tools/stlport.flm |
|
1850 < ../lib/flm/tools/buildstubsis.flm /tools/sbs/lib/flm/tools/buildstubsis.flm |
|
1851 < ../lib/flm/msvctools.xml /tools/sbs/lib/flm/msvctools.xml |
|
1852 < ../lib/flm/tools2lib.flm /tools/sbs/lib/flm/tools2lib.flm |
|
1853 < ../lib/flm/win32ldd.flm /tools/sbs/lib/flm/win32ldd.flm |
|
1854 < ../lib/flm/tools.xml /tools/sbs/lib/flm/tools.xml |
|
1855 < ../lib/flm/metaflm.mk /tools/sbs/lib/flm/metaflm.mk |
|
1856 < ../lib/flm/e32abiv2ldd.flm /tools/sbs/lib/flm/e32abiv2ldd.flm |
|
1857 < ../lib/flm/e32abiv2pdl.flm /tools/sbs/lib/flm/e32abiv2pdl.flm |
|
1858 < ../lib/flm/e32abiv2stdlib.flm /tools/sbs/lib/flm/e32abiv2stdlib.flm |
|
1859 < ../lib/flm/config.xml /tools/sbs/lib/flm/config.xml |
|
1860 < ../lib/flm/win32stddll.flm /tools/sbs/lib/flm/win32stddll.flm |
|
1861 < ../lib/flm/gccxmlresource.flm /tools/sbs/lib/flm/gccxmlresource.flm |
|
1862 < ../lib/flm/e32abiv2textnotifier2.flm /tools/sbs/lib/flm/e32abiv2textnotifier2.flm |
|
1863 < ../lib/flm/e32abiv2implib.flm /tools/sbs/lib/flm/e32abiv2implib.flm |
|
1864 < ../lib/flm/e32abiv2exe.flm /tools/sbs/lib/flm/e32abiv2exe.flm |
|
1865 < ../lib/flm/win32pdl.flm /tools/sbs/lib/flm/win32pdl.flm |
|
1866 < ../lib/flm/win32.flm /tools/sbs/lib/flm/win32.flm |
|
1867 < ../lib/flm/base.xml /tools/sbs/lib/flm/base.xml |
|
1868 < ../lib/flm/grouping.flm /tools/sbs/lib/flm/grouping.flm |
|
1869 < ../lib/flm/e32abiv2.flm /tools/sbs/lib/flm/e32abiv2.flm |
|
1870 < ../lib/flm/e32abiv2exexp.flm /tools/sbs/lib/flm/e32abiv2exexp.flm |
|
1871 < ../lib/flm/e32abiv2defaults.mk /tools/sbs/lib/flm/e32abiv2defaults.mk |
|
1872 < ../lib/flm/e32abiv2fsy.flm /tools/sbs/lib/flm/e32abiv2fsy.flm |
|
1873 < ../lib/flm/final.mk /tools/sbs/lib/flm/final.mk |
|
1874 < ../lib/flm/none.flm /tools/sbs/lib/flm/none.flm |
|
1875 < ../lib/flm/analysis.xml /tools/sbs/lib/flm/analysis.xml |
|
1876 < ../lib/flm/e32abiv2var2.flm /tools/sbs/lib/flm/e32abiv2var2.flm |
|
1877 < ../lib/flm/msvctools.flm /tools/sbs/lib/flm/msvctools.flm |
|
1878 < ../lib/flm/win32kdll.flm /tools/sbs/lib/flm/win32kdll.flm |
|
1879 < ../lib/flm/win32ani.flm /tools/sbs/lib/flm/win32ani.flm |
|
1880 < ../lib/flm/e32abiv2plugin.flm /tools/sbs/lib/flm/e32abiv2plugin.flm |
|
1881 < ../lib/flm/win32bitmap.flm /tools/sbs/lib/flm/win32bitmap.flm |
|
1882 < ../lib/flm/tools2common.flm /tools/sbs/lib/flm/tools2common.flm |
|
1883 < ../lib/flm/win32fsy.flm /tools/sbs/lib/flm/win32fsy.flm |
|
1884 < ../lib/flm/readme.txt /tools/sbs/lib/flm/readme.txt |
|
1885 < ../lib/flm/e32abiv2kext.flm /tools/sbs/lib/flm/e32abiv2kext.flm |
|
1886 < ../lib/flm/e32abiv2stddll.flm /tools/sbs/lib/flm/e32abiv2stddll.flm |
|
1887 < ../lib/flm/win32exexp.flm /tools/sbs/lib/flm/win32exexp.flm |
|
1888 < ../lib/flm/stringtable.flm /tools/sbs/lib/flm/stringtable.flm |
|
1889 < ../lib/flm/utils/utility.xml /tools/sbs/lib/flm/utils/utility.xml |
|
1890 < ../lib/flm/utils/prebuilt.flm /tools/sbs/lib/flm/utils/prebuilt.flm |
|
1891 < ../lib/flm/utils/copydir.flm /tools/sbs/lib/flm/utils/copydir.flm |
|
1892 < ../lib/flm/win32pdd.flm /tools/sbs/lib/flm/win32pdd.flm |
|
1893 < ../lib/flm/taggedrules.mk /tools/sbs/lib/flm/taggedrules.mk |
|
1894 < ../lib/flm/booleanlogic.mk /tools/sbs/lib/flm/booleanlogic.mk |
|
1895 < ../lib/flm/emulator.xml /tools/sbs/lib/flm/emulator.xml |
|
1896 < ../lib/flm/win32kext.flm /tools/sbs/lib/flm/win32kext.flm |
|
1897 < ../lib/flm/test/exeabiv2_2/test.cpp /tools/sbs/lib/flm/test/exeabiv2_2/test.cpp |
|
1898 < ../lib/flm/test/exeabiv2_2/test_function.cpp /tools/sbs/lib/flm/test/exeabiv2_2/test_function.cpp |
|
1899 < ../lib/flm/test/exeabiv2_2/exeabiv2_2.mk /tools/sbs/lib/flm/test/exeabiv2_2/exeabiv2_2.mk |
|
1900 < ../lib/flm/test/templateext/temex.mk /tools/sbs/lib/flm/test/templateext/temex.mk |
|
1901 < ../lib/flm/test/templateext/Makefile /tools/sbs/lib/flm/test/templateext/Makefile |
|
1902 < ../lib/flm/test/Makefile /tools/sbs/lib/flm/test/Makefile |
|
1903 < ../lib/flm/test/exeabiv2_4/test.cpp /tools/sbs/lib/flm/test/exeabiv2_4/test.cpp |
|
1904 < ../lib/flm/test/exeabiv2_4/exeabiv2_4.mk /tools/sbs/lib/flm/test/exeabiv2_4/exeabiv2_4.mk |
|
1905 < ../lib/flm/test/exeabiv2_4/test_big.cpp /tools/sbs/lib/flm/test/exeabiv2_4/test_big.cpp |
|
1906 < ../lib/flm/test/flmtests.mk /tools/sbs/lib/flm/test/flmtests.mk |
|
1907 < ../lib/flm/test/ciaabiv2_1/uc_exe.cia /tools/sbs/lib/flm/test/ciaabiv2_1/uc_exe.cia |
|
1908 < ../lib/flm/test/ciaabiv2_1/uc_exe.cpp /tools/sbs/lib/flm/test/ciaabiv2_1/uc_exe.cpp |
|
1909 < ../lib/flm/test/ciaabiv2_1/ciaabiv2_1.mk /tools/sbs/lib/flm/test/ciaabiv2_1/ciaabiv2_1.mk |
|
1910 < ../lib/flm/test/export1/Makefile /tools/sbs/lib/flm/test/export1/Makefile |
|
1911 < ../lib/flm/test/export1/t1e.h /tools/sbs/lib/flm/test/export1/t1e.h |
|
1912 < ../lib/flm/test/export1/t4e.h /tools/sbs/lib/flm/test/export1/t4e.h |
|
1913 < ../lib/flm/test/export1/t2e.h /tools/sbs/lib/flm/test/export1/t2e.h |
|
1914 < ../lib/flm/test/export1/t3e.h /tools/sbs/lib/flm/test/export1/t3e.h |
|
1915 < ../lib/flm/test/dllabiv2_1/test.cpp /tools/sbs/lib/flm/test/dllabiv2_1/test.cpp |
|
1916 < ../lib/flm/test/dllabiv2_1/dllabiv2_1.mk /tools/sbs/lib/flm/test/dllabiv2_1/dllabiv2_1.mk |
|
1917 < ../lib/flm/test/raptorglue/raptorglue.mk /tools/sbs/lib/flm/test/raptorglue/raptorglue.mk |
|
1918 < ../lib/flm/test/dllbasictests.mk /tools/sbs/lib/flm/test/dllbasictests.mk |
|
1919 < ../lib/flm/test/exeabiv2_1/test.cpp /tools/sbs/lib/flm/test/exeabiv2_1/test.cpp |
|
1920 < ../lib/flm/test/exeabiv2_1/exeabiv2_1.mk /tools/sbs/lib/flm/test/exeabiv2_1/exeabiv2_1.mk |
|
1921 < ../lib/flm/test/dllabiv2_defaults.mk /tools/sbs/lib/flm/test/dllabiv2_defaults.mk |
|
1922 < ../lib/flm/test/exeperftests.mk /tools/sbs/lib/flm/test/exeperftests.mk |
|
1923 < ../lib/flm/test/ciatests.mk /tools/sbs/lib/flm/test/ciatests.mk |
|
1924 < ../lib/flm/test/environment/pvm/pvmtest.mk /tools/sbs/lib/flm/test/environment/pvm/pvmtest.mk |
|
1925 < ../lib/flm/test/environment/make/test_variable_restore.mk /tools/sbs/lib/flm/test/environment/make/test_variable_restore.mk |
|
1926 < ../lib/flm/test/exebasictests.mk /tools/sbs/lib/flm/test/exebasictests.mk |
|
1927 < ../lib/flm/test/exeabiv2_defaults.mk /tools/sbs/lib/flm/test/exeabiv2_defaults.mk |
|
1928 < ../lib/flm/test/exeabiv2_3/exeabiv2_3.mk /tools/sbs/lib/flm/test/exeabiv2_3/exeabiv2_3.mk |
|
1929 < ../lib/flm/test/exeabiv2_3/test_big.cpp /tools/sbs/lib/flm/test/exeabiv2_3/test_big.cpp |
|
1930 < ../lib/flm/win32stdlib.flm /tools/sbs/lib/flm/win32stdlib.flm |
|
1931 < ../lib/flm/win32var2.flm /tools/sbs/lib/flm/win32var2.flm |
|
1932 < ../lib/flm/win32implib.flm /tools/sbs/lib/flm/win32implib.flm |
|
1933 < ../lib/flm/bitmap.flm /tools/sbs/lib/flm/bitmap.flm |
|
1934 < ../lib/flm/build.flm /tools/sbs/lib/flm/build.flm |
|
1935 < ../lib/flm/build.xml /tools/sbs/lib/flm/build.xml |
|
1936 < ../lib/flm/tools2exe.flm /tools/sbs/lib/flm/tools2exe.flm |
|
1937 < ../lib/flm/e32abiv2klib.flm /tools/sbs/lib/flm/e32abiv2klib.flm |
|
1938 < ../lib/flm/standard.xml /tools/sbs/lib/flm/standard.xml |
|
1939 < ../lib/flm/win32var.flm /tools/sbs/lib/flm/win32var.flm |
|
1940 < ../lib/flm/e32abiv2pdd.flm /tools/sbs/lib/flm/e32abiv2pdd.flm |
|
1941 < ../lib/flm/e32abiv2none.flm /tools/sbs/lib/flm/e32abiv2none.flm |
|
1942 < ../lib/flm/romfile.mk /tools/sbs/lib/flm/romfile.mk |
|
1943 < ../lib/flm/win32textnotifier2.flm /tools/sbs/lib/flm/win32textnotifier2.flm |
|
1944 < ../lib/flm/resource.flm /tools/sbs/lib/flm/resource.flm |
|
1945 < ../lib/flm/flmtools.mk /tools/sbs/lib/flm/flmtools.mk |
|
1946 < ../lib/flm/gnumakefile.flm /tools/sbs/lib/flm/gnumakefile.flm |
|
1947 < ../lib/flm/e32abiv2kdll.flm /tools/sbs/lib/flm/e32abiv2kdll.flm |
|
1948 < ../lib/flm/e32abiv2var.flm /tools/sbs/lib/flm/e32abiv2var.flm |
|
1949 < ../lib/flm/win32dll.flm /tools/sbs/lib/flm/win32dll.flm |
|
1950 < ../lib/flm/gccxml.flm /tools/sbs/lib/flm/gccxml.flm |
|
1951 < ../lib/flm/e32postlink.mk /tools/sbs/lib/flm/e32postlink.mk |
|
1952 < ../lib/config/default.xml /tools/sbs/lib/config/default.xml |
|
1953 < ../lib/config/build.xml /tools/sbs/lib/config/build.xml |
|
1954 < ../lib/config/interfaces.xml /tools/sbs/lib/config/interfaces.xml |
|
1955 < ../lib/config/gcc.xml /tools/sbs/lib/config/gcc.xml |
|
1956 < ../lib/config/variants.xml /tools/sbs/lib/config/variants.xml |
|
1957 < ../lib/config/coverity.xml /tools/sbs/lib/config/coverity.xml |
|
1958 < ../lib/config/meta.xml /tools/sbs/lib/config/meta.xml |
|
1959 < ../lib/config/locations.xml /tools/sbs/lib/config/locations.xml |
|
1960 < ../lib/config/gccxml.xml /tools/sbs/lib/config/gccxml.xml |
|
1961 < ../lib/config/carbide.xml /tools/sbs/lib/config/carbide.xml |
|
1962 < ../lib/config/msvc.xml /tools/sbs/lib/config/msvc.xml |
|
1963 < ../lib/config/make.xml /tools/sbs/lib/config/make.xml |
|
1964 < ../lib/config/root.xml /tools/sbs/lib/config/root.xml |
|
1965 < ../lib/config/winscw.xml /tools/sbs/lib/config/winscw.xml |
|
1966 < ../lib/config/arm.xml /tools/sbs/lib/config/arm.xml |
|
1967 < ../lib/config/gcce.xml /tools/sbs/lib/config/gcce.xml |
|
1968 < ../lib/config/rvct.xml /tools/sbs/lib/config/rvct.xml |
|
1969 < ../python/raptor_makefile.py /tools/sbs/python/raptor_makefile.py |
|
1970 < ../python/filter_interface.py /tools/sbs/python/filter_interface.py |
|
1971 < ../python/raptor_start.py /tools/sbs/python/raptor_start.py |
|
1972 < ../python/pyparsing.py /tools/sbs/python/pyparsing.py |
|
1973 < ../python/raptor_cli.py /tools/sbs/python/raptor_cli.py |
|
1974 < ../python/raptor_cache.py /tools/sbs/python/raptor_cache.py |
|
1975 < ../python/raptor_meta.py /tools/sbs/python/raptor_meta.py |
|
1976 < ../python/raptor_xml.py /tools/sbs/python/raptor_xml.py |
|
1977 < ../python/raptor_version.py /tools/sbs/python/raptor_version.py |
|
1978 < ../python/generic_path.py /tools/sbs/python/generic_path.py |
|
1979 < ../python/raptor_make.py /tools/sbs/python/raptor_make.py |
|
1980 < ../python/plugins/filter_logfile.py /tools/sbs/python/plugins/filter_logfile.py |
|
1981 < ../python/plugins/filter_terminal.py /tools/sbs/python/plugins/filter_terminal.py |
|
1982 < ../python/plugins/filter_carbide.py /tools/sbs/python/plugins/filter_carbide.py |
|
1983 < ../python/plugins/filter_what.py /tools/sbs/python/plugins/filter_what.py |
|
1984 < ../python/plugins/dummyplugin.py /tools/sbs/python/plugins/dummyplugin.py |
|
1985 < ../python/plugins/filter_clean.py /tools/sbs/python/plugins/filter_clean.py |
|
1986 < ../python/plugins/filter_squashlog.py /tools/sbs/python/plugins/filter_squashlog.py |
|
1987 < ../python/plugins/filter_checksource.py /tools/sbs/python/plugins/filter_checksource.py |
|
1988 < ../python/plugins/filter_splitlog.py /tools/sbs/python/plugins/filter_splitlog.py |
|
1989 < ../python/sbs_dist.py /tools/sbs/python/sbs_dist.py |
|
1990 < ../python/raptor_utilities.py /tools/sbs/python/raptor_utilities.py |
|
1991 < ../python/pluginbox.py /tools/sbs/python/pluginbox.py |
|
1992 < ../python/dos2unix.py /tools/sbs/python/dos2unix.py |
|
1993 < ../python/raptor_data.py /tools/sbs/python/raptor_data.py |
|
1994 < ../python/filter_list.py /tools/sbs/python/filter_list.py |
|
1995 < ../python/raptor.py /tools/sbs/python/raptor.py |
|
1996 < ../python/mmpparser.py /tools/sbs/python/mmpparser.py |
|
1997 < ../python/filter_utils.py /tools/sbs/python/filter_utils.py |
|
1998 < ../schema/build/2_0.xsd /tools/sbs/schema/build/2_0.xsd |
|
1999 < ../schema/build/log/1_0.xsd /tools/sbs/schema/build/log/1_0.xsd |
|
2000 < ../schema/build/1_0.xsd /tools/sbs/schema/build/1_0.xsd |
|
2001 < ../win32/bin/ransleep.exe /tools/sbs/win32/bin/ransleep.exe |
|
2002 < ../win32/bin/sbs_descramble.exe /tools/sbs/win32/bin/sbs_descramble.exe |
|
2003 < ../win32/bin/talonctl.exe /tools/sbs/win32/bin/talonctl.exe |
|
2004 < ../win32/bin/talon.exe /tools/sbs/win32/bin/talon.exe |
|
2005 --- |
|
2006 > ../RELEASE-NOTES.txt ../../tools/sbs/RELEASE-NOTES.txt |
|
2007 > ../bin/sbs ../../tools/sbs/bin/sbs |
|
2008 > ../bin/fixmeta.py ../../tools/sbs/bin/fixmeta.py |
|
2009 > ../bin/codetest_osbuild.sh ../../tools/sbs/bin/codetest_osbuild.sh |
|
2010 > ../bin/countbinaries.sh ../../tools/sbs/bin/countbinaries.sh |
|
2011 > ../bin/gethost.sh ../../tools/sbs/bin/gethost.sh |
|
2012 > ../bin/failedstats.py ../../tools/sbs/bin/failedstats.py |
|
2013 > ../bin/sbs.bat ../../tools/sbs/bin/sbs.bat |
|
2014 > ../bin/unsplitdirs.py ../../tools/sbs/bin/unsplitdirs.py |
|
2015 > ../bin/buildstats.py ../../tools/sbs/bin/buildstats.py |
|
2016 > ../bin/speedtest_osbuild.sh ../../tools/sbs/bin/speedtest_osbuild.sh |
|
2017 > ../bin/sbsv2cache.py ../../tools/sbs/bin/sbsv2cache.py |
|
2018 > ../bin/whatsource.py ../../tools/sbs/bin/whatsource.py |
|
2019 > ../bin/oby2linux.py ../../tools/sbs/bin/oby2linux.py |
|
2020 > ../bin/createrfifile.pl ../../tools/sbs/bin/createrfifile.pl |
|
2021 > ../bin/vartoxml.py ../../tools/sbs/bin/vartoxml.py |
|
2022 > ../bin/readme.txt ../../tools/sbs/bin/readme.txt |
|
2023 > ../bin/squashlog.py ../../tools/sbs/bin/squashlog.py |
|
2024 > ../bin/statcollate.py ../../tools/sbs/bin/statcollate.py |
|
2025 > ../bin/createvmap.py ../../tools/sbs/bin/createvmap.py |
|
2026 > ../bin/raptorlog.py ../../tools/sbs/bin/raptorlog.py |
|
2027 > ../bin/osbuild.sh ../../tools/sbs/bin/osbuild.sh |
|
2028 > ../bin/setup_user.sh ../../tools/sbs/bin/setup_user.sh |
|
2029 > ../bin/msvcr71.dll ../../tools/sbs/bin/msvcr71.dll |
|
2030 > ../bin/install_raptor.sh ../../tools/sbs/bin/install_raptor.sh |
|
2031 > ../bin/mkgetfailed.py ../../tools/sbs/bin/mkgetfailed.py |
|
2032 > ../examples/os_properties.xml ../../tools/sbs/examples/os_properties.xml |
|
2033 > ../examples/sbs_init.xml ../../tools/sbs/examples/sbs_init.xml |
|
2034 > ../lib/flm/e32abiv2stdexe.flm ../../tools/sbs/lib/flm/e32abiv2stdexe.flm |
|
2035 > ../lib/flm/user/default.flm_ex ../../tools/sbs/lib/flm/user/default.flm_ex |
|
2036 > ../lib/flm/user/globals.mk_ex ../../tools/sbs/lib/flm/user/globals.mk_ex |
|
2037 > ../lib/flm/e32abiv2dll.flm ../../tools/sbs/lib/flm/e32abiv2dll.flm |
|
2038 > ../lib/flm/tracecompiler.mk ../../tools/sbs/lib/flm/tracecompiler.mk |
|
2039 > ../lib/flm/win32exe.flm ../../tools/sbs/lib/flm/win32exe.flm |
|
2040 > ../lib/flm/template_ext.flm ../../tools/sbs/lib/flm/template_ext.flm |
|
2041 > ../lib/flm/e32abiv2ani.flm ../../tools/sbs/lib/flm/e32abiv2ani.flm |
|
2042 > ../lib/flm/converged-comms/createcommdbs.flm ../../tools/sbs/lib/flm/converged-comms/createcommdbs.flm |
|
2043 > ../lib/flm/converged-comms/installdefaultcommdb.flm ../../tools/sbs/lib/flm/converged-comms/installdefaultcommdb.flm |
|
2044 > ../lib/flm/win32plugin.flm ../../tools/sbs/lib/flm/win32plugin.flm |
|
2045 > ../lib/flm/win32klib.flm ../../tools/sbs/lib/flm/win32klib.flm |
|
2046 > ../lib/flm/extensions.xml ../../tools/sbs/lib/flm/extensions.xml |
|
2047 > ../lib/flm/stack.mk ../../tools/sbs/lib/flm/stack.mk |
|
2048 > ../lib/flm/globals.mk ../../tools/sbs/lib/flm/globals.mk |
|
2049 > ../lib/flm/win32stdexe.flm ../../tools/sbs/lib/flm/win32stdexe.flm |
|
2050 > ../lib/flm/e32abiv2lib.flm ../../tools/sbs/lib/flm/e32abiv2lib.flm |
|
2051 > ../lib/flm/win32resource.flm ../../tools/sbs/lib/flm/win32resource.flm |
|
2052 > ../lib/flm/config/default.flm ../../tools/sbs/lib/flm/config/default.flm |
|
2053 > ../lib/flm/win32lib.flm ../../tools/sbs/lib/flm/win32lib.flm |
|
2054 > ../lib/flm/null.flm ../../tools/sbs/lib/flm/null.flm |
|
2055 > ../lib/flm/tools/test_command_diff.sh ../../tools/sbs/lib/flm/tools/test_command_diff.sh |
|
2056 > ../lib/flm/tools/stlport.flm ../../tools/sbs/lib/flm/tools/stlport.flm |
|
2057 > ../lib/flm/tools/buildstubsis.flm ../../tools/sbs/lib/flm/tools/buildstubsis.flm |
|
2058 > ../lib/flm/msvctools.xml ../../tools/sbs/lib/flm/msvctools.xml |
|
2059 > ../lib/flm/tools2lib.flm ../../tools/sbs/lib/flm/tools2lib.flm |
|
2060 > ../lib/flm/win32ldd.flm ../../tools/sbs/lib/flm/win32ldd.flm |
|
2061 > ../lib/flm/tools.xml ../../tools/sbs/lib/flm/tools.xml |
|
2062 > ../lib/flm/metaflm.mk ../../tools/sbs/lib/flm/metaflm.mk |
|
2063 > ../lib/flm/e32abiv2ldd.flm ../../tools/sbs/lib/flm/e32abiv2ldd.flm |
|
2064 > ../lib/flm/e32abiv2pdl.flm ../../tools/sbs/lib/flm/e32abiv2pdl.flm |
|
2065 > ../lib/flm/e32abiv2stdlib.flm ../../tools/sbs/lib/flm/e32abiv2stdlib.flm |
|
2066 > ../lib/flm/config.xml ../../tools/sbs/lib/flm/config.xml |
|
2067 > ../lib/flm/win32stddll.flm ../../tools/sbs/lib/flm/win32stddll.flm |
|
2068 > ../lib/flm/gccxmlresource.flm ../../tools/sbs/lib/flm/gccxmlresource.flm |
|
2069 > ../lib/flm/e32abiv2textnotifier2.flm ../../tools/sbs/lib/flm/e32abiv2textnotifier2.flm |
|
2070 > ../lib/flm/e32abiv2implib.flm ../../tools/sbs/lib/flm/e32abiv2implib.flm |
|
2071 > ../lib/flm/e32abiv2exe.flm ../../tools/sbs/lib/flm/e32abiv2exe.flm |
|
2072 > ../lib/flm/win32pdl.flm ../../tools/sbs/lib/flm/win32pdl.flm |
|
2073 > ../lib/flm/win32.flm ../../tools/sbs/lib/flm/win32.flm |
|
2074 > ../lib/flm/base.xml ../../tools/sbs/lib/flm/base.xml |
|
2075 > ../lib/flm/grouping.flm ../../tools/sbs/lib/flm/grouping.flm |
|
2076 > ../lib/flm/e32abiv2.flm ../../tools/sbs/lib/flm/e32abiv2.flm |
|
2077 > ../lib/flm/e32abiv2exexp.flm ../../tools/sbs/lib/flm/e32abiv2exexp.flm |
|
2078 > ../lib/flm/e32abiv2defaults.mk ../../tools/sbs/lib/flm/e32abiv2defaults.mk |
|
2079 > ../lib/flm/e32abiv2fsy.flm ../../tools/sbs/lib/flm/e32abiv2fsy.flm |
|
2080 > ../lib/flm/final.mk ../../tools/sbs/lib/flm/final.mk |
|
2081 > ../lib/flm/none.flm ../../tools/sbs/lib/flm/none.flm |
|
2082 > ../lib/flm/analysis.xml ../../tools/sbs/lib/flm/analysis.xml |
|
2083 > ../lib/flm/e32abiv2var2.flm ../../tools/sbs/lib/flm/e32abiv2var2.flm |
|
2084 > ../lib/flm/msvctools.flm ../../tools/sbs/lib/flm/msvctools.flm |
|
2085 > ../lib/flm/win32kdll.flm ../../tools/sbs/lib/flm/win32kdll.flm |
|
2086 > ../lib/flm/win32ani.flm ../../tools/sbs/lib/flm/win32ani.flm |
|
2087 > ../lib/flm/e32abiv2plugin.flm ../../tools/sbs/lib/flm/e32abiv2plugin.flm |
|
2088 > ../lib/flm/win32bitmap.flm ../../tools/sbs/lib/flm/win32bitmap.flm |
|
2089 > ../lib/flm/tools2common.flm ../../tools/sbs/lib/flm/tools2common.flm |
|
2090 > ../lib/flm/win32fsy.flm ../../tools/sbs/lib/flm/win32fsy.flm |
|
2091 > ../lib/flm/readme.txt ../../tools/sbs/lib/flm/readme.txt |
|
2092 > ../lib/flm/e32abiv2kext.flm ../../tools/sbs/lib/flm/e32abiv2kext.flm |
|
2093 > ../lib/flm/e32abiv2stddll.flm ../../tools/sbs/lib/flm/e32abiv2stddll.flm |
|
2094 > ../lib/flm/win32exexp.flm ../../tools/sbs/lib/flm/win32exexp.flm |
|
2095 > ../lib/flm/stringtable.flm ../../tools/sbs/lib/flm/stringtable.flm |
|
2096 > ../lib/flm/utils/utility.xml ../../tools/sbs/lib/flm/utils/utility.xml |
|
2097 > ../lib/flm/utils/prebuilt.flm ../../tools/sbs/lib/flm/utils/prebuilt.flm |
|
2098 > ../lib/flm/utils/copydir.flm ../../tools/sbs/lib/flm/utils/copydir.flm |
|
2099 > ../lib/flm/win32pdd.flm ../../tools/sbs/lib/flm/win32pdd.flm |
|
2100 > ../lib/flm/taggedrules.mk ../../tools/sbs/lib/flm/taggedrules.mk |
|
2101 > ../lib/flm/booleanlogic.mk ../../tools/sbs/lib/flm/booleanlogic.mk |
|
2102 > ../lib/flm/emulator.xml ../../tools/sbs/lib/flm/emulator.xml |
|
2103 > ../lib/flm/win32kext.flm ../../tools/sbs/lib/flm/win32kext.flm |
|
2104 > ../lib/flm/test/exeabiv2_2/test.cpp ../../tools/sbs/lib/flm/test/exeabiv2_2/test.cpp |
|
2105 > ../lib/flm/test/exeabiv2_2/test_function.cpp ../../tools/sbs/lib/flm/test/exeabiv2_2/test_function.cpp |
|
2106 > ../lib/flm/test/exeabiv2_2/exeabiv2_2.mk ../../tools/sbs/lib/flm/test/exeabiv2_2/exeabiv2_2.mk |
|
2107 > ../lib/flm/test/templateext/temex.mk ../../tools/sbs/lib/flm/test/templateext/temex.mk |
|
2108 > ../lib/flm/test/templateext/Makefile ../../tools/sbs/lib/flm/test/templateext/Makefile |
|
2109 > ../lib/flm/test/Makefile ../../tools/sbs/lib/flm/test/Makefile |
|
2110 > ../lib/flm/test/exeabiv2_4/test.cpp ../../tools/sbs/lib/flm/test/exeabiv2_4/test.cpp |
|
2111 > ../lib/flm/test/exeabiv2_4/exeabiv2_4.mk ../../tools/sbs/lib/flm/test/exeabiv2_4/exeabiv2_4.mk |
|
2112 > ../lib/flm/test/exeabiv2_4/test_big.cpp ../../tools/sbs/lib/flm/test/exeabiv2_4/test_big.cpp |
|
2113 > ../lib/flm/test/flmtests.mk ../../tools/sbs/lib/flm/test/flmtests.mk |
|
2114 > ../lib/flm/test/ciaabiv2_1/uc_exe.cia ../../tools/sbs/lib/flm/test/ciaabiv2_1/uc_exe.cia |
|
2115 > ../lib/flm/test/ciaabiv2_1/uc_exe.cpp ../../tools/sbs/lib/flm/test/ciaabiv2_1/uc_exe.cpp |
|
2116 > ../lib/flm/test/ciaabiv2_1/ciaabiv2_1.mk ../../tools/sbs/lib/flm/test/ciaabiv2_1/ciaabiv2_1.mk |
|
2117 > ../lib/flm/test/export1/Makefile ../../tools/sbs/lib/flm/test/export1/Makefile |
|
2118 > ../lib/flm/test/export1/t1e.h ../../tools/sbs/lib/flm/test/export1/t1e.h |
|
2119 > ../lib/flm/test/export1/t4e.h ../../tools/sbs/lib/flm/test/export1/t4e.h |
|
2120 > ../lib/flm/test/export1/t2e.h ../../tools/sbs/lib/flm/test/export1/t2e.h |
|
2121 > ../lib/flm/test/export1/t3e.h ../../tools/sbs/lib/flm/test/export1/t3e.h |
|
2122 > ../lib/flm/test/dllabiv2_1/test.cpp ../../tools/sbs/lib/flm/test/dllabiv2_1/test.cpp |
|
2123 > ../lib/flm/test/dllabiv2_1/dllabiv2_1.mk ../../tools/sbs/lib/flm/test/dllabiv2_1/dllabiv2_1.mk |
|
2124 > ../lib/flm/test/raptorglue/raptorglue.mk ../../tools/sbs/lib/flm/test/raptorglue/raptorglue.mk |
|
2125 > ../lib/flm/test/dllbasictests.mk ../../tools/sbs/lib/flm/test/dllbasictests.mk |
|
2126 > ../lib/flm/test/exeabiv2_1/test.cpp ../../tools/sbs/lib/flm/test/exeabiv2_1/test.cpp |
|
2127 > ../lib/flm/test/exeabiv2_1/exeabiv2_1.mk ../../tools/sbs/lib/flm/test/exeabiv2_1/exeabiv2_1.mk |
|
2128 > ../lib/flm/test/dllabiv2_defaults.mk ../../tools/sbs/lib/flm/test/dllabiv2_defaults.mk |
|
2129 > ../lib/flm/test/exeperftests.mk ../../tools/sbs/lib/flm/test/exeperftests.mk |
|
2130 > ../lib/flm/test/ciatests.mk ../../tools/sbs/lib/flm/test/ciatests.mk |
|
2131 > ../lib/flm/test/environment/pvm/pvmtest.mk ../../tools/sbs/lib/flm/test/environment/pvm/pvmtest.mk |
|
2132 > ../lib/flm/test/environment/make/test_variable_restore.mk ../../tools/sbs/lib/flm/test/environment/make/test_variable_restore.mk |
|
2133 > ../lib/flm/test/exebasictests.mk ../../tools/sbs/lib/flm/test/exebasictests.mk |
|
2134 > ../lib/flm/test/exeabiv2_defaults.mk ../../tools/sbs/lib/flm/test/exeabiv2_defaults.mk |
|
2135 > ../lib/flm/test/exeabiv2_3/exeabiv2_3.mk ../../tools/sbs/lib/flm/test/exeabiv2_3/exeabiv2_3.mk |
|
2136 > ../lib/flm/test/exeabiv2_3/test_big.cpp ../../tools/sbs/lib/flm/test/exeabiv2_3/test_big.cpp |
|
2137 > ../lib/flm/win32stdlib.flm ../../tools/sbs/lib/flm/win32stdlib.flm |
|
2138 > ../lib/flm/win32var2.flm ../../tools/sbs/lib/flm/win32var2.flm |
|
2139 > ../lib/flm/win32implib.flm ../../tools/sbs/lib/flm/win32implib.flm |
|
2140 > ../lib/flm/bitmap.flm ../../tools/sbs/lib/flm/bitmap.flm |
|
2141 > ../lib/flm/build.flm ../../tools/sbs/lib/flm/build.flm |
|
2142 > ../lib/flm/build.xml ../../tools/sbs/lib/flm/build.xml |
|
2143 > ../lib/flm/tools2exe.flm ../../tools/sbs/lib/flm/tools2exe.flm |
|
2144 > ../lib/flm/e32abiv2klib.flm ../../tools/sbs/lib/flm/e32abiv2klib.flm |
|
2145 > ../lib/flm/standard.xml ../../tools/sbs/lib/flm/standard.xml |
|
2146 > ../lib/flm/win32var.flm ../../tools/sbs/lib/flm/win32var.flm |
|
2147 > ../lib/flm/e32abiv2pdd.flm ../../tools/sbs/lib/flm/e32abiv2pdd.flm |
|
2148 > ../lib/flm/e32abiv2none.flm ../../tools/sbs/lib/flm/e32abiv2none.flm |
|
2149 > ../lib/flm/romfile.mk ../../tools/sbs/lib/flm/romfile.mk |
|
2150 > ../lib/flm/win32textnotifier2.flm ../../tools/sbs/lib/flm/win32textnotifier2.flm |
|
2151 > ../lib/flm/resource.flm ../../tools/sbs/lib/flm/resource.flm |
|
2152 > ../lib/flm/flmtools.mk ../../tools/sbs/lib/flm/flmtools.mk |
|
2153 > ../lib/flm/gnumakefile.flm ../../tools/sbs/lib/flm/gnumakefile.flm |
|
2154 > ../lib/flm/e32abiv2kdll.flm ../../tools/sbs/lib/flm/e32abiv2kdll.flm |
|
2155 > ../lib/flm/e32abiv2var.flm ../../tools/sbs/lib/flm/e32abiv2var.flm |
|
2156 > ../lib/flm/win32dll.flm ../../tools/sbs/lib/flm/win32dll.flm |
|
2157 > ../lib/flm/gccxml.flm ../../tools/sbs/lib/flm/gccxml.flm |
|
2158 > ../lib/flm/e32postlink.mk ../../tools/sbs/lib/flm/e32postlink.mk |
|
2159 > ../lib/config/default.xml ../../tools/sbs/lib/config/default.xml |
|
2160 > ../lib/config/build.xml ../../tools/sbs/lib/config/build.xml |
|
2161 > ../lib/config/interfaces.xml ../../tools/sbs/lib/config/interfaces.xml |
|
2162 > ../lib/config/gcc.xml ../../tools/sbs/lib/config/gcc.xml |
|
2163 > ../lib/config/variants.xml ../../tools/sbs/lib/config/variants.xml |
|
2164 > ../lib/config/coverity.xml ../../tools/sbs/lib/config/coverity.xml |
|
2165 > ../lib/config/meta.xml ../../tools/sbs/lib/config/meta.xml |
|
2166 > ../lib/config/locations.xml ../../tools/sbs/lib/config/locations.xml |
|
2167 > ../lib/config/gccxml.xml ../../tools/sbs/lib/config/gccxml.xml |
|
2168 > ../lib/config/carbide.xml ../../tools/sbs/lib/config/carbide.xml |
|
2169 > ../lib/config/msvc.xml ../../tools/sbs/lib/config/msvc.xml |
|
2170 > ../lib/config/make.xml ../../tools/sbs/lib/config/make.xml |
|
2171 > ../lib/config/root.xml ../../tools/sbs/lib/config/root.xml |
|
2172 > ../lib/config/winscw.xml ../../tools/sbs/lib/config/winscw.xml |
|
2173 > ../lib/config/arm.xml ../../tools/sbs/lib/config/arm.xml |
|
2174 > ../lib/config/gcce.xml ../../tools/sbs/lib/config/gcce.xml |
|
2175 > ../lib/config/rvct.xml ../../tools/sbs/lib/config/rvct.xml |
|
2176 > ../python/raptor_makefile.py ../../tools/sbs/python/raptor_makefile.py |
|
2177 > ../python/filter_interface.py ../../tools/sbs/python/filter_interface.py |
|
2178 > ../python/raptor_start.py ../../tools/sbs/python/raptor_start.py |
|
2179 > ../python/pyparsing.py ../../tools/sbs/python/pyparsing.py |
|
2180 > ../python/raptor_cli.py ../../tools/sbs/python/raptor_cli.py |
|
2181 > ../python/raptor_cache.py ../../tools/sbs/python/raptor_cache.py |
|
2182 > ../python/raptor_meta.py ../../tools/sbs/python/raptor_meta.py |
|
2183 > ../python/raptor_xml.py ../../tools/sbs/python/raptor_xml.py |
|
2184 > ../python/raptor_version.py ../../tools/sbs/python/raptor_version.py |
|
2185 > ../python/generic_path.py ../../tools/sbs/python/generic_path.py |
|
2186 > ../python/raptor_make.py ../../tools/sbs/python/raptor_make.py |
|
2187 > ../python/plugins/filter_logfile.py ../../tools/sbs/python/plugins/filter_logfile.py |
|
2188 > ../python/plugins/filter_terminal.py ../../tools/sbs/python/plugins/filter_terminal.py |
|
2189 > ../python/plugins/filter_carbide.py ../../tools/sbs/python/plugins/filter_carbide.py |
|
2190 > ../python/plugins/filter_what.py ../../tools/sbs/python/plugins/filter_what.py |
|
2191 > ../python/plugins/dummyplugin.py ../../tools/sbs/python/plugins/dummyplugin.py |
|
2192 > ../python/plugins/filter_clean.py ../../tools/sbs/python/plugins/filter_clean.py |
|
2193 > ../python/plugins/filter_squashlog.py ../../tools/sbs/python/plugins/filter_squashlog.py |
|
2194 > ../python/plugins/filter_checksource.py ../../tools/sbs/python/plugins/filter_checksource.py |
|
2195 > ../python/plugins/filter_splitlog.py ../../tools/sbs/python/plugins/filter_splitlog.py |
|
2196 > ../python/sbs_dist.py ../../tools/sbs/python/sbs_dist.py |
|
2197 > ../python/raptor_utilities.py ../../tools/sbs/python/raptor_utilities.py |
|
2198 > ../python/pluginbox.py ../../tools/sbs/python/pluginbox.py |
|
2199 > ../python/dos2unix.py ../../tools/sbs/python/dos2unix.py |
|
2200 > ../python/raptor_data.py ../../tools/sbs/python/raptor_data.py |
|
2201 > ../python/filter_list.py ../../tools/sbs/python/filter_list.py |
|
2202 > ../python/raptor.py ../../tools/sbs/python/raptor.py |
|
2203 > ../python/mmpparser.py ../../tools/sbs/python/mmpparser.py |
|
2204 > ../python/filter_utils.py ../../tools/sbs/python/filter_utils.py |
|
2205 > ../schema/build/2_0.xsd ../../tools/sbs/schema/build/2_0.xsd |
|
2206 > ../schema/build/log/1_0.xsd ../../tools/sbs/schema/build/log/1_0.xsd |
|
2207 > ../schema/build/1_0.xsd ../../tools/sbs/schema/build/1_0.xsd |
|
2208 > ../win32/bin/ransleep.exe ../../tools/sbs/win32/bin/ransleep.exe |
|
2209 > ../win32/bin/sbs_descramble.exe ../../tools/sbs/win32/bin/sbs_descramble.exe |
|
2210 > ../win32/bin/talonctl.exe ../../tools/sbs/win32/bin/talonctl.exe |
|
2211 > ../win32/bin/talon.exe ../../tools/sbs/win32/bin/talon.exe |
|
2212 diff -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*.pyc' -x '*~' -x '*.bak' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.h/build_latest/build/sbsv2/raptor/lib/config/gcc.xml /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/lib/config/gcc.xml |
|
2213 29c29 |
|
2214 < <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'/> |
|
2215 --- |
|
2216 > <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'/> |
|
2217 48c48 |
|
2218 < <set name='INC.COMPILER' value='$(EPOCINCLUDE)/gcc_mingw/gcc_mingw_3_4_2.h'/> |
|
2219 --- |
|
2220 > <set name='INC.COMPILER' value='$(EPOCINCLUDE)/gcc/gcc.h'/> |
|
2221 58,59c58 |
|
2222 < <!-- always use stlport headers --> |
|
2223 < <set name='SYSTEMINCLUDE' value='$(EPOCINCLUDE)/tools/stlport'/> |
|
2224 --- |
|
2225 > <set name='SYSTEMINCLUDE' value=''/> |
|
2226 63c62 |
|
2227 < <set name='STATICLIBRARY' value='stlport.5.1'/> |
|
2228 --- |
|
2229 > <set name='STATICLIBRARY' value=''/> |
|
2230 Only in /home/imk/symbian/epocroot-pdk-3.0.h/build/sbsv2/raptor/util: build |
|