# HG changeset patch
# User timkelly
# Date 1283198330 18000
# Node ID 4de816ec8ba54d63a624e1d7f3d2bdd0af4d92b8
# Parent  4d554177f768c799a5e0acff2b4149672e5ce27d# Parent  be67822599988b1303c25d148742fcb37db764dc
merge commit

diff -r 4d554177f768 -r 4de816ec8ba5 builder/com.nokia.carbide.cdt.builder/META-INF/MANIFEST.MF
--- a/builder/com.nokia.carbide.cdt.builder/META-INF/MANIFEST.MF	Mon Aug 30 14:58:15 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/META-INF/MANIFEST.MF	Mon Aug 30 14:58:50 2010 -0500
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Builder Plug-in
+Bundle-Name: Builder
 Bundle-SymbolicName: com.nokia.carbide.cdt.builder; singleton:=true
 Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: com.nokia.carbide.cdt.builder.CarbideBuilderPlugin
diff -r 4d554177f768 -r 4de816ec8ba5 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/api/builder/ui/ManageConfigurationsDialog.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/api/builder/ui/ManageConfigurationsDialog.java	Mon Aug 30 14:58:15 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/api/builder/ui/ManageConfigurationsDialog.java	Mon Aug 30 14:58:50 2010 -0500
@@ -151,6 +151,7 @@
 		
 		if (HostOS.IS_WIN32){
 			ISDKManager sdkMgr = SDKCorePlugin.getSDKManager();
+			((SDKManager)sdkMgr).ensureSystemDrivesSynchronized();
 			if (!((SDKManager)sdkMgr).checkDevicesXMLSynchronized()){
 				if (sdkMgr instanceof ISDKManagerInternal){
 					ISDKManagerInternal sdkMgrInternal = (ISDKManagerInternal)sdkMgr;
diff -r 4d554177f768 -r 4de816ec8ba5 builder/com.nokia.carbide.cpp.builder.utils/META-INF/MANIFEST.MF
--- a/builder/com.nokia.carbide.cpp.builder.utils/META-INF/MANIFEST.MF	Mon Aug 30 14:58:15 2010 -0500
+++ b/builder/com.nokia.carbide.cpp.builder.utils/META-INF/MANIFEST.MF	Mon Aug 30 14:58:50 2010 -0500
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Carbide Builder Utils Plugin
+Bundle-Name: Carbide Builder Utils
 Bundle-SymbolicName: com.nokia.carbide.cpp.builder.utils;singleton:=true
 Bundle-Version: 1.4.0.qualifier
 Bundle-Activator: com.nokia.carbide.cpp.internal.builder.utils.Activator
diff -r 4d554177f768 -r 4de816ec8ba5 core/com.nokia.carbide.XULRunnerInitializer/META-INF/MANIFEST.MF
--- a/core/com.nokia.carbide.XULRunnerInitializer/META-INF/MANIFEST.MF	Mon Aug 30 14:58:15 2010 -0500
+++ b/core/com.nokia.carbide.XULRunnerInitializer/META-INF/MANIFEST.MF	Mon Aug 30 14:58:50 2010 -0500
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: XULRunnerInitializer
-Bundle-SymbolicName: com.nokia.carbide.XULRunnerInitializer
+Bundle-SymbolicName: com.nokia.carbide.XULRunnerInitializer;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: NOKIA
+Bundle-Vendor: Nokia
 Fragment-Host: org.eclipse.swt;bundle-version="3.6.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
diff -r 4d554177f768 -r 4de816ec8ba5 core/com.nokia.carbide.cpp.compiler.doc.user/META-INF/MANIFEST.MF
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/META-INF/MANIFEST.MF	Mon Aug 30 14:58:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/META-INF/MANIFEST.MF	Mon Aug 30 14:58:50 2010 -0500
@@ -5,3 +5,4 @@
 Bundle-Version: 1.4.0.qualifier
 Bundle-Vendor: Nokia
 Bundle-Localization: plugin
+Bundle-ActivationPolicy: lazy
diff -r 4d554177f768 -r 4de816ec8ba5 core/com.nokia.carbide.cpp.doc.user/META-INF/MANIFEST.MF
--- a/core/com.nokia.carbide.cpp.doc.user/META-INF/MANIFEST.MF	Mon Aug 30 14:58:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/META-INF/MANIFEST.MF	Mon Aug 30 14:58:50 2010 -0500
@@ -7,3 +7,4 @@
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.help,
  org.eclipse.ui.cheatsheets
+Bundle-ActivationPolicy: lazy
diff -r 4d554177f768 -r 4de816ec8ba5 core/com.nokia.carbide.cpp.oss/META-INF/MANIFEST.MF
--- a/core/com.nokia.carbide.cpp.oss/META-INF/MANIFEST.MF	Mon Aug 30 14:58:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.oss/META-INF/MANIFEST.MF	Mon Aug 30 14:58:50 2010 -0500
@@ -1,6 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: OSS Plug-in
-Bundle-SymbolicName: com.nokia.carbide.cpp.oss
+Bundle-Name: OSS
+Bundle-SymbolicName: com.nokia.carbide.cpp.oss;singleton:=true
 Bundle-Version: 1.4.0.qualifier
 Bundle-Vendor: Nokia
+Bundle-ActivationPolicy: lazy
diff -r 4d554177f768 -r 4de816ec8ba5 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SDKManager.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SDKManager.java	Mon Aug 30 14:58:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SDKManager.java	Mon Aug 30 14:58:50 2010 -0500
@@ -61,6 +61,8 @@
 	private static final String MIFCONV_FILE = "epoc32/tools/mifconv" + HostOS.EXE_EXT; //$NON-NLS-1$
 	private static final String ABLD_FILE = "epoc32/tools/abld.pl"; //$NON-NLS-1$
 	private static final long VALID_ABLD_SIZE = 1024;
+	
+	private File[] systemDrives;
 
 	static boolean hasPromptedForDevicesXML = false; // make sure we only ask once at startup if devices.xml does not exist
 	long devicesXLMLastModified;
@@ -366,6 +368,14 @@
 		}
 	}
 
+	public void ensureSystemDrivesSynchronized() {
+		if (HostOS.IS_WIN32) {
+			if (systemDrives != null && getSystemDrives().length > systemDrives.length) {
+				scanSDKs();
+			}
+		}
+	}
+
 	@Override
 	protected boolean isEPOCRootFixed() {
 		return true;
@@ -375,7 +385,7 @@
 	 * Scan system drives for installed SDKs
 	 */
 	protected void doScanDrives(IProgressMonitor monitor) {
-		File[] drives = getSystemDrives();
+		File[] drives = systemDrives = getSystemDrives();
 		monitor.beginTask("Scanning system drives for installed SDKs", drives.length);
 		for (File drive : drives) {
 			if (!isEPOCRoot(drive)) {
diff -r 4d554177f768 -r 4de816ec8ba5 core/com.nokia.carbide.cpp.ui/META-INF/MANIFEST.MF
--- a/core/com.nokia.carbide.cpp.ui/META-INF/MANIFEST.MF	Mon Aug 30 14:58:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.ui/META-INF/MANIFEST.MF	Mon Aug 30 14:58:50 2010 -0500
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Carbide.c++ UI Plugin
+Bundle-Name: Carbide.c++ UI
 Bundle-SymbolicName: com.nokia.carbide.cpp.ui;singleton:=true
 Bundle-Version: 1.4.0.qualifier
 Bundle-Activator: com.nokia.carbide.cpp.ui.CarbideUIPlugin
diff -r 4d554177f768 -r 4de816ec8ba5 core/com.nokia.cpp.utils.ui/META-INF/MANIFEST.MF
--- a/core/com.nokia.cpp.utils.ui/META-INF/MANIFEST.MF	Mon Aug 30 14:58:15 2010 -0500
+++ b/core/com.nokia.cpp.utils.ui/META-INF/MANIFEST.MF	Mon Aug 30 14:58:50 2010 -0500
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Carbide.c++ UI Utilities
-Bundle-SymbolicName: com.nokia.cpp.utils.ui
+Bundle-SymbolicName: com.nokia.cpp.utils.ui;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: com.nokia.cpp.utils.ui.noexport.UtilsUIPlugin
 Bundle-Vendor: Nokia
diff -r 4d554177f768 -r 4de816ec8ba5 project/com.nokia.carbide.cpp.project.core/META-INF/MANIFEST.MF
--- a/project/com.nokia.carbide.cpp.project.core/META-INF/MANIFEST.MF	Mon Aug 30 14:58:15 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.core/META-INF/MANIFEST.MF	Mon Aug 30 14:58:50 2010 -0500
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Carbide Project Core Plug-in
+Bundle-Name: Carbide Project
 Bundle-SymbolicName: com.nokia.carbide.cpp.project.core; singleton:=true
 Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: com.nokia.carbide.cpp.project.core.ProjectCorePlugin
diff -r 4d554177f768 -r 4de816ec8ba5 project/com.nokia.carbide.cpp.project.ui/META-INF/MANIFEST.MF
--- a/project/com.nokia.carbide.cpp.project.ui/META-INF/MANIFEST.MF	Mon Aug 30 14:58:15 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/META-INF/MANIFEST.MF	Mon Aug 30 14:58:50 2010 -0500
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Carbide Project UI Plug-in
+Bundle-Name: Carbide Project UI
 Bundle-SymbolicName: com.nokia.carbide.cpp.project.ui; singleton:=true
 Bundle-Version: 1.4.0.qualifier
 Bundle-Activator: com.nokia.carbide.cpp.internal.project.ui.ProjectUIPlugin
diff -r 4d554177f768 -r 4de816ec8ba5 project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/BldInfImportWizard.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/BldInfImportWizard.java	Mon Aug 30 14:58:15 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/BldInfImportWizard.java	Mon Aug 30 14:58:50 2010 -0500
@@ -71,6 +71,7 @@
 		
 		ISDKManager sdkMgr = SDKCorePlugin.getSDKManager();
 		if (HostOS.IS_WIN32){
+			((SDKManager)sdkMgr).ensureSystemDrivesSynchronized();
 			if (!((SDKManager)sdkMgr).checkDevicesXMLSynchronized()){
 				if (sdkMgr instanceof ISDKManagerInternal){
 					ISDKManagerInternal sdkMgrInternal = (ISDKManagerInternal)sdkMgr;
diff -r 4d554177f768 -r 4de816ec8ba5 project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/wizards/NewSymbianOSCppProjectWizard.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/wizards/NewSymbianOSCppProjectWizard.java	Mon Aug 30 14:58:15 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/wizards/NewSymbianOSCppProjectWizard.java	Mon Aug 30 14:58:50 2010 -0500
@@ -55,6 +55,7 @@
 		
 		if (HostOS.IS_WIN32){
 			ISDKManager sdkMgr = SDKCorePlugin.getSDKManager();
+			((SDKManager)sdkMgr).ensureSystemDrivesSynchronized();
 			if (!((SDKManager)sdkMgr).checkDevicesXMLSynchronized()){
 				if (sdkMgr instanceof ISDKManagerInternal){
 					ISDKManagerInternal sdkMgrInternal = (ISDKManagerInternal)sdkMgr;