# HG changeset patch
# User timkelly
# Date 1245699242 18000
# Node ID a7b7fa512cdc411a9f5c29938fcf225a48f9338a
# Parent  43ba1beba007fee48b4f4e6d5f75c363eb7922fb
add parameter to import utils to select between builds (sbsv1 or sbsv2)

diff -r 43ba1beba007 -r a7b7fa512cdc builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java	Mon Jun 22 14:18:24 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java	Mon Jun 22 14:34:02 2009 -0500
@@ -571,7 +571,7 @@
 		
 		String buildTarget = buildConfig.getPlatformString().toLowerCase() + "_" + buildConfig.getTargetString().toLowerCase();
 		
-		String[] sbsArgs = new String[] {"--source-target=\"" + file.toOSString() + "\"", COMPILE_ARG, buildTarget, COMPONENT_ARG, fullMMPPath.toFile().getName()};
+		String[] sbsArgs = new String[] {"--source-target=" + file.toOSString(), COMPILE_ARG, buildTarget, COMPONENT_ARG, fullMMPPath.toFile().getName()};
 		launcher.setErrorParserManager(buildConfig.getCarbideProject().getINFWorkingDirectory(), buildConfig.getErrorParserList());
 		
 		int retVal = launcher.executeCommand(SBS_BAT, sbsArgs, getResolvedEnvVars(buildConfig), workingDirectory);
diff -r 43ba1beba007 -r a7b7fa512cdc builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/BuilderUtilsPropertyTester.java
--- a/builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/BuilderUtilsPropertyTester.java	Mon Jun 22 14:18:24 2009 -0500
+++ b/builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/BuilderUtilsPropertyTester.java	Mon Jun 22 14:34:02 2009 -0500
@@ -63,7 +63,7 @@
 					// disable for SBSv2 projects for now. see
 					// http://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7659 for details.
 					if (CarbideBuilderPlugin.getBuildManager().isCarbideSBSv2Project(file.getProject())) {
-						return false;
+						return true;
 					}
 				}
 				return true;
diff -r 43ba1beba007 -r a7b7fa512cdc project/com.nokia.carbide.cpp.project.core.tests/src/com/nokia/carbide/cpp/project/core/tests/TestBldInfImportDataLoader.java
--- a/project/com.nokia.carbide.cpp.project.core.tests/src/com/nokia/carbide/cpp/project/core/tests/TestBldInfImportDataLoader.java	Mon Jun 22 14:18:24 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.core.tests/src/com/nokia/carbide/cpp/project/core/tests/TestBldInfImportDataLoader.java	Mon Jun 22 14:34:02 2009 -0500
@@ -110,7 +110,7 @@
 			BldInfImportWrapper infWrapper = new BldInfImportWrapper(projectName, rootDirPath, infPath, 
 					componentsList, makMakRefList, buildConfigs);
 			
-			infWrapper.createProjectFromBldInf();
+			infWrapper.createProjectFromBldInf(false);
 			IProject project = infWrapper.getProject();
 			
 			assertNotNull(project);
diff -r 43ba1beba007 -r a7b7fa512cdc project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/utils/BldInfImportWrapper.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/utils/BldInfImportWrapper.java	Mon Jun 22 14:18:24 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/utils/BldInfImportWrapper.java	Mon Jun 22 14:34:02 2009 -0500
@@ -28,6 +28,7 @@
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Status;
 
+import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
 import com.nokia.carbide.cdt.builder.EpocEngineHelper;
 import com.nokia.carbide.cdt.builder.project.ICarbideProjectInfo;
 import com.nokia.carbide.cpp.internal.project.ui.ProjectUIPlugin;
@@ -77,7 +78,7 @@
 	/**
 	 * Create a Carbide project from member variable data. This is basically the same code as from com.nokia.carbide.cpp.internal.project.ui.importWizards#performFinish()
 	 */
-	public void createProjectFromBldInf(){
+	public void createProjectFromBldInf(final boolean isSBSv2){
 		
 		final String projectRelativePath = bldInfFile.removeFirstSegments(rootDirectory.segmentCount()).setDevice(null).toOSString();
 		
@@ -108,7 +109,12 @@
 
         		project = ProjectCorePlugin.createProject(projectName, rootDirectory.toOSString());
         		monitor.worked(1);
+        		
+        		project.setSessionProperty(CarbideBuilderPlugin.SBSV2_PROJECT, isSBSv2);
+        		
         		// TODO pass PKG file path to postProjectCreatedActions, currently passing null
+        		
+        		
         		ProjectCorePlugin.postProjectCreatedActions(project, projectRelativePath, selectedConfigs, components, debugMMP, null, monitor);
 
         		if (monitor.isCanceled()) {