# HG changeset patch
# User timkelly
# Date 1267539880 21600
# Node ID 6014951a52d756afc784f4d1ec8523ffeeedac1e
# Parent  12fd5293f52fc3ce3fd686c67f4612d52fc10748# Parent  f6b590f7721986ea9c2c56621d9546bbe00ad3a1
merge commit

diff -r f6b590f77219 -r 6014951a52d7 project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/messages.properties
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/messages.properties	Tue Mar 02 08:22:58 2010 -0600
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/messages.properties	Tue Mar 02 08:24:40 2010 -0600
@@ -2,7 +2,7 @@
 NewProjectPage.NameBeginWithDigitError=Project names can not begin with a digit
 NewProjectPage.InvalidProjectName={0} is not a valid project name
 NewProjectPage.builderLabel=Builder:
-NewProjectPage.builderToolTip=Select the builder to use for this project
+NewProjectPage.builderToolTip=Select the builder to use for this project. SBSv1 = abld | SBSv2 = Raptor
 NewProjectPage.ProjectNameWithPeriodError=Project names can not contain periods
 NewProjectPage.sbsv1=SBSv1
 NewProjectPage.sbsv2=SBSv2
diff -r f6b590f77219 -r 6014951a52d7 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	Tue Mar 02 08:22:58 2010 -0600
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/sharedui/BuilderSelectionComposite.java	Tue Mar 02 08:24:40 2010 -0600
@@ -66,17 +66,6 @@
 		builderCombo.add(Messages.getString("NewProjectPage.sbsv2")); //$NON-NLS-1$
 		builderCombo.setData(".uid", "builderCombo"); //$NON-NLS-1$ //$NON-NLS-2$
 		builderCombo.select(0);
-//		builderCombo.addSelectionListener(new SelectionListener() {
-//
-//			public void widgetDefaultSelected(SelectionEvent e) {
-//				widgetSelected(e);
-//			}
-//
-//			public void widgetSelected(SelectionEvent e) {
-//				validatePage();
-//			}
-//			
-//		});
     }
 
     /**
@@ -92,7 +81,6 @@
 			// if SBSv2 is selected, make sure SBS_HOME is defined
 			if (SBSv2Utils.getSBSBinDirectory() == null){
 				status = new Status(Status.ERROR, ProjectUIPlugin.PLUGIN_ID, "SBS_HOME environment variable is not defined. Carbide needs this variable to find the base SBS install.");
-				useSBSv2Builder = false;
 			}
 			
 			// check the raptor version
@@ -103,6 +91,8 @@
 				}
 			}
 
+		} else {
+			useSBSv2Builder = false;
 		}
 
 		getShell().setData(BuildTargetsPage.SBSV2BUILDER, new Boolean(useSBSv2Builder));