118 |
118 |
119 private String displayString; |
119 private String displayString; |
120 |
120 |
121 private String contextKey; |
121 private String contextKey; |
122 |
122 |
|
123 /** |
|
124 * One of {@link ISymbianBuilderID} |
|
125 */ |
123 private String builderId; |
126 private String builderId; |
124 |
127 |
125 private boolean changed; |
128 private boolean changed; |
126 |
129 |
127 private File cacheFile; |
130 private File cacheFile; |
252 includedFiles = scanner.getIncludedFiles(); |
255 includedFiles = scanner.getIncludedFiles(); |
253 for (File inc : includedFiles) { |
256 for (File inc : includedFiles) { |
254 hrhFilesParsed.add(inc); |
257 hrhFilesParsed.add(inc); |
255 } |
258 } |
256 |
259 |
257 List<String> variantCFGMacros = new ArrayList<String>(); |
260 if (buildInfo instanceof ISBSv1BuildInfo) { |
258 variantCFGMacros = sdk.getVariantCFGMacros(); |
261 // SBSv2 does not parse the variant.cfg file to collect macros. |
259 for (String cfgMacros : variantCFGMacros){ |
262 List<String> variantCFGMacros = new ArrayList<String>(); |
260 // we don't want duplicate macros, so check to see if it's already there. |
|
261 IDefine existingMacro = namedMacros.get(cfgMacros); |
|
262 if (existingMacro != null) { |
|
263 macros.remove(existingMacro); |
|
264 } |
|
265 |
263 |
266 IDefine macro = DefineFactory.createSimpleFreeformDefine(cfgMacros); |
264 variantCFGMacros = ((ISBSv1BuildInfo)buildInfo).getVariantCFGMacros(); |
267 macros.add(macro); |
265 for (String cfgMacros : variantCFGMacros){ |
268 namedMacros.put(macro.getName(), macro); |
266 // we don't want duplicate macros, so check to see if it's already there. |
|
267 IDefine existingMacro = namedMacros.get(cfgMacros); |
|
268 if (existingMacro != null) { |
|
269 macros.remove(existingMacro); |
|
270 } |
|
271 |
|
272 IDefine macro = DefineFactory.createSimpleFreeformDefine(cfgMacros); |
|
273 macros.add(macro); |
|
274 namedMacros.put(macro.getName(), macro); |
|
275 } |
269 } |
276 } |
270 } |
277 } |
271 |
278 |
272 // cache the info about when we created the cache |
279 // cache the info about when we created the cache |
273 if (hrhFileInfo == null) { |
280 if (hrhFileInfo == null) { |