core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv2BuildInfo.java
equal
deleted
inserted
replaced
246 return platformMacros; |
246 return platformMacros; |
247 } |
247 } |
248 |
248 |
249 public Map<String, String> getBuildMacros(String buildAlias) { |
249 public Map<String, String> getBuildMacros(String buildAlias) { |
250 Map<String, String> buildMacros = cachedBuildMacros.get(buildAlias); |
250 Map<String, String> buildMacros = cachedBuildMacros.get(buildAlias); |
251 if (buildMacros == null) { |
251 |
|
252 if (buildMacros == null || buildMacros.size() == 0) { |
252 buildMacros = new HashMap<String, String>(); |
253 buildMacros = new HashMap<String, String>(); |
253 synchronized (cachedBuildMacros) { |
254 synchronized (cachedBuildMacros) { |
254 if (sbsv2FilteredContexts == null || sbsv2FilteredContexts.size() == 0) { |
255 if (sbsv2FilteredContexts == null || sbsv2FilteredContexts.size() == 0) { |
255 getFilteredBuildConfigurations(); |
256 getFilteredBuildConfigurations(); |
256 } |
257 } |
270 /** |
271 /** |
271 * Get the full path to the prefix file defined under \epoc32\tools\variant\variant.cfg |
272 * Get the full path to the prefix file defined under \epoc32\tools\variant\variant.cfg |
272 * @return A path object, or null if the variant.cfg does not exist. This routine does not check to see if the returned path exists. |
273 * @return A path object, or null if the variant.cfg does not exist. This routine does not check to see if the returned path exists. |
273 */ |
274 */ |
274 public IPath getPrefixFromVariantCfg(){ |
275 public IPath getPrefixFromVariantCfg(){ |
275 if (cachedVariantHRHFile == null) { |
276 if (cachedVariantHRHFile == null || cachedVariantHRHFile.toOSString().length() == 0) { |
276 if (sbsv2FilteredContexts == null || sbsv2FilteredContexts.size() == 0) { |
277 if (sbsv2FilteredContexts == null || sbsv2FilteredContexts.size() == 0) { |
277 getFilteredBuildConfigurations(); |
278 getFilteredBuildConfigurations(); |
278 } |
279 } |
279 if (sbsv2FilteredContexts.size() > 0) { |
280 if (sbsv2FilteredContexts.size() > 0) { |
280 for (ISymbianBuildContext context : sbsv2FilteredContexts) { |
281 for (ISymbianBuildContext context : sbsv2FilteredContexts) { |