# HG changeset patch # User timkelly # Date 1267539466 21600 # Node ID 12fd5293f52fc3ce3fd686c67f4612d52fc10748 # Parent 4c6fab8a081bee8859e79d545ece6d5d0a3202f6 Update tool tip explaining what the builders are. Fix problem where sbsv2 builder is always selected. diff -r 4c6fab8a081b -r 12fd5293f52f 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 Mon Mar 01 14:15:09 2010 -0600 +++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/messages.properties Tue Mar 02 08:17:46 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 4c6fab8a081b -r 12fd5293f52f 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 Mon Mar 01 14:15:09 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:17:46 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));