more Linux fixes. Couple issues found: 1) Rescanning SDKs causes deadlock. 2) SDK cache is not working for Linux 3) Can't import when SBS is not installed (and there's not error msg)
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SBSv2Utils.java Tue Aug 17 07:21:14 2010 -0700
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SBSv2Utils.java Tue Aug 17 08:39:31 2010 -0700
@@ -250,6 +250,10 @@
}
private static boolean isSBSv1Supported() {
+ if (HostOS.IS_UNIX){
+ return false;
+ }
+
ISDKManager sdkMgr = SDKCorePlugin.getSDKManager();
for (ISymbianSDK sdk : sdkMgr.getSDKList()) {
File abld = new File(sdk.getEPOCROOT(), "epoc32/tools/abld.pl"); //$NON-NLS-1$
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SDKManagerRaptorOnly.java Tue Aug 17 07:21:14 2010 -0700
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SDKManagerRaptorOnly.java Tue Aug 17 08:39:31 2010 -0700
@@ -42,6 +42,8 @@
@Override
protected boolean doScanSDKs(IProgressMonitor monitor) {
+ scanCarbideSDKCache();
+
String message = SBSv2Utils.scanSBSv2();
if (message != null) {
reportError(message);
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/BldInfImportWizard.java Tue Aug 17 07:21:14 2010 -0700
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/BldInfImportWizard.java Tue Aug 17 08:39:31 2010 -0700
@@ -47,6 +47,7 @@
import com.nokia.carbide.cpp.sdk.core.SDKCorePlugin;
import com.nokia.carbide.cpp.ui.CarbideUIPlugin;
import com.nokia.carbide.cpp.ui.ICarbideSharedImages;
+import com.nokia.cpp.internal.api.utils.core.HostOS;
public class BldInfImportWizard extends Wizard implements IImportWizard {
@@ -67,10 +68,12 @@
setDefaultPageImageDescriptor(CarbideUIPlugin.getSharedImages().getImageDescriptor(ICarbideSharedImages.IMG_IMPORT_BLDINF_WIZARD_BANNER));
ISDKManager sdkMgr = SDKCorePlugin.getSDKManager();
- if (!((SDKManager)sdkMgr).checkDevicesXMLSynchronized()){
- if (sdkMgr instanceof ISDKManagerInternal){
- ISDKManagerInternal sdkMgrInternal = (ISDKManagerInternal)sdkMgr;
- sdkMgrInternal.fireDevicesXMLChanged();
+ if (HostOS.IS_WIN32){
+ if (!((SDKManager)sdkMgr).checkDevicesXMLSynchronized()){
+ if (sdkMgr instanceof ISDKManagerInternal){
+ ISDKManagerInternal sdkMgrInternal = (ISDKManagerInternal)sdkMgr;
+ sdkMgrInternal.fireDevicesXMLChanged();
+ }
}
}
}