builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java
branchRCL_2_4
changeset 1155 a1b3518585ae
parent 1153 8d5b825f0a74
child 1160 d7e46ce6d547
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java	Fri Apr 02 10:01:56 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java	Fri Apr 02 15:04:41 2010 -0500
@@ -502,8 +502,11 @@
 		args.add("-c"); //$NON-NLS-1$
 		String configName = getConfigName(buildConfig);
 		if (configName == null){ 
-			//TODO: Try to contrive if the project hasn't yet been converted.....
-			configName = "error_retrieving_sbs_config"; 
+			// Just get the default target. This is a SBSv1 style configuration name...
+			if (buildConfig.getSBSv2Alias() == null)
+				configName = buildConfig.getPlatformString().toLowerCase() + "_" + buildConfig.getTargetString().toLowerCase();
+			else
+				configName = "error_retrieving_build_alias";
 		}
 		if (isTest) {
 			configName = configName + ".test"; //$NON-NLS-1$
@@ -588,8 +591,11 @@
 		
 		String configName = getConfigName(buildConfig);
 		if (configName == null){ 
-			//TODO: Try to contrive if the project hasn't yet been converted.....
-			configName = "error_retrieving_sbs_config"; 
+			// Just get the default target. This is a SBSv1 style configuration name...
+			if (buildConfig.getSBSv2Alias() == null)
+				configName = buildConfig.getPlatformString().toLowerCase() + "_" + buildConfig.getTargetString().toLowerCase();
+			else
+				configName = "error_retrieving_build_alias";
 		}
 		String[] sbsArgs = new String[] {"--source-target=" + file.toOSString(), COMPILE_ARG, configName, COMPONENT_ARG, fullMMPPath.toFile().getName()};
 		launcher.setErrorParserManager(buildConfig.getCarbideProject().getINFWorkingDirectory(), buildConfig.getErrorParserList());