--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java	Wed May 12 10:15:52 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java	Wed May 12 12:51:48 2010 -0500
@@ -47,6 +47,7 @@
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
 
 import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
 import com.nokia.carbide.cdt.builder.DefaultMMPViewConfiguration;
@@ -129,7 +130,14 @@
 		if (CarbideBuilderPlugin.getBuildManager().isCarbideSBSv2Project(project)) {
 			return v2Builder;
 		} else {
-			return v1Builder;
+			// TODO: Temporary work to remove ABLD support
+			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
+				public void run() {
+					MessageDialog.openError(WorkbenchUtils.getSafeShell(), "Unsupported", "ABLD is not supported in this version of Carbide. Please enusre you are using Symbian^3 or greater and SBS is installed, then re-import your project.");
+				}
+			});
+			
+			return null;
 		}
 	}
 	

--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SBSv2Utils.java	Wed May 12 10:15:52 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SBSv2Utils.java	Wed May 12 12:51:48 2010 -0500
@@ -277,11 +277,12 @@
 	 * @return true if SBSv1 is available, false otherwise
 	 */
 	public static boolean enableSBSv1Support() {
-		if (!enableSBSv2Support())
-			return true;
-		
-		if (isSBSv1Supported())
-			return true;
+		// TODO: Working on removing ABLD support.
+//		if (!enableSBSv2Support())
+//			return true;
+//		
+//		if (isSBSv1Supported())
+//			return true;
 		
 		return false;
 	}

--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java	Wed May 12 10:15:52 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java	Wed May 12 12:51:48 2010 -0500
@@ -184,6 +184,11 @@
 	}
 
 	public boolean isEnabled() {
+		// TODO: Temporary work to remove ABLD support
+		if (getOSVersion().getMajor() < 9 ||
+			(getOSVersion().getMajor() == 9 && getOSVersion().getMinor() <=4 )){
+			return false;
+		}
 		return enabled;
 	}
 

--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPreferencePage.java	Wed May 12 10:15:52 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPreferencePage.java	Wed May 12 12:51:48 2010 -0500
@@ -496,7 +496,15 @@
 			osVersionLabel.setForeground(RED);
 			osVersionLabel.setBackground(GRAY);
 		}
-		else {
+		else if (sdk.getOSVersion().getMajor() < 9 ||
+				 (sdk.getOSVersion().getMajor() == 9 && sdk.getOSVersion().getMinor() <= 4)){
+			// TODO: Temporary work to remove ABLD support
+			sdkHasError = true;
+			osVersionLabel.setText(OS_VERSION_LABEL + "This OS version is not supported: " + sdk.getOSVersion()); 
+			osVersionLabel.setForeground(RED);
+			osVersionLabel.setBackground(GRAY);
+			
+		} else {
 			if (sdk.getSDKOSBranch().length() > 0) {
 				osVersionLabel.setText(OS_VERSION_LABEL + sdk.getOSVersion().toString() + " (Branch = \"" + sdk.getSDKOSBranch() + "\")"); //$NON-NLS-1$ //$NON-NLS-2$
 			} else {