--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISBSv1BuildContext.java	Mon Aug 02 15:38:42 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-package com.nokia.carbide.cpp.sdk.core;
-
-/**
- * Build Context specific information for the SBS/Raptor Symbian Builder.
- * @see ICarbideBuildConfigation
- * @since 3.0
- * @deprecated - ABLD is dead.
- *
- */
-public interface ISBSv1BuildContext extends ISymbianBuildContext {
-
-	/**
-	 * Platform constants
-	 */
-	public static final String EMULATOR_PLATFORM = "WINSCW";
-	public static final String GCCE_PLATFORM = "GCCE";
-	public static final String ARMV5_PLATFORM = "ARMV5";
-	public static final String ARMV6_PLATFORM = "ARMV6";
-	public static final String ARMV5_ABIV2_PLATFORM = "ARMV5_ABIV2";
-	public static final String ARMV6_ABIV2_PLATFORM = "ARMV6_ABIV2";
-	
-	/**
-	 * For Symbian Bianry Variation, platforms will be names <plat>.<variation>
-	 * So in some cases you need to know only the platforms that the variant is based on.
-	 * For example, a build platform name of "armv5.myvariant" will return "armv5".
-	 * @return The base platform string.
-	 * @see isSymbianBinaryVariation()
-	 * @since 2.0
-	 */
-	public String getBasePlatformForVariation();
-	
-}

--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISBSv2BuildContext.java	Mon Aug 02 15:38:42 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-package com.nokia.carbide.cpp.sdk.core;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-
-/**
- * Build Context specific information for the SBS/Raptor Symbian Builder.
- * @see ICarbideBuildConfigation
- * @since 3.0
- *
- */
-public interface ISBSv2BuildContext extends ISymbianBuildContext {
-	
-	public static final String BUILDER_ID = "com.nokia.carbide.builder.raptor";
-	
-	public static final String TOOLCHAIN_ARM = "ARM";
-	public static final String TOOLCHAIN_GCCE = "GCCE";
-	public static final String TOOLCHAIN_WINSCW = "WINSCW";
-	public static final String TOOLCHAIN_UNKNOWN = "UNKNOWN";
-	
-	public static final String MACRO_ARM = "__ARMCC__";
-	public static final String MACRO_GCCE = "__GCCE__";
-	public static final String MACRO_WINSCW = "__WINSCW__";
-	
-	/**
-	 * Retrieve the build-able configuration; a valid command that cab be passed with Raptor's -c parameter.
-	 * This should not be used and should return null for abld-configurations.
-	 * @return the configuration name, or null if none.
-	 */
-	public String getSBSv2Alias();
-	
-	/**
-	 * Get the unique configuration ID for the SBSv2 build configuration.
-	 * @return configuration ID
-	 */
-	public String getConfigID();
-	
-	/**
-	 * Get the implicit directory searched for *.def files by the DEFFILE statement.
-	 * @return bare directory name (e.g. 'BWINS', 'BMARM', 'EABI')
-	 */
-	public String getDefaultDefFileDirectoryName();
-	
-	/**
-	 * Get stored result from Raptor config query.
-	 * @return ISBSv2ConfigQueryData object
-	 */
-	public ISBSv2ConfigQueryData getConfigQueryData();
-	
-	/**
-	 * Get tool chain for the build context
-	 * @return tool chain name (e.g. 'ARM', 'GCCE', 'WINSCW')
-	 */
-	public String getToolChain();
-
-	/**
-	 * Get system include paths returned by Raptor config query.
-	 * @return list of include paths
-	 */
-	public List<IPath> getSystemIncludes();
-	
-	/**
-	 * Retrieve the actual \epoc32\release directory a binary is targeted for. 
-	 * @return
-	 */
-	public String getPlatformReleaseDirName();
-
-	/**
-	 * Get the supported targettypes for this build configuration
-	 * @return
-	 */
-	public List<String> getSupportedTargettypes();
-	
-}

--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISBSv2ConfigQueryData.java	Mon Aug 02 15:38:42 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-package com.nokia.carbide.cpp.sdk.core;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Interface to interact directly with results for Raptor configuration query data (--query=config{<config>])
- * @since 3.0
- */
-public interface ISBSv2ConfigQueryData extends Serializable {
-	public String getAlias();
-	public String getBuildPrefix();
-	public Map<String, String> getBuildMacros();
-	public String getConfigurationErrorMessage();
-	public Map<String, String> getMetaDataMacros();
-	public List<String> getMetaDataIncludes();
-	public String getMetaDataVariantHRH();
-	public String getOutputPathString();
-	public List<String> getTargettypes();
-}