--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java	Wed Aug 11 09:54:24 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java	Wed Aug 11 11:18:20 2010 -0500
@@ -842,6 +842,7 @@
 	 * @param abldArgs array of String arguments to be passed to abld
 	 * @param removeMarkers project markers will be removed when true
 	 * @return true if operation was successful, false otherwise
+	 * @deprecated - ABLD is deprecated
 	 */
 	public static boolean invokeAbldCommand(ICarbideBuildConfiguration buildConfig, CarbideCommandLauncher launcher, String[] abldArgs, boolean removeMarkers) {
 		ICarbideProjectInfo cpi = buildConfig.getCarbideProject();

--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv1.java	Wed Aug 11 09:54:24 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv1.java	Wed Aug 11 11:18:20 2010 -0500
@@ -674,6 +674,18 @@
 		
 		return variantCFGMacros;
 	}
+
+	@Override
+	public List<IDefine> getBuildMacros() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<IDefine> getMetadataMacros() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 	
 
 }

--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv2.java	Wed Aug 11 09:54:24 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv2.java	Wed Aug 11 11:18:20 2010 -0500
@@ -407,6 +407,18 @@
 		return sbsv2BldInfo.getPrefixFromVariantCfg();
 	}
 
+	@Override
+	public List<IDefine> getBuildMacros() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<IDefine> getMetadataMacros() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
 
 	
 }

--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISymbianBuildContext.java	Wed Aug 11 09:54:24 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISymbianBuildContext.java	Wed Aug 11 11:18:20 2010 -0500
@@ -144,4 +144,17 @@
 	 */
 	String getConfigurationID();
 	
+	/**
+	 * This is the list of macros used to preprocess CPP source files.
+	 * @return a list of defines.
+	 */
+	List<IDefine> getBuildMacros();
+	
+	/**
+	 * This is the list of macros used to preprocess Symbian build files (bld.inf & mmp)
+	 * @return a list of defines
+	 */
+	List<IDefine> getMetadataMacros();
+	
+	
 }