Make sure platform names are compared with upper case (bug 10166 - regression when fixing bug 10674)
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java Tue Mar 30 15:22:01 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java Tue Mar 30 16:02:48 2010 -0500
@@ -285,25 +285,26 @@
}
public IPath getCompilerPrefixFile() {
- if (platform.equals(GCCE_PLATFORM)) {
+ String platUpper = platform.toUpperCase();
+ if (platUpper.equals(GCCE_PLATFORM)) {
return getGCCEPrefixFilePath();
- } else if (platform.equals(ARMV5_PLATFORM)
- || platform.equals(ARMV5_ABIV2_PLATFORM)
- || platform.equals(ARMV6_PLATFORM)
- || platform.equals(ARMV6_ABIV2_PLATFORM)) {
+ } else if (platUpper.equals(ARMV5_PLATFORM)
+ || platUpper.equals(ARMV5_ABIV2_PLATFORM)
+ || platUpper.equals(ARMV6_PLATFORM)
+ || platUpper.equals(ARMV6_ABIV2_PLATFORM)) {
return getRVCTPrefixFilePath();
- } else if (platform.equals(EMULATOR_PLATFORM)
- || platform.equals(ARMI_PLATFORM)
- || platform.equals(ARM4_PLATFORM)
- || platform.equals(THUMB_PLATFORM)) {
+ } else if (platUpper.equals(EMULATOR_PLATFORM)
+ || platUpper.equals(ARMI_PLATFORM)
+ || platUpper.equals(ARM4_PLATFORM)
+ || platUpper.equals(THUMB_PLATFORM)) {
return null;
} else {
// check BSF's
IBSFCatalog catalog = getSDK().getBSFCatalog();
if (catalog != null) {
for (IBSFPlatform plat : catalog.getPlatforms()) {
- if (plat.getName().compareToIgnoreCase(platform) == 0) {
- String mainPlatform = catalog.getReleasePlatform(platform);
+ if (plat.getName().compareToIgnoreCase(platUpper) == 0) {
+ String mainPlatform = catalog.getReleasePlatform(platUpper);
if (mainPlatform != null) {
if (mainPlatform.equals(GCCE_PLATFORM)) {
return getGCCEPrefixFilePath();