--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/BuildSettingsUI.java Tue Jan 26 12:01:35 2010 -0600
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/BuildSettingsUI.java Tue Jan 26 12:02:08 2010 -0600
@@ -231,8 +231,8 @@
cleanCmdv2Label.setLayoutData(new GridData());
defaultCleanLevelv2Combo = new Combo(content, SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY);
- defaultCleanLevelv2Combo.add(Messages.getString("SharedPrefs.CleanLevel0")); //$NON-NLS-1$
- defaultCleanLevelv2Combo.add(Messages.getString("SharedPrefs.CleanLevel1")); //$NON-NLS-1$
+ defaultCleanLevelv2Combo.add(Messages.getString("SharedPrefs_SBSv2.CleanLevel0")); //$NON-NLS-1$
+ defaultCleanLevelv2Combo.add(Messages.getString("SharedPrefs_SBSv2.CleanLevel1")); //$NON-NLS-1$
defaultCleanLevelv2Combo.setToolTipText(Messages.getString("SharedPrefs.CleanCommandLabelToolTip")); //$NON-NLS-1$
defaultCleanLevelv2Combo.setLayoutData(new GridData());
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/messages.properties Tue Jan 26 12:01:35 2010 -0600
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/messages.properties Tue Jan 26 12:02:08 2010 -0600
@@ -116,6 +116,8 @@
SharedPrefs.CleanLevel0=Level 0 (abld clean)
SharedPrefs.CleanLevel1=Level 1 (abld reallyclean)
SharedPrefs.CleanLevel2=Level 2 (abld reallyclean, bldmake clean)
+SharedPrefs_SBSv2.CleanLevel0=Level 0 (sbs clean)
+SharedPrefs_SBSv2.CleanLevel1=Level 1 (sbs reallyclean)
SharedPrefs.BuildTestCompsText=Build test components when building from bld.inf.
SharedPrefs.BuildTestCompsToolTip=When enabled, this will build any test components that are defined in the bld.inf file. This only applies when building from the bld.inf file.
SharedPrefs.ManageDepsText=Manage dependency tracking (improves build speeds)
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java Tue Jan 26 12:01:35 2010 -0600
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java Tue Jan 26 12:02:08 2010 -0600
@@ -1034,6 +1034,12 @@
break;
}
+ if (osVersionString.compareToIgnoreCase("tb101sf") == 0){
+ setOSVersion(new Version("9.6.0"));
+ setSDKVersion(new Version("6.0.0"));
+ break;
+ }
+
if (osVersionString.endsWith(EKA1_A_BRANCH_IDENTIFIER) ||
osVersionString.endsWith(EKA2_B_BRANCH_IDENTIFIER) ||
osVersionString.endsWith(EKA1_S_BRANCH_IDENTIFIER)){