remove ISymbianSDK: getSDKVersion(), getName() and related methods.
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/api/builder/CarbideConfigurationDataProvider.java Thu Jul 22 14:02:11 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/api/builder/CarbideConfigurationDataProvider.java Thu Jul 22 15:18:39 2010 -0500
@@ -244,7 +244,7 @@
if (sdk != null){
return new BuildContextSBSv2(sdk, platform, target, buidAlias, displayString, configID);
} else {
- ISymbianSDK deadSDK = SymbianSDKFactory.createInstance(sdkID, "FIXME", "", new Version("0.0"), new Version("0.0"));
+ ISymbianSDK deadSDK = SymbianSDKFactory.createInstance(sdkID, "FIXME", new Version("9.5"));
SDKCorePlugin.getSDKManager().addSDK(deadSDK);
return new BuildContextSBSv2(deadSDK, platform, target, buidAlias, displayString, configID);
--- a/core/com.nokia.carbide.cpp.sdk.core.test/src/com/nokia/carbide/cpp/sdk/core/test/DevicesLoaderTest.java Thu Jul 22 14:02:11 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core.test/src/com/nokia/carbide/cpp/sdk/core/test/DevicesLoaderTest.java Thu Jul 22 15:18:39 2010 -0500
@@ -60,13 +60,13 @@
Version osVersion = new Version("9.1");
Version sdkVersion = new Version("3.0");
- ISymbianSDK sdk = SymbianSDKFactory.createInstance(S60_SDKID, M_DRIVE, ISBSv1BuildInfo.SERIES60_SDK_NAME, osVersion, sdkVersion);
+ ISymbianSDK sdk = SymbianSDKFactory.createInstance(S60_SDKID, M_DRIVE, osVersion);
DevicesLoader.updateDevice(sdk, devicesFile.toURI().toURL());
- sdk = SymbianSDKFactory.createInstance(TV_SDKID, P_DRIVE, ISBSv1BuildInfo.TECHVIEW_SDK_NAME, osVersion, sdkVersion);
+ sdk = SymbianSDKFactory.createInstance(TV_SDKID, P_DRIVE, osVersion);
DevicesLoader.updateDevice(sdk, devicesFile.toURI().toURL());
- sdk = SymbianSDKFactory.createInstance(UIQ3_SDKID, UIQ3_EPOCROOT, ISBSv1BuildInfo.UIQ_SDK_NAME, osVersion, sdkVersion);
+ sdk = SymbianSDKFactory.createInstance(UIQ3_SDKID, UIQ3_EPOCROOT, osVersion);
DevicesLoader.updateDevice(sdk, devicesFile.toURI().toURL());
}
--- a/core/com.nokia.carbide.cpp.sdk.core.test/src/com/nokia/carbide/cpp/sdk/core/test/SDKCreationTest.java Thu Jul 22 14:02:11 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core.test/src/com/nokia/carbide/cpp/sdk/core/test/SDKCreationTest.java Thu Jul 22 15:18:39 2010 -0500
@@ -61,7 +61,6 @@
// Test an SDK that does not exist. Check for proper null values
else if (sdk.getUniqueId().equals("SDK_No_Exist")){
if (sbsv1BuildInfo != null) {
- assertTrue(sdk.getSDKVersion().getMajor() == 0);
assertTrue(sbsv1BuildInfo.getAvailablePlatforms().size() == 0);
assertTrue(sbsv1BuildInfo.getFilteredBuildConfigurations().size() == 0);
}
--- a/core/com.nokia.carbide.cpp.sdk.core.test/src/com/nokia/carbide/cpp/sdk/core/test/SymbianContextTest.java Thu Jul 22 14:02:11 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core.test/src/com/nokia/carbide/cpp/sdk/core/test/SymbianContextTest.java Thu Jul 22 15:18:39 2010 -0500
@@ -61,17 +61,6 @@
*/
private void doTestSDK(ISymbianSDK sdk) {
ISBSv1BuildInfo sbsv1BuildInfo = (ISBSv1BuildInfo)sdk.getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER);
- if (sdk.getName().equals("S60_5th_Edition_SDK_v1.0")) {
- // test that we get the SDK version
- Version sdkVer = sdk.getSDKVersion();
- assertEquals(5,sdkVer.getMajor());
- assertEquals(0,sdkVer.getMinor());
-
- // test that we get the OS version
- Version osVer = sdk.getOSVersion();
- assertEquals(9,osVer.getMajor());
- assertEquals(4,osVer.getMinor());
- }
BuildContextSBSv1 context = new BuildContextSBSv1(sdk, "WINSCW", "UDEB");
ISymbianSDK contextSDK = context.getSDK();
--- a/core/com.nokia.carbide.cpp.sdk.core.test/src/com/nokia/carbide/cpp/sdk/core/test/TestCarbideSDKCache.java Thu Jul 22 14:02:11 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core.test/src/com/nokia/carbide/cpp/sdk/core/test/TestCarbideSDKCache.java Thu Jul 22 15:18:39 2010 -0500
@@ -79,8 +79,7 @@
manager.getScanJob().join();
assertTrue(manager.getCacheFile().lastModified() > orgTime);
final String sdkId = "test";
- ISymbianSDK sdk = SymbianSDKFactory.createInstance(sdkId, "C:\\", "com.nokia.s60",
- new Version("9.5"), new Version("5.0"));
+ ISymbianSDK sdk = SymbianSDKFactory.createInstance(sdkId, "C:\\", new Version("9.5"));
orgTime = manager.getCacheFile().lastModified();
waitASecond();
manager.addSDK(sdk);
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/ISBSv1BuildInfo.java Thu Jul 22 14:02:11 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/ISBSv1BuildInfo.java Thu Jul 22 15:18:39 2010 -0500
@@ -25,26 +25,6 @@
*/
public interface ISBSv1BuildInfo extends ISDKBuildInfo {
- // Family Ids don't include the vendor
- public static final String SERIES60_FAMILY_ID = "series60"; //deprecated
- public static final String S60_FAMILY_ID = "s60";
- public static final String S80_FAMILY_ID = "Series80";
- public static final String UIQ_FAMILY_ID = "UIQ";
- public static final String TECHVIEW_FAMILY_ID = "TechView";
- public static final String SYMBIAN_FOUNDATION_FAMILY_ID = "symbian"; // Symbian Foundation, starting with Symbian^3
-
- // Unique Ids include the vendor
- public static final String SERIES60_SDK_NAME = "com.nokia." + SERIES60_FAMILY_ID;
- public static final String S60_SDK_NAME = "com.nokia." + S60_FAMILY_ID;
- public static final String NOKIA_SF_SDK_NAME = "com.nokia." + SYMBIAN_FOUNDATION_FAMILY_ID; // Nokia+Symbian Foundation SDK
- public static final String S80_SDK_NAME = "com.nokia." + S80_FAMILY_ID;
- public static final String UIQ_SDK_NAME = "com.symbian." + UIQ_FAMILY_ID;
- public static final String TECHVIEW_SDK_NAME = "com.symbian." + TECHVIEW_FAMILY_ID;
-
- public static final String PUBLISHER_NOKIA = "Nokia, Inc.";
- public static final String PUBLISHER_UIQ = "UIQ Technology";
- public static final String PUBLISHER_SYMBIAN = "Symbian, Ltd.";
-
void clearPlatformMacros();
/**
@@ -95,12 +75,6 @@
*/
boolean isPreviouslyScanned();
- /**
- * Tell if the SDK is Series60.
- * @return true if the SDK is Series60
- */
- boolean isS60();
-
void setPreviouslyScanned(boolean wasScanned);
}
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/ISymbianSDKModifier.java Thu Jul 22 14:02:11 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/ISymbianSDKModifier.java Thu Jul 22 15:18:39 2010 -0500
@@ -69,12 +69,6 @@
void setPrefixFile(IPath prefixFile, String builderId);
/**
- * Sets the SDK version string of a SDK.
- * @param sdkVers SDK version
- */
- void setSDKVersion(Version sdkVers);
-
- /**
* Sets the unique id of a SDK.
* @param id id string of a SDK
*/
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/AbstractSDKManager.java Thu Jul 22 14:02:11 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/AbstractSDKManager.java Thu Jul 22 15:18:39 2010 -0500
@@ -91,8 +91,6 @@
protected static final String SDK_CACHE_ID_ATTRIB = "id";
protected static final String SDK_CACHE_ENABLED_ATTRIB = "isEnabled";
protected static final String SDK_CACHE_OS_VERSION_ATTRIB = "osVersion";
- protected static final String SDK_CACHE_OS_BRANCH_ATTRIB = "osBranch";
- protected static final String SDK_CACHE_SDK_VERSION_ATTRIB = "sdkVersion";
protected static final String SDK_SCANNED_FOR_PLUGINS = "sdkScanned";
protected static final String SDK_CACHE_EPOCROOT_ATTRIB = "epocroot";
@@ -375,12 +373,6 @@
if (osVersionItem != null)
osVersion = osVersionItem.getNodeValue();
- // get the sdk version
- String sdkVersion = "";
- Node sdkVersionItem = attribs.getNamedItem(SDK_CACHE_SDK_VERSION_ATTRIB);
- if (sdkVersionItem != null)
- sdkVersion = sdkVersionItem.getNodeValue();
-
// get the EPOCROOT
String epocRoot = null;
Node epocrootItem = attribs.getNamedItem(SDK_CACHE_EPOCROOT_ATTRIB);
@@ -395,9 +387,7 @@
sdk = SymbianSDKFactory.createInstance(id,
epocRoot,
- ISBSv1BuildInfo.S60_SDK_NAME,
- new Version(osVersion),
- new Version(sdkVersion));
+ new Version(osVersion));
if (sdkEnabled.equalsIgnoreCase("true")){
((SymbianSDK)sdk).setEnabled(true);
} else {
@@ -481,10 +471,6 @@
osVerNode.setNodeValue(currSDK.getOSVersion().toString());
attribs.setNamedItem(osVerNode);
- Node sdkVerNode = d.createAttribute(SDK_CACHE_SDK_VERSION_ATTRIB);
- sdkVerNode.setNodeValue(currSDK.getSDKVersion().toString());
- attribs.setNamedItem(sdkVerNode);
-
Node sdkEpocRootNode = d.createAttribute(SDK_CACHE_EPOCROOT_ATTRIB);
sdkEpocRootNode.setNodeValue(currSDK.getEPOCROOT());
attribs.setNamedItem(sdkEpocRootNode);
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv1BuildInfo.java Thu Jul 22 14:02:11 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv1BuildInfo.java Thu Jul 22 15:18:39 2010 -0500
@@ -229,13 +229,7 @@
}
public List<String> getVendorSDKMacros() {
- ISDKManager sdkMgr = SDKCorePlugin.getSDKManager();
- return sdkMgr.getSymbianMacroStore().getVendorMacros(sdk.getSDKVersion(), sdk.getName());
- }
-
- public boolean isS60() {
- return sdk.getFamily().equals(ISBSv1BuildInfo.S60_FAMILY_ID)
- || sdk.getFamily().equals(ISBSv1BuildInfo.SERIES60_FAMILY_ID);
+ return new ArrayList<String>(); // vendor macros no longer apply for Symbian^3 and up
}
public boolean isPreviouslyScanned() {
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SDKManager.java Thu Jul 22 14:02:11 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SDKManager.java Thu Jul 22 15:18:39 2010 -0500
@@ -370,10 +370,6 @@
needsRescan = true;
break;
}
- if (!sdk.getName().equalsIgnoreCase(currSDK.getName())){
- needsRescan = true;
- break;
- }
}
if (!needsRescan){
@@ -419,10 +415,6 @@
((SymbianSDK)sdk).setOSVersion(new Version("9.5"));
}
- if (sdk.getSDKVersion().toString().equals("0.0.0")) {
- ((SymbianSDK)sdk).setSDKVersion(new Version("5.0"));
- }
-
if (!isSupportedSDK(sdk)) {
continue;
}
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianMissingSDKFactory.java Thu Jul 22 14:02:11 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianMissingSDKFactory.java Thu Jul 22 15:18:39 2010 -0500
@@ -34,10 +34,8 @@
if (sdk.getOSVersion().getMajor() != 0){
// use the version detected from the SDK creation
} else {
- sdk.setOSVersion(new Version("0.0")); //$NON-NLS-1$
+ sdk.setOSVersion(new Version("9.5")); //$NON-NLS-1$
}
- sdk.setSDKVersion(new Version("0.0")); //$NON-NLS-1$
return sdk;
}
-
}
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java Thu Jul 22 14:02:11 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java Thu Jul 22 15:18:39 2010 -0500
@@ -83,7 +83,6 @@
protected DeviceType deviceEntry = null;
private boolean enabled = true;
private Version osVersion;
- private Version sdkVersion;
private List<String> supportedTargetTypesList = new ArrayList<String>();
private Map<String, ISDKBuildInfo> buildInfoMap = new HashMap<String, ISDKBuildInfo>();
private Map<String, File> prefixFileMap = new HashMap<String, File>();
@@ -137,21 +136,6 @@
return "";
}
- public String getFamily() {
- String[] parts = getName().split("\\.");
- if (parts.length == 3){
- if (getSDKVersion().getMajor() == 5 && getName().equalsIgnoreCase(ISBSv1BuildInfo.NOKIA_SF_SDK_NAME)){
- // A vendor of "symbian" and SDK major version 5 is the same as prior naming for "com.nokia.s60" & 5th Edition.
- // Return "s60" so that project template generation continues to work as it's a S60 5th ed. SDK.
- return ISBSv1BuildInfo.S60_FAMILY_ID;
- } else {
- return parts[2];
- }
- }
-
- return "";
- }
-
public IPath getIncludePath() {
String epocRoot = getEPOCROOT();
if (epocRoot.length() > 0) {
@@ -166,13 +150,6 @@
return null;
}
- public String getName() {
- if (deviceEntry != null) {
- return deviceEntry.getName();
- }
- return "";
- }
-
public Version getOSVersion() {
if (osVersion == null){
return new Version("0.0");
@@ -199,13 +176,6 @@
return null;
}
- public Version getSDKVersion() {
- if (sdkVersion == null){
- return new Version("0.0");
- }
- return sdkVersion;
- }
-
@SuppressWarnings("rawtypes")
public Set getSupportedFeatures() {
return sdkFeatures;
@@ -316,14 +286,6 @@
return variantCFGMacros;
}
- public String getVendor() {
- String[] parts = getName().split("\\.");
- if (parts.length == 3)
- return parts[1];
-
- return "";
- }
-
public boolean isEnabled() {
if (!SDKCorePlugin.SUPPORTS_SBSV1_BUILDER &&
(getOSVersion().getMajor() < 9 ||
@@ -395,10 +357,6 @@
this.osVersion = osVer;
}
- public void setSDKVersion(Version sdkVers) {
- sdkVersion = sdkVers;
- }
-
public void setPrefixFile(IPath prefixFile, String builderId) {
if (prefixFile == null)
return;
@@ -552,7 +510,7 @@
node = XPathAPI.selectSingleNode(doc, "sdk/sdkVersion");
if (null != node) {
try {
- setSDKVersion(new Version(node.getTextContent()));
+ // ignored
}
catch (IllegalArgumentException e){
// ignored...improper format
@@ -600,21 +558,12 @@
if (versionTokens[2].toUpperCase().contains("TB92SF")){
setOSVersion(new Version("9.5.0"));
- if (sbsv1BuildInfo != null) {
- setSDKVersion(new Version("5.2.0"));
- }
break;
} else if (versionTokens[2].toUpperCase().contains("TB101SF")){
setOSVersion(new Version("9.6.0"));
- if (sbsv1BuildInfo != null) {
- setSDKVersion(new Version("6.0.0"));
- }
break;
} else if (versionTokens[2].toUpperCase().contains("TB102SF")){
setOSVersion(new Version("9.6.0"));
- if (sbsv1BuildInfo != null) {
- setSDKVersion(new Version("6.0.0"));
- }
break;
}
else if (versionTokens[2].lastIndexOf("v") > 0){
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/processes/CheckS60CustKitSupport.java Thu Jul 22 14:02:11 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/processes/CheckS60CustKitSupport.java Thu Jul 22 15:18:39 2010 -0500
@@ -178,7 +178,7 @@
// the 3.2 CustKit
// has the middleware folder but doesn't use the new build
// macros for include paths
- if (sdk.getSDKVersion().getMajor() >= 5 && middleWareInclude.exists()) {
+ if (middleWareInclude.exists()) {
// add symbol as at least one build config is a CustKit
S60_50_Macros_String = S60_INC_MACROS;
break;
@@ -187,7 +187,7 @@
middleWareInclude = new File(sdk.getEPOCROOT(), S60_MIDDWARE_INC2);
File sfoPath = new File(sdk.getEPOCROOT(), S60_SF_FOLDER);
// check for middleware paths and /sf path (if SFO kit)
- if (sdk.getSDKVersion().getMajor() >= 5 && middleWareInclude.exists() && sfoPath.exists()) {
+ if (middleWareInclude.exists() && sfoPath.exists()) {
// add symbol as at least one build config is a CustKit
S60_50_Macros_String = S60_INC_MACROS_SF;
break;
@@ -195,7 +195,7 @@
// try newer middleware paths moved to app layer includes
- if (sdk.getSDKVersion().getMajor() >= 5 && middleWareInclude.exists()) {
+ if (middleWareInclude.exists()) {
// add symbol as at least one build config is a CustKit
File domainPath = new File(sdk.getEPOCROOT(), S60_DOMAND_OSTEXT_PLAT_PATHS);
if (domainPath.exists()){
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/scripting/SymbianSDKs.java Thu Jul 22 14:02:11 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/scripting/SymbianSDKs.java Thu Jul 22 15:18:39 2010 -0500
@@ -29,7 +29,6 @@
private static final String KEY_SDK_ID = "KEY_SDK_ID";
private static final String KEY_SDK_EPOCROOT = "KEY_SDK_EPOCROOT";
- private static final String KEY_SDK_NAME = "KEY_SDK_NAME";
static private ISDKManager getSDKManager(){
return SDKCorePlugin.getSDKManager();
@@ -42,11 +41,9 @@
Map<String,String> mp = new HashMap<String, String>();
mp.put(KEY_SDK_ID, sdk.getUniqueId());
mp.put(KEY_SDK_EPOCROOT, sdk.getEPOCROOT());
- mp.put(KEY_SDK_NAME, sdk.getName());
sdkMapArray.add(mp);
}
-
return sdkMapArray.toArray(new HashMap<?, ?>[sdkMapArray.size()]);
}
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/xml/DevicesLoader.java Thu Jul 22 14:02:11 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/xml/DevicesLoader.java Thu Jul 22 15:18:39 2010 -0500
@@ -114,7 +114,6 @@
deviceExists = true;
currDevice.setEpocroot(sdk.getEPOCROOT());
currDevice.setId(sdk.getUniqueId());
- currDevice.setName(sdk.getName());
if (currDevice.getUserdeletetable() != null){
currDevice.setUserdeletable(currDevice.getUserdeletetable());
}
@@ -133,7 +132,6 @@
DeviceType newDeviceEntry = DevicesFactory.eINSTANCE.createDeviceType();
newDeviceEntry.setId(sdk.getUniqueId());
newDeviceEntry.setEpocroot(sdk.getEPOCROOT());
- newDeviceEntry.setName(sdk.getName());
newDeviceEntry.setDefault(DefaultType.NO_LITERAL);
newDeviceEntry.setUserdeletable("no");
newDeviceEntry.setUserdeletetable(null); // just to be sure it doens't get written out
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISymbianSDK.java Thu Jul 22 14:02:11 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISymbianSDK.java Thu Jul 22 15:18:39 2010 -0500
@@ -48,26 +48,16 @@
String getEPOCROOT();
/**
- * Returns the family name of a SDK. This is parsed from the 'vendor' attribute from devices.xml.
- */
- String getFamily();
-
- /**
* Returns an IPath for the epoc32\include directory of a SDK.
* @return an IPath for the epoc32\include directory, or <code>null</code>.
*/
IPath getIncludePath();
/**
- * Returns the display name of a SDK. This is the com.vendor.family identifier.
- * @return the name of a sdk.
- */
- String getName();
-
- /**
* Returns the OS version string of this SDK.
*
* @return the OS Version object. If the version cannot be determined it will be "0.0".
+ * @deprecated - use ISymbianSDK{@link #getSupportedFeatures()} to figure out the properties of an SDK
*/
Version getOSVersion();
@@ -86,13 +76,6 @@
IPath getReleaseRoot();
/**
- * Returns the SDK version string of a SDK.
- * @param sdk Symbian SDK
- * @return the SDK Version object. If the version cannot be determined it will be "0.0".
- */
- Version getSDKVersion();
-
- /**
* Returns a set of features supported by the SDK.
* Feature IDs are defined in ISymbianSDKFeatures.
* @return set of features
@@ -128,12 +111,6 @@
List<String> getVariantCFGMacros();
/**
- * Returns the vendor name of this SDK. This is parsed from the 'name' attribute from devices.xml.
- * @return the vendor name of a sdk.
- */
- String getVendor();
-
- /**
* Returns true if the SDK is enabled, false otherwise.
*
* @return <code>true</code> if the SDK is enabled, and
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/SymbianSDKFactory.java Thu Jul 22 14:02:11 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/SymbianSDKFactory.java Thu Jul 22 15:18:39 2010 -0500
@@ -38,13 +38,10 @@
*/
public static ISymbianSDK createInstance(String id,
String epocRoot,
- String name,
- Version osVersion,
- Version sdkVersion) {
+ Version osVersion) {
DeviceType newDeviceEntry = DevicesFactory.eINSTANCE.createDeviceType();
newDeviceEntry.setId(id);
newDeviceEntry.setEpocroot(epocRoot);
- newDeviceEntry.setName(name);
newDeviceEntry.setDefault(DefaultType.NO_LITERAL);
SymbianSDK sdk = new SymbianSDK(newDeviceEntry); // create SDK and set the attribs found in devices.xml
@@ -55,10 +52,6 @@
sdk.setOSVersion(osVersion);
}
- if (sdk.getSDKVersion().getMajor() == 0) {
- sdk.setSDKVersion(sdkVersion);
- }
-
return sdk;
}
--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPropertiesDialog.java Thu Jul 22 14:02:11 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPropertiesDialog.java Thu Jul 22 15:18:39 2010 -0500
@@ -90,11 +90,6 @@
itemOSVersion.setText(new String[] {Messages.getString("SDKPropertiesDialog.OS_Version"), //$NON-NLS-2$
sdk.getOSVersion().toString()}); //$NON-NLS-1$
- // SDK Version at Row 2.
- TableItem itemSDKVersion = new TableItem(propsTable, SWT.NONE);
- String sdkVersion = sdk.getSDKVersion().toString();
- itemSDKVersion.setText(new String[] {Messages.getString("SDKPropertiesDialog.SDK_Version"), sdkVersion}); //$NON-NLS-1$
-
PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, SDKUIHelpIds.SDK_PROPERTIES_DIALOG);
return container;
--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/messages.properties Thu Jul 22 14:02:11 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/messages.properties Thu Jul 22 15:18:39 2010 -0500
@@ -3,7 +3,6 @@
SDKPropertiesDialog.Property=Property
SDKPropertiesDialog.Value=Value
SDKPropertiesDialog.OS_Version=OS Version
-SDKPropertiesDialog.SDK_Version=SDK Version
SDKPreferencePage.Browse_Location_Label=...
SDKPreferencePage.Add_Button_Label=Add
--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/sdk/ui/shared/AddSDKDialog.java Thu Jul 22 14:02:11 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/sdk/ui/shared/AddSDKDialog.java Thu Jul 22 15:18:39 2010 -0500
@@ -180,14 +180,10 @@
}
// No objections raised, write the new device entry
- String vendorName = ISBSv1BuildInfo.S60_SDK_NAME;
Version osVersion = new Version("9.4.0"); //$NON-NLS-1$
- Version sdkVersion = new Version("5.0"); //$NON-NLS-1$
ISymbianSDK sdk = SymbianSDKFactory.createInstance(deviceIDtext.getText(),
epocRootText.getText(),
- vendorName,
- osVersion,
- sdkVersion);
+ osVersion );
((SymbianSDK)sdk).setEnabled(true);
SDKCorePlugin.getSDKManager().addSDK(sdk);
List<ISymbianSDK> sdkList = SDKCorePlugin.getSDKManager().getSDKList();
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestMMPView3.java Thu Jul 22 14:02:11 2010 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestMMPView3.java Thu Jul 22 15:18:39 2010 -0500
@@ -56,8 +56,7 @@
// we need to have a fixed idea of the SDK for these tests (even when workspace isn't running)
sdk = null;
if (!Platform.isRunning()) {
- sdk = SymbianSDKFactory.createInstance("S60_3rd", "c:\\symbian\\9.1\\S60_3rd", "com.nokia.s60",
- new Version(9,0,0), new Version(0,0,0));
+ sdk = SymbianSDKFactory.createInstance("S60_3rd", "c:\\symbian\\9.1\\S60_3rd", new Version(9,0,0));
// add to memory for standalone test, hopefully only affecting my system
SDKCorePlugin.getSDKManager().addSDK(sdk);
} else {
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/images/MultiImageEditorContextBase.java Thu Jul 22 14:02:11 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/images/MultiImageEditorContextBase.java Thu Jul 22 15:18:39 2010 -0500
@@ -437,13 +437,10 @@
*/
public boolean isS60() {
ISymbianBuildContext buildContext = getCarbideBuildConfiguration().getBuildContext();
- ISymbianSDK sdk = buildContext != null ? buildContext.getSDK() : null;
- if (sdk != null) {
- ISBSv1BuildInfo sbsv1BuildInfo = (ISBSv1BuildInfo)sdk.getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER);
- return sbsv1BuildInfo.isS60();
+ if (buildContext.getSDK().getSupportedFeatures().contains(ISymbianSDKFeatures.IS_AVKON_SUPPORTED)){
+ return true;
}
return false;
-
}
/**
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/images/CarbideImageModelFactory.java Thu Jul 22 14:02:11 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/images/CarbideImageModelFactory.java Thu Jul 22 15:18:39 2010 -0500
@@ -301,20 +301,8 @@
*/
public static IImageConverterFactory getImageConverterFactory(
ICarbideProjectInfo projectInfo) {
- IImageConverterFactory imageConverterFactory = null;
- if (projectInfo != null) {
- List<ICarbideBuildConfiguration> buildConfigurations = projectInfo.getBuildConfigurations();
- for (ICarbideBuildConfiguration buildConfiguration : buildConfigurations) {
- if (buildConfiguration.getSDK().getFamily().equals(ISBSv1BuildInfo.UIQ_FAMILY_ID)) {
- imageConverterFactory = new UIQImageConverterFactory();
- break;
- }
- }
- }
- if (imageConverterFactory == null) {
- imageConverterFactory = new SymbianImageConverterFactory();
- }
- return imageConverterFactory;
+
+ return new SymbianImageConverterFactory();
}
/**