# HG changeset patch # User timkelly # Date 1279834657 18000 # Node ID 767ac495431747468e604fdf7c9837575664ec3f # Parent ccc7f4cfe86611220ab40732bfd8aa0bb0667e5a fix build breaks for removal of ISymbianSDK#getSDKVersion() diff -r ccc7f4cfe866 -r 767ac4954317 core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/kb/CSKbManager.java --- a/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/kb/CSKbManager.java Thu Jul 22 16:21:59 2010 -0500 +++ b/core/com.nokia.carbide.cpp.codescanner/src/com/nokia/carbide/cpp/internal/codescanner/kb/CSKbManager.java Thu Jul 22 16:37:37 2010 -0500 @@ -394,7 +394,9 @@ List buildConfigList = projectInfo.getBuildConfigurations(); for (Iterator iterator = buildConfigList.iterator(); iterator.hasNext();) { ICarbideBuildConfiguration buildConfig = iterator.next(); - Version version = buildConfig.getSDK().getSDKVersion(); + // TODO: What is SDK version used for for codescanner? +// Version version = buildConfig.getSDK().getSDKVersion(); + Version version = new Version("5.0.0"); sdkVersions.add(version); } } diff -r ccc7f4cfe866 -r 767ac4954317 debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java --- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java Thu Jul 22 16:21:59 2010 -0500 +++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java Thu Jul 22 16:37:37 2010 -0500 @@ -792,13 +792,7 @@ if (new Path(currSDK.getEPOCROOT()).isPrefixOf(mainExeHostPath)) { // Apparently this only works correctly with the S60 emulator. - ISBSv1BuildInfo sbsv1BuildInfo = (ISBSv1BuildInfo)currSDK.getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER); - if (sbsv1BuildInfo != null) { - if (!sbsv1BuildInfo.isS60() && - !currSDK.getFamily().equalsIgnoreCase(ISBSv1BuildInfo.TECHVIEW_FAMILY_ID)) - return true; - } - + if ("exe".equalsIgnoreCase(mainExeHostPath.getFileExtension())) { //$NON-NLS-1$ Version version = currSDK.getOSVersion(); if (!(version.getMajor() == 9 && version.getMinor() == 1)) {