Merge Carbide bugs 9997 & 10086 from default.
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/BuildSettingsUI.java Fri Nov 06 12:39:13 2009 -0600
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/BuildSettingsUI.java Mon Nov 09 12:37:41 2009 -0600
@@ -139,7 +139,7 @@
concurrentBuildJobsLabel.setLayoutData(gd);
concurrentBuildJobsControl = new Spinner(content, SWT.BORDER | SWT.READ_ONLY);
- concurrentBuildJobsControl.setValues(0, 2, 20, 0, 1, 4);
+ concurrentBuildJobsControl.setValues(0, 2, 50, 0, 1, 4);
concurrentBuildJobsControl.setBackground(shell.getDisplay().getSystemColor(SWT.COLOR_WHITE));
concurrentBuildJobsControl.setEnabled(useConcurrentBuildingCheck.getSelection());
concurrentBuildJobsControl.setToolTipText(Messages.getString("SharedPrefs.ConcurrentBuildJobsToolTip")); //$NON-NLS-1$
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/Messages.java Fri Nov 06 12:39:13 2009 -0600
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/Messages.java Mon Nov 09 12:37:41 2009 -0600
@@ -108,6 +108,8 @@
public static String ProjectPropertiesPage_directoryDoesNotContainSourceFiles;
public static String ProjectPropertiesPage_directoryTooLong;
+
+ public static String ProjectPropertiesPage_directoryIsRoot;
static {
// initialize resource bundle
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/ProjectPropertiesPage.java Fri Nov 06 12:39:13 2009 -0600
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/ProjectPropertiesPage.java Mon Nov 09 12:37:41 2009 -0600
@@ -240,6 +240,18 @@
return true;
}
+ if (rootDirectoryPath.isRoot() || rootDirectoryPath.segmentCount() == 1){
+ if (rootDirectoryPath.segmentCount() == 1){
+ for (ISymbianBuildContext context : parsedWithConfigs){
+ IPath sdkRoot = new Path(context.getSDK().getEPOCROOT());
+ if (rootDirectoryPath.isPrefixOf(sdkRoot) || sdkRoot.isPrefixOf(rootDirectoryPath)){
+ setMessage(Messages.ProjectPropertiesPage_directoryIsRoot, IStatus.WARNING);
+ break;
+ }
+ }
+ }
+
+ }
return true;
}
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/messages.properties Fri Nov 06 12:39:13 2009 -0600
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/messages.properties Mon Nov 09 12:37:41 2009 -0600
@@ -17,6 +17,7 @@
ProjectPropertiesPage_directoryDoesNotContainRequiredFiles=The root directory must contain all project files (bld.inf, mmp and make files). Click the help icon and select 'Troubleshooting' for more information.
ProjectPropertiesPage_directoryDoesNotContainSourceFiles=The root directory specified does not contain all the source and resource files referenced in the project. This may make navigation and editing more difficult.
ProjectPropertiesPage_directoryTooLong=The root directory specified is too long. It cannot exceed 215 characters so that project settings files do not exceed the 256 character path limit.
+ProjectPropertiesPage_directoryIsRoot=A project path near the root SDK directory can lead to slow import times. Please select another project path or import a subset of included bld.inf files (if possible).
MMPSelectionPage_title=MMP Selection
MMPSelectionPage_description=Select the mmp and extension make files to work with. You will be able to edit this after the project has been created.
MMPSelectionPage_selectAllAButtonLabel=Select All