Updated SDK manager to make sure scan job is not already running before scheduling it; also default OS version to 9.5 if buildinfo.txt is missing from an SDK.
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/AbstractSDKManager.java Wed Jun 02 18:15:50 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/AbstractSDKManager.java Wed Jun 02 18:27:30 2010 -0500
@@ -194,8 +194,10 @@
}
public void scanSDKs() {
- scanJob.setSystem(true);
- scanJob.schedule();
+ if (scanJob.getState() == Job.NONE) {
+ scanJob.setSystem(true);
+ scanJob.schedule();
+ }
}
/**
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SDKManager.java Wed Jun 02 18:15:50 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SDKManager.java Wed Jun 02 18:27:30 2010 -0500
@@ -36,6 +36,7 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
+import org.osgi.framework.Version;
import com.nokia.carbide.cpp.internal.sdk.core.gen.Devices.DefaultType;
import com.nokia.carbide.cpp.internal.sdk.core.gen.Devices.DeviceType;
@@ -445,6 +446,10 @@
deviceType.setUserdeletable("false");
deviceType.setUserdeletetable("false");
ISymbianSDK sdk = new SymbianSDK(deviceType);
+ if (sdk.getOSVersion().toString().equals("0.0.0")) {
+ sdk.setOSVersion(new Version("9.5"));
+ }
+
if (!isSupportedSDK(sdk)) {
continue;
}