# HG changeset patch
# User timkelly
# Date 1270753852 18000
# Node ID d3e3d03a295a362b30ff1748508da76d5dc57f87
# Parent  3356621aee34966f177aa2c5c538b8fe6a1aa5a8
Fix issue of SBSv2 selected as the builder even it SBSv1 was selected in the combo. Update error parser regression for RVCT license check.

diff -r 3356621aee34 -r d3e3d03a295a builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/bugzilla/3053.rvct.regression.xml
--- a/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/bugzilla/3053.rvct.regression.xml	Wed Apr 07 14:48:51 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/bugzilla/3053.rvct.regression.xml	Thu Apr 08 14:10:52 2010 -0500
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <root>
   <!--Error Marker at index 0-->
+  <marker_info file="^EMPTY^" line_number="0" message="C3492W: Site License not found, falling back to normal license" severity="1" variable_name="^EMPTY^" external_path_string="^EMPTY^" />
+  <!--Error Marker at index 1-->
   <marker_info file="^EMPTY^" line_number="0" message="Error: C3397E: Cannot obtain license for Compiler (feature compiler) with" severity="3" variable_name="^EMPTY^" external_path_string="^EMPTY^" />
 </root>
 
diff -r 3356621aee34 -r d3e3d03a295a project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/sharedui/BuilderSelectionComposite.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/sharedui/BuilderSelectionComposite.java	Wed Apr 07 14:48:51 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/sharedui/BuilderSelectionComposite.java	Thu Apr 08 14:10:52 2010 -0500
@@ -79,6 +79,7 @@
 				if (!SBSv2Utils.enableSBSv1Support()) {
 					status = new Status(Status.ERROR, ProjectUIPlugin.PLUGIN_ID, "SBSv1 is not supported on this system.");
 				}
+				useSBSv2Builder = false;
 			}
 			else if (builderCombo.getSelectionIndex() == 1) {