# HG changeset patch # User stechong # Date 1276027613 18000 # Node ID 4f7d895e3e169cbfd65dac8962cef888eeb587a8 # Parent 8266d8737e899fbd9d604a17111065daf93fe3da Fixed errors in unit tests due to ISymbianSDK refactoring, plus other updates to SDK core and UI plugins. diff -r 8266d8737e89 -r 4f7d895e3e16 builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/TestPlugin.java --- a/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/TestPlugin.java Tue Jun 08 10:25:02 2010 -0500 +++ b/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/TestPlugin.java Tue Jun 08 15:06:53 2010 -0500 @@ -79,7 +79,7 @@ */ public static List getUsableBuildConfigs() { for (ISymbianSDK sdk : SDKCorePlugin.getSDKManager().getSDKList()) { - List contexts = sdk.getUnfilteredBuildConfigurations(); + List contexts = sdk.getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER).getAllBuildConfigurations(sdk); if (contexts.size() > 0) { return contexts.subList(0, Math.min(contexts.size(), 8)); } diff -r 8266d8737e89 -r 4f7d895e3e16 builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/ErrorParserRegressionGenerator.java --- a/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/ErrorParserRegressionGenerator.java Tue Jun 08 10:25:02 2010 -0500 +++ b/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/ErrorParserRegressionGenerator.java Tue Jun 08 15:06:53 2010 -0500 @@ -33,7 +33,9 @@ import com.nokia.carbide.cdt.builder.test.TestPlugin; import com.nokia.carbide.cpp.project.core.ProjectCorePlugin; import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext; +import com.nokia.carbide.cpp.sdk.core.ISymbianBuilderID; import com.nokia.carbide.cpp.sdk.core.ISymbianSDK; +import com.nokia.carbide.cpp.sdk.core.ISymbianSDKFeatures; import com.nokia.carbide.cpp.sdk.core.SDKCorePlugin; import com.nokia.cpp.internal.api.utils.core.FileUtils; @@ -59,7 +61,7 @@ // You need to set the proper default configuration so the correct set of error parsers is called List sdkList = SDKCorePlugin.getSDKManager().getSDKList(); for (ISymbianSDK currSDK : sdkList){ - List contexts = currSDK.getUnfilteredBuildConfigurations(); + List contexts = currSDK.getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER).getAllBuildConfigurations(currSDK); for (ISymbianBuildContext context : contexts) { if (context.getPlatformString().equals(PLATFORM_STRING)) { contextList.add(context); diff -r 8266d8737e89 -r 4f7d895e3e16 builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/TestGcceErrorParser.java --- a/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/TestGcceErrorParser.java Tue Jun 08 10:25:02 2010 -0500 +++ b/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/TestGcceErrorParser.java Tue Jun 08 15:06:53 2010 -0500 @@ -32,6 +32,7 @@ import com.nokia.carbide.cdt.builder.test.TestPlugin; import com.nokia.carbide.cpp.project.core.ProjectCorePlugin; import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext; +import com.nokia.carbide.cpp.sdk.core.ISymbianBuilderID; import com.nokia.carbide.cpp.sdk.core.ISymbianSDK; import com.nokia.carbide.cpp.sdk.core.SDKCorePlugin; import com.nokia.cpp.internal.api.utils.core.FileUtils; @@ -56,7 +57,7 @@ // You need to set the proper default configuration so the correct set of error parsers is called List sdkList = SDKCorePlugin.getSDKManager().getSDKList(); for (ISymbianSDK currSDK : sdkList){ - List contexts = currSDK.getUnfilteredBuildConfigurations(); + List contexts = currSDK.getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER).getAllBuildConfigurations(currSDK); for (ISymbianBuildContext context : contexts) { if (context.getPlatformString().equals(ISymbianBuildContext.GCCE_PLATFORM)) { contextList.add(context); diff -r 8266d8737e89 -r 4f7d895e3e16 builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/TestMakeErrorParser.java --- a/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/TestMakeErrorParser.java Tue Jun 08 10:25:02 2010 -0500 +++ b/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/TestMakeErrorParser.java Tue Jun 08 15:06:53 2010 -0500 @@ -32,6 +32,7 @@ import com.nokia.carbide.cdt.builder.test.TestPlugin; import com.nokia.carbide.cpp.project.core.ProjectCorePlugin; import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext; +import com.nokia.carbide.cpp.sdk.core.ISymbianBuilderID; import com.nokia.carbide.cpp.sdk.core.ISymbianSDK; import com.nokia.carbide.cpp.sdk.core.SDKCorePlugin; import com.nokia.cpp.internal.api.utils.core.FileUtils; @@ -57,7 +58,7 @@ // You need to set the proper default configuration so the correct set of error parsers is called List sdkList = SDKCorePlugin.getSDKManager().getSDKList(); for (ISymbianSDK currSDK : sdkList){ - List contexts = currSDK.getUnfilteredBuildConfigurations(); + List contexts = currSDK.getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER).getAllBuildConfigurations(currSDK); for (ISymbianBuildContext context : contexts) { if (context.getPlatformString().equals(ISymbianBuildContext.EMULATOR_PLATFORM)) { contextList.add(context); diff -r 8266d8737e89 -r 4f7d895e3e16 builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/TestMakmakeErrorParser.java --- a/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/TestMakmakeErrorParser.java Tue Jun 08 10:25:02 2010 -0500 +++ b/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/TestMakmakeErrorParser.java Tue Jun 08 15:06:53 2010 -0500 @@ -33,6 +33,7 @@ import com.nokia.carbide.cdt.builder.test.TestPlugin; import com.nokia.carbide.cpp.project.core.ProjectCorePlugin; import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext; +import com.nokia.carbide.cpp.sdk.core.ISymbianBuilderID; import com.nokia.carbide.cpp.sdk.core.ISymbianSDK; import com.nokia.carbide.cpp.sdk.core.SDKCorePlugin; import com.nokia.cpp.internal.api.utils.core.FileUtils; @@ -54,7 +55,7 @@ // You need to set the proper default configuration so the correct set of error parsers is called List sdkList = SDKCorePlugin.getSDKManager().getSDKList(); for (ISymbianSDK currSDK : sdkList){ - List contexts = currSDK.getUnfilteredBuildConfigurations(); + List contexts = currSDK.getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER).getAllBuildConfigurations(currSDK); for (ISymbianBuildContext context : contexts) { if (context.getPlatformString().equals(ISymbianBuildContext.ARMV5_PLATFORM)) { contextList.add(context); diff -r 8266d8737e89 -r 4f7d895e3e16 builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/TestRVCTErrorParser.java --- a/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/TestRVCTErrorParser.java Tue Jun 08 10:25:02 2010 -0500 +++ b/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/TestRVCTErrorParser.java Tue Jun 08 15:06:53 2010 -0500 @@ -33,6 +33,7 @@ import com.nokia.carbide.cdt.builder.test.TestPlugin; import com.nokia.carbide.cpp.project.core.ProjectCorePlugin; import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext; +import com.nokia.carbide.cpp.sdk.core.ISymbianBuilderID; import com.nokia.carbide.cpp.sdk.core.ISymbianSDK; import com.nokia.carbide.cpp.sdk.core.SDKCorePlugin; import com.nokia.cpp.internal.api.utils.core.FileUtils; @@ -54,7 +55,7 @@ // You need to set the proper default configuration so the correct set of error parsers is called List sdkList = SDKCorePlugin.getSDKManager().getSDKList(); for (ISymbianSDK currSDK : sdkList){ - List contexts = currSDK.getUnfilteredBuildConfigurations(); + List contexts = currSDK.getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER).getAllBuildConfigurations(currSDK); for (ISymbianBuildContext context : contexts) { if (context.getPlatformString().equals(ISymbianBuildContext.ARMV5_PLATFORM)) { contextList.add(context); diff -r 8266d8737e89 -r 4f7d895e3e16 builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/TestSBSv2ErrorParser.java --- a/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/TestSBSv2ErrorParser.java Tue Jun 08 10:25:02 2010 -0500 +++ b/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/TestSBSv2ErrorParser.java Tue Jun 08 15:06:53 2010 -0500 @@ -33,6 +33,7 @@ import com.nokia.carbide.cdt.builder.test.TestPlugin; import com.nokia.carbide.cpp.project.core.ProjectCorePlugin; import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext; +import com.nokia.carbide.cpp.sdk.core.ISymbianBuilderID; import com.nokia.carbide.cpp.sdk.core.ISymbianSDK; import com.nokia.carbide.cpp.sdk.core.SDKCorePlugin; import com.nokia.cpp.internal.api.utils.core.FileUtils; @@ -54,7 +55,7 @@ // You need to set the proper default configuration so the correct set of error parsers is called List sdkList = SDKCorePlugin.getSDKManager().getSDKList(); for (ISymbianSDK currSDK : sdkList){ - List contexts = currSDK.getUnfilteredBuildConfigurations(); + List contexts = currSDK.getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER).getAllBuildConfigurations(currSDK); for (ISymbianBuildContext context : contexts) { if (context.getPlatformString().equals(ISymbianBuildContext.ARMV5_PLATFORM)) { contextList.add(context); diff -r 8266d8737e89 -r 4f7d895e3e16 core/com.nokia.carbide.cpp.sdk.core/META-INF/MANIFEST.MF --- a/core/com.nokia.carbide.cpp.sdk.core/META-INF/MANIFEST.MF Tue Jun 08 10:25:02 2010 -0500 +++ b/core/com.nokia.carbide.cpp.sdk.core/META-INF/MANIFEST.MF Tue Jun 08 15:06:53 2010 -0500 @@ -16,7 +16,7 @@ org.eclipse.core.filesystem, com.nokia.cpp.utils.ui Bundle-ActivationPolicy: lazy -Export-Package: com.nokia.carbide.cpp.internal.api.sdk, +Export-Package: com.nokia.carbide.cpp.internal.api.sdk;x-friends:="com.nokia.carbide.cpp.sdk.core.test", com.nokia.carbide.cpp.internal.sdk.core.gen.Devices;x-friends:="com.nokia.carbide.cpp.sdk.core.test,com.nokia.carbide.cpp.sdk.ui", com.nokia.carbide.cpp.internal.sdk.core.gen.Devices.impl;x-friends:="com.nokia.carbide.cpp.sdk.core.test", com.nokia.carbide.cpp.internal.sdk.core.gen.Devices.util;x-friends:="com.nokia.carbide.cpp.sdk.core.test", diff -r 8266d8737e89 -r 4f7d895e3e16 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SBSv2Utils.java --- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SBSv2Utils.java Tue Jun 08 10:25:02 2010 -0500 +++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SBSv2Utils.java Tue Jun 08 15:06:53 2010 -0500 @@ -198,6 +198,44 @@ } /** + * Gets the list of all SBSv2 build contexts for the given SDK + * @param sdk the SDK to get the build contexts for + * @return the list of SBSv2 build contexts. the list may be empty + */ + public static List getAllSBSv2BuildContexts(ISymbianSDK sdk) { + List contexts = new ArrayList(); + Iterator it = getUnfilteredSBSv2BuildConfigurations(false).entrySet().iterator(); + while (it.hasNext()){ + + Map.Entry buildConfigPair = (Map.Entry)it.next(); + String alias = (String)buildConfigPair.getKey(); // The sbsv2 alias + String basePlat = (String)buildConfigPair.getValue(); + // only support configs that fall into something we can make a build context + // out of. They must have a platform and a target. + String targetString = null; + String[] configTokens = alias.split("_"); // $//$NON-NLS-N$ + // We presume that aliases have the second token as the "target". + if (configTokens[1].toLowerCase().endsWith("deb")) { //$NON-NLS-1$ //$NON-NLS-2$ + targetString = ISymbianBuildContext.DEBUG_TARGET; + } else if (configTokens[1].toLowerCase().endsWith("rel")) { //$NON-NLS-1$ //$NON-NLS-2$ + targetString = ISymbianBuildContext.RELEASE_TARGET; + } + + if (targetString != null) { + BuildContextSBSv2 context = null; + // TODO: Display String not properly set + String configID = ISBSv2BuildContext.BUILDER_ID + "." + alias + "." + sdk.getUniqueId(); + String displayString = alias + " [" + sdk.getUniqueId() + "]"; + context = new BuildContextSBSv2(sdk, basePlat, targetString, alias, displayString, configID); + if (context != null) + contexts.add(context); + } + } + + return sortContexts(contexts); + } + + /** * Gets the list of SBSv2 build contexts for the given SDK * @param sdk the SDK to get the build contexts for * @return the list of SBSv2 build contexts. the list may be empty diff -r 8266d8737e89 -r 4f7d895e3e16 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv2BuildInfo.java --- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv2BuildInfo.java Tue Jun 08 10:25:02 2010 -0500 +++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv2BuildInfo.java Tue Jun 08 15:06:53 2010 -0500 @@ -16,25 +16,18 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; -import java.util.Collections; import java.util.List; -import java.util.Set; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import com.nokia.carbide.cpp.internal.api.sdk.BuildContextSBSv1; -import com.nokia.carbide.cpp.internal.api.sdk.BuildContextSBSv2; import com.nokia.carbide.cpp.internal.api.sdk.ISBSv2BuildInfo; import com.nokia.carbide.cpp.internal.api.sdk.SBSv2Utils; import com.nokia.carbide.cpp.sdk.core.IBSFCatalog; -import com.nokia.carbide.cpp.sdk.core.IBSFPlatform; import com.nokia.carbide.cpp.sdk.core.ISBVCatalog; -import com.nokia.carbide.cpp.sdk.core.ISBVPlatform; import com.nokia.carbide.cpp.sdk.core.ISDKManager; import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext; import com.nokia.carbide.cpp.sdk.core.ISymbianSDK; -import com.nokia.carbide.cpp.sdk.core.ISymbianSDKFeatures; import com.nokia.carbide.cpp.sdk.core.SDKCorePlugin; /** @@ -46,8 +39,6 @@ private File prefixFile; private IBSFCatalog bsfCatalog; private ISBVCatalog sbvCatalog; - private List binaryVariantContextList = new ArrayList(0); - private List bsfContextList = new ArrayList(0); @Override public List getFilteredBuildConfigurations(ISymbianSDK sdk) { @@ -64,43 +55,7 @@ @Override public List getAllBuildConfigurations(ISymbianSDK sdk) { - Set sdkFeatures = sdk.getSupportedFeatures(); - List buildTargets = new ArrayList(); - - // note that this gets variant platforms but not regular BSF's - List buildPlats = getAvailablePlatforms(sdk); - - if (buildPlats.size() == 0){ - return Collections.emptyList(); - } - // TODO: Hard code build context hack - buildTargets.add(new BuildContextSBSv2(sdk, ISymbianBuildContext.EMULATOR_PLATFORM, ISymbianBuildContext.DEBUG_TARGET, "")); - - if (sdkFeatures.contains(ISymbianSDKFeatures.IS_WINSCW_UREL_SUPPORTED)){ - // TODO: Hard code build context hack - buildTargets.add(new BuildContextSBSv2(sdk, ISymbianBuildContext.EMULATOR_PLATFORM, ISymbianBuildContext.RELEASE_TARGET, "")); - } - - for (String currPlat : buildPlats){ - if (currPlat.equals(ISymbianBuildContext.EMULATOR_PLATFORM) ) { - // emulation targets already determined (some SDKs don't get WISNCW UREL - continue; - } - // TODO: Hard code build context hack - buildTargets.add(new BuildContextSBSv2(sdk, currPlat, ISymbianBuildContext.DEBUG_TARGET, "")); - - // everything gets release except for WINSCW - // TODO: Hard code build context hack - buildTargets.add(new BuildContextSBSv2(sdk, currPlat, ISymbianBuildContext.RELEASE_TARGET, "")); - } - - ISDKManager sdkMgr = SDKCorePlugin.getSDKManager(); - if (sdkMgr.getBSFScannerEnabled()){ - buildTargets.addAll(getBSFPlatformContexts(sdk)); - buildTargets.addAll(getBinaryVariationPlatformContexts(sdk)); // Symbian Binary Variation (.var) - } - - return buildTargets; + return SBSv2Utils.getAllSBSv2BuildContexts(sdk); } public List getPlatformMacros(ISymbianSDK sdk, String platform) { @@ -195,45 +150,4 @@ this.prefixFile = new File(prefixFile.toOSString()); } - protected List getBinaryVariationPlatformContexts(ISymbianSDK sdk) { - synchronized (binaryVariantContextList) { - if (!binaryVariantContextList.isEmpty()){ - return binaryVariantContextList; - } - - ISBVCatalog catalog = getSBVCatalog(sdk); - for (ISBVPlatform sbvPlatform : catalog.getPlatforms()) { - // Currently only variation of ARMV5 is supported... So just hard code the variated platform - // Only add the build platform if it's not virtual. - if (!sbvPlatform.isVirtual()){ - // TODO: Hard code build context hack - binaryVariantContextList.add(new BuildContextSBSv2(sdk, BuildContextSBSv1.ARMV5_PLATFORM + "." + sbvPlatform.getName(), ISymbianBuildContext.DEBUG_TARGET, "")); - // TODO: Hard code build context hack - binaryVariantContextList.add(new BuildContextSBSv2(sdk, BuildContextSBSv1.ARMV5_PLATFORM + "." + sbvPlatform.getName(), ISymbianBuildContext.RELEASE_TARGET, "")); - } - } - } - return binaryVariantContextList; - } - - protected List getBSFPlatformContexts(ISymbianSDK sdk) { - synchronized (bsfContextList) { - if (!bsfContextList.isEmpty()){ - return bsfContextList; - } - - IBSFCatalog catalog = getBSFCatalog(sdk); - for (IBSFPlatform platform : catalog.getPlatforms()) { - // only return non-variant style BSF's. see boog #4533 for details. - if (!platform.isVariant()) { - // TODO: Hard code build context hack - bsfContextList.add(new BuildContextSBSv2(sdk, platform.getName().toUpperCase(), ISymbianBuildContext.DEBUG_TARGET, "")); - // TODO: Hard code build context hack - bsfContextList.add(new BuildContextSBSv2(sdk, platform.getName().toUpperCase(), ISymbianBuildContext.RELEASE_TARGET, "")); - } - } - } - return bsfContextList; - } - } diff -r 8266d8737e89 -r 4f7d895e3e16 core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/sdk/ui/shared/AddSDKDialog.java --- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/sdk/ui/shared/AddSDKDialog.java Tue Jun 08 10:25:02 2010 -0500 +++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/sdk/ui/shared/AddSDKDialog.java Tue Jun 08 15:06:53 2010 -0500 @@ -184,7 +184,7 @@ String vendorName = ISBSv1BuildInfo.S60_SDK_NAME; Version osVersion = new Version("9.4.0"); //$NON-NLS-1$ String osBranch = ""; //$NON-NLS-1$ - Version sdkVersion = new Version("0.0"); //$NON-NLS-1$ + Version sdkVersion = new Version("5.0"); //$NON-NLS-1$ ISymbianSDK sdk = SymbianSDKFactory.createInstance(deviceIDtext.getText(), epocRootText.getText(), vendorName, diff -r 8266d8737e89 -r 4f7d895e3e16 core/com.nokia.carbide.templatewizard.symbian.tests/src/com/nokia/carbide/templatewizard/symbian/tests/TestBuildInfo.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/com.nokia.carbide.templatewizard.symbian.tests/src/com/nokia/carbide/templatewizard/symbian/tests/TestBuildInfo.java Tue Jun 08 15:06:53 2010 -0500 @@ -0,0 +1,17 @@ +package com.nokia.carbide.templatewizard.symbian.tests; + +import com.nokia.carbide.cpp.internal.sdk.core.model.SBSv1BuildInfo; +import com.nokia.carbide.cpp.sdk.core.ISymbianSDK; + +public class TestBuildInfo extends SBSv1BuildInfo { + + private String family; + + public String getFamily(ISymbianSDK sdk) { + return family; + } + + public void setFamily(String family) { + this.family = family; + } +} diff -r 8266d8737e89 -r 4f7d895e3e16 core/com.nokia.carbide.templatewizard.symbian.tests/src/com/nokia/carbide/templatewizard/symbian/tests/TestSymbianSDK.java --- a/core/com.nokia.carbide.templatewizard.symbian.tests/src/com/nokia/carbide/templatewizard/symbian/tests/TestSymbianSDK.java Tue Jun 08 10:25:02 2010 -0500 +++ b/core/com.nokia.carbide.templatewizard.symbian.tests/src/com/nokia/carbide/templatewizard/symbian/tests/TestSymbianSDK.java Tue Jun 08 15:06:53 2010 -0500 @@ -19,223 +19,78 @@ package com.nokia.carbide.templatewizard.symbian.tests; -import java.io.File; -import java.net.URL; -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; -import org.eclipse.core.runtime.IPath; import org.osgi.framework.Version; -import com.nokia.carbide.cpp.epoc.engine.preprocessor.IDefine; -import com.nokia.carbide.cpp.sdk.core.*; +import com.nokia.carbide.cpp.sdk.core.ISDKBuildInfo; +import com.nokia.carbide.cpp.sdk.core.ISymbianBuilderID; +import com.nokia.carbide.cpp.sdk.core.ISymbianSDK; class TestSymbianSDK implements ISymbianSDK { - + private String framework; + private TestBuildInfo testBuildInfo; + private Map buildInfoMap = new HashMap(); + private Set sdkFeatures = new HashSet(); + + public TestSymbianSDK(String frameWork, String sdkVersionString) { + this.framework = frameWork; + testBuildInfo = new TestBuildInfo(); + testBuildInfo.setSDKVersion(this, Version.parseVersion(sdkVersionString)); + testBuildInfo.setFamily(framework); + buildInfoMap.put(ISymbianBuilderID.SBSV1_BUILDER, testBuildInfo); + } + + public ISDKBuildInfo getBuildInfo(String builderId) { + ISDKBuildInfo buildInfo = buildInfoMap.get(builderId); + return buildInfo; + } + + public Set getSupportedFeatures() { + return sdkFeatures; + } + + public boolean isValid() { + return false; + } + + public List validationErrors() { + return null; + } + + public boolean isEnabled() { + return false; + } + public List getVariantCFGMacros() { return null; } - public List getVendorSDKMacros() { - return null; - } - public boolean isEKA1() { - return false; - } - public boolean isEKA2() { - return false; - } - public boolean isS60() { - return false; - } - public void setEPOCROOT(String epocRoot) { - - } - public void setName(String name) { - - } - public void setUniqueID(String id) { - - } - private String framework; - private Version sdkVersion; - public TestSymbianSDK(String frameWork, String sdkVersionString) { - this.framework = frameWork; - this.sdkVersion = Version.parseVersion(sdkVersionString); - } - public List getAllMacros() { - return null; - } - public List getAvailablePlatforms() { - return null; - } - public Date getCreationDate() { - return null; - } - public String getEPOCROOT() { - return "C:\\"; - } - public boolean isEnabled() { - return false; - } - public String getFamily() { - return framework; - } - public List getFilteredBuildConfigurations() { - return null; - } - public IPath getIncludePath() { - return null; - } - public File getLicenseFile() { - return null; - } - public String getName() { - return null; - } - - public Version getOSVersion() { - return null; - } - public List getPlatformMacros(String platform) { - return null; - } - public File getPrefixFile() { - return null; - } - public File getPublisherLogo() { - return null; - } - public URL getPublisherURL() { - return null; - } - public IPath getReleaseRoot() { - return null; - } - public String getSDKDescription() { - return null; - } - public String getSDKOSBranch() { - return null; - } - public Version getSDKVersion() { - return sdkVersion; - } - public IPath getToolsPath() { - return null; - } - public List getUnfilteredBuildConfigurations() { - return null; - } + public String getUniqueId() { return null; } - public String getVendor() { - return null; - } - - public boolean isDefaultSDK() { - return false; + + public String getEPOCROOT() { + return "C:\\"; } - public boolean isValid() { - return false; - } - public void setEnabled(boolean enable) { - } - public List validationErrors() { + + public Version getOSVersion() { return null; } - public void setCreateData(Date createDate) { - } - public void setIncludePath(IPath incPath) { - } - public void setIsDefaultSDK(boolean isDefault) { - } - public void setLicenseFile(File licenseFile) { - } - public void setOSSDKBranch(String branch) { - } - public void setOSVersion(Version osVer) { - } - public void setPrefixFile(IPath prefixFile) { - } - public void setPublisherLogo(File logoFile) { - } - public void setPublisherName(String pubName) { - } - public void setPublisherURL(URL pubURL) { - } - public void setReleaseRoot(IPath releaseRootPath) { - } - public void setSDKDescription(String descr) { - } - public void setSDKVersion(Version sdkVers) { - } - public void setSourcePath(IPath srcPath) { - } - public void setToolsPath(IPath toolPath) { - } - public void setAvailablePlatforms(List platList) { - } + public List getSupportedTargetTypes() { return null; } - public void setOSMacros(List osMacros) { - } - public void setPlatformMacros(String platform, List platMacros) { - } - public List getProjectVariantHRHMacros() { - return null; - } - public List getTargetTypeMacros(String targettype) { - return null; - } - public boolean getRequiresRestart() { - return false; - } - - public String getPublisherName() { - return null; + + public void setEPOCROOT(String epocRoot) { } - public void setCreateDate(Date createDate) { - } - public void setSupportsWINSCW_UREL(boolean isSupported) { - - } - public boolean supportsWINSCW_UREL() { - return false; - } public void scanSDK() { - - } - /* (non-Javadoc) - * @see com.nokia.carbide.cpp.sdk.core.ISymbianSDK#getBSFCatalog() - */ - public IBSFCatalog getBSFCatalog() { - return null; } - - /* (non-Javadoc) - * @see com.nokia.carbide.cpp.sdk.core.ISymbianSDK#getProjectVariantHRHDefines() - */ - public List getProjectVariantHRHDefines() { - return Collections.EMPTY_LIST; - } - - /* (non-Javadoc) - * @see com.nokia.carbide.cpp.sdk.core.ISymbianSDK#getSBVCatalog() - */ - public ISBVCatalog getSBVCatalog() { - return null; - } - public boolean isPreviouslyScanned() { - // TODO Auto-generated method stub - return false; - } - public void setPreviouslyScanned(boolean wasScanned) { - // TODO Auto-generated method stub - - } - - + } \ No newline at end of file