# HG changeset patch # User timkelly # Date 1274106213 18000 # Node ID a5748c5d7b315aa5fae9262ca751152cb94f72a6 # Parent 952666b157724e36d3208c55d5236a549f617c99 removing calls to ISymbianSDK#isEKA1(). For 3.0, EKA1 is not supported so any code returing true from isEKA1() is removed. diff -r 952666b15772 -r a5748c5d7b31 builder/com.nokia.carbide.cdt.builder.test/META-INF/MANIFEST.MF --- a/builder/com.nokia.carbide.cdt.builder.test/META-INF/MANIFEST.MF Mon May 17 08:52:30 2010 -0500 +++ b/builder/com.nokia.carbide.cdt.builder.test/META-INF/MANIFEST.MF Mon May 17 09:23:33 2010 -0500 @@ -15,7 +15,7 @@ com.nokia.carbide.cdt.builder, com.nokia.carbide.cpp.epoc.engine, com.nokia.cpp.utils.core, - org.eclipse.cdt.core, - org.jdom + org.jdom, + org.eclipse.cdt.core Bundle-ActivationPolicy: lazy Export-Package: com.nokia.carbide.cdt.builder.test diff -r 952666b15772 -r a5748c5d7b31 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java --- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java Mon May 17 08:52:30 2010 -0500 +++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java Mon May 17 09:23:33 2010 -0500 @@ -634,12 +634,7 @@ IPath targetP = new Path(targetPath).makeRelative().addTrailingSeparator(); targetPath = targetP.toOSString(); } else { - // for EKA1 just leave empty. for EKA2 use sys\bin\ - if (buildConfig.getSDK().getOSVersion().getMajor() > 8) { - targetPath = "sys\\bin\\"; //$NON-NLS-1$ - } else { - targetPath = ""; //$NON-NLS-1$ - } + targetPath = "sys\\bin\\"; //$NON-NLS-1$ } String dataZDir = buildConfig.getSDK().getReleaseRoot().removeLastSegments(1).toOSString() + "\\Data\\z\\"; //$NON-NLS-1$ @@ -651,11 +646,7 @@ List userResources = mmpData.getUserResources(); for (IPath userRes : userResources) { if (userRes.equals(projectRelativeResourcePath)) { - if (buildConfig.getSDK().isEKA1()) { - rezPath = new Path(dataZDir + targetPath + userRes.removeFileExtension().lastSegment()); - } else { - rezPath = new Path(dataZDir).removeLastSegments(1).append(userRes.removeFileExtension().lastSegment()); - } + rezPath = new Path(dataZDir).removeLastSegments(1).append(userRes.removeFileExtension().lastSegment()); break; } } @@ -1110,19 +1101,6 @@ }; break; - case ICarbideBuildConfiguration.ERROR_PARSERS_ARM_EKA1: - parserIds = new String[] { - "com.nokia.carbide.cdt.builder.MakmakeErrorParser", - "com.nokia.carbide.cdt.builder.SBSv2ErrorParser", - "com.nokia.carbide.cdt.builder.CarbideMakeErrorParser", - "com.nokia.carbide.cdt.builder.RCOMPErrorParser", - "org.eclipse.cdt.core.GCCErrorParser", - "org.eclipse.cdt.core.GLDErrorParser", - "com.nokia.carbide.cdt.builder.MakeDefErrorParser", - "com.nokia.carbide.cdt.builder.DLLToolErrorParser" - }; - break; - case ICarbideBuildConfiguration.ERROR_PARSERS_SIS_BUILDER: parserIds = new String[] { "com.nokia.carbide.cdt.builder.MakeSisErrorParser" @@ -1222,7 +1200,7 @@ } /** - * Invoke the SIS builder for either EKA1 or EKA2 projects. Depending on the os version will + * Invoke the SIS builder for either EKA2 projects. Depending on the os version will * determine if makesis or makeis/signsis will get called * @param pkgPath - Full path to the PKG file to be used to generate the SIS file * @param config - The current configuration from where to get the settings for diff -r 952666b15772 -r a5748c5d7b31 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/project/ICarbideBuildConfiguration.java --- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/project/ICarbideBuildConfiguration.java Mon May 17 08:52:30 2010 -0500 +++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/project/ICarbideBuildConfiguration.java Mon May 17 09:23:33 2010 -0500 @@ -40,8 +40,6 @@ /** Integer identifier for the set of parser to be used for building with makesis, makekeys, and signsis */ public static final int ERROR_PARSERS_SIS_BUILDER = 4; /** Integer identifier for the set of parser to be used for building the ARMI, THUMB, and ARM4 platforms */ - public static final int ERROR_PARSERS_ARM_EKA1 = 5; - /** Integer identifier for the set of parser to be used when calling bldmake bldfiles platform */ public static final int ERROR_PARSERS_BLDMAKE_MAKE = 6; /** Integer identifier for the set of parser to be used for building ROM images */ public static final int ERROR_PARSERS_ROM_BUILDER = 7; diff -r 952666b15772 -r a5748c5d7b31 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideBuildConfiguration.java --- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideBuildConfiguration.java Mon May 17 08:52:30 2010 -0500 +++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideBuildConfiguration.java Mon May 17 09:23:33 2010 -0500 @@ -300,10 +300,6 @@ return ERROR_PARSERS_WINSCW; } else if (plat.startsWith("ARMV")){ return ERROR_PARSERS_ARMVx; - } else if (plat.equals(ISymbianBuildContext.THUMB_PLATFORM) || - plat.equals(ISymbianBuildContext.ARMI_PLATFORM) || - plat.equals(ISymbianBuildContext.ARM4_PLATFORM)){ - return ERROR_PARSERS_ARM_EKA1; } else if (plat.equals(ISymbianBuildContext.GCCE_PLATFORM)){ return ERROR_PARSERS_GCCE; } diff -r 952666b15772 -r a5748c5d7b31 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java --- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java Mon May 17 08:52:30 2010 -0500 +++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java Mon May 17 09:23:33 2010 -0500 @@ -625,11 +625,7 @@ List userResources = mmpData.getUserResources(); for (IPath userRes : userResources) { if (userRes.equals(projectRelativeResourcePath)) { - if (buildConfig.getSDK().isEKA1()) { - rezPath = new Path(dataZDir + targetPath + userRes.removeFileExtension().lastSegment()); - } else { - rezPath = new Path(dataZDir).removeLastSegments(1).append(userRes.removeFileExtension().lastSegment()); - } + rezPath = new Path(dataZDir).removeLastSegments(1).append(userRes.removeFileExtension().lastSegment()); break; } } @@ -705,38 +701,6 @@ // check the project pref to see if we should manage the make files ICarbideProjectInfo cpi = buildConfig.getCarbideProject(); if (cpi.areMakefilesManaged()) { - // if it's an EKA1 SDK then we need to check if our change is there. if not - // then we need to ask them if we can make the change. - final ISymbianSDK sdk = buildConfig.getSDK(); - if (sdk.isEKA1()) { - // check to see if the CARBIDE_CHANGES.TXT file is there - if (!sdk.getToolsPath().append(CARBIDE_CHANGES_FILE).toFile().exists()) { - - // trick to get flag back from runnable - final List shouldUpdate = new ArrayList(0); - - // ask the user if we can update their sdk - Display.getDefault().syncExec(new Runnable() { - - public void run() { - // ask the user if they want to update now - if (MessageDialog.openQuestion(WorkbenchUtils.getSafeShell(), - "SDK Update Required", - "In order for Carbide to manage dependencies and improve build times, we need to make a minor change to one of the files in your SDK. This will not affect builds outside of Carbide in any way. Would you like to make this change?")) { - shouldUpdate.add(Boolean.TRUE); - } - } - }); - - if (shouldUpdate.size() == 1 && shouldUpdate.get(0).booleanValue()) { - if (!updateMakDepsFile(sdk)) { - return false; - } - } else { - return false; - } - } - } return true; } return false; @@ -2573,13 +2537,7 @@ // create a path to the directory where the make files live IPath makefilePath = new Path(config.getSDK().getEPOCROOT()).append(EPOC_BUILD_DIR); - // in EKA1 kits, you append the path to the mmp file to the epoc32 build directory. in EKA2, they - // changed it to be the path to the bld.inf file. (see bldmake.pl sub CreatePlatMak()) - if (config.getSDK().isEKA1()) { - makefilePath = makefilePath.append(componentPath.removeLastSegments(1).setDevice(null)); - } else { - makefilePath = makefilePath.append(config.getCarbideProject().getINFWorkingDirectory().setDevice(null)); - } + makefilePath = makefilePath.append(config.getCarbideProject().getINFWorkingDirectory().setDevice(null)); // each mmp file has its own directory String mmpName = componentPath.removeFileExtension().lastSegment().toUpperCase(); @@ -2696,24 +2654,6 @@ macroText = macroText + " -MD" + view.getEOL(); view.replaceDirective(macro, macroText); - } else if (platform.equals(ISymbianBuildContext.ARMI_PLATFORM) || - platform.equals(ISymbianBuildContext.ARM4_PLATFORM) || - platform.equals(ISymbianBuildContext.THUMB_PLATFORM)) { - - // append the -MD switch to the GCCFLAGS macro - IMacroDefinition[] macros = view.getAllMacroDefinitions("GCCFLAGS"); - if (macros.length < 1) { - throw new CoreException(new Status(IStatus.ERROR, CarbideBuilderPlugin.PLUGIN_ID, 0, "GCCFLAGS macro not found in makefile", null)); //$NON-NLS-1$ - } - IMacroDefinition macro = macros[macros.length - 1]; - // add the switches before to the end of the macro. toString may add a line delimiter to the end so strip that off - String macroText = macro.toString(); - if (macroText.endsWith("\n")) { - macroText = macroText.substring(0, macroText.length() - 1); - } - macroText = macroText + " -MD" + view.getEOL(); - view.replaceDirective(macro, macroText); - } else { // assuming some version of RVCT IMacroDefinition[] macros = view.getAllMacroDefinitions("ARMCCFLAGS"); @@ -2864,19 +2804,6 @@ macros = defs[0].getValue().toString(); macros = view.expandAllMacrosInString(macros); - } else if (platform.equals(ISymbianBuildContext.ARMI_PLATFORM) || - platform.equals(ISymbianBuildContext.ARM4_PLATFORM) || - platform.equals(ISymbianBuildContext.THUMB_PLATFORM)) { - // the macros are listed in the GCCDEFS macro - IMacroDefinition[] defs = view.getAllMacroDefinitions("GCCDEFS"); - if (defs.length != 1) { - throw new CoreException(new Status(IStatus.ERROR, CarbideBuilderPlugin.PLUGIN_ID, 0, "GCCDEFS macro not found in makefile", null)); //$NON-NLS-1$ - } - - // need to expand macros here - macros = defs[0].getValue().toString(); - macros = view.expandAllMacrosInString(macros); - } else { // assuming some version of RVCT // the macros are listed in the ARMCCDEFS macro @@ -2982,17 +2909,8 @@ if (!platform.equals(ISymbianBuildContext.EMULATOR_PLATFORM) && !platform.equals(ISymbianBuildContext.GCCE_PLATFORM)) { - if (platform.equals(ISymbianBuildContext.ARM4_PLATFORM) || - platform.equals(ISymbianBuildContext.ARMI_PLATFORM) || - platform.equals(ISymbianBuildContext.THUMB_PLATFORM)) { - if (!isGCC30) { - moveDepFile = true; - } - } else { // some form of ARMV5|6 moveDepFile = true; - } - } if (moveDepFile) { @@ -3005,17 +2923,8 @@ plat = "winscw"; } else if (platform.equals(ISymbianBuildContext.GCCE_PLATFORM)) { plat = "gcce"; - } else if (platform.equals(ISymbianBuildContext.ARM4_PLATFORM) || - platform.equals(ISymbianBuildContext.ARMI_PLATFORM) || - platform.equals(ISymbianBuildContext.THUMB_PLATFORM)) { - if (isGCC30) { - plat = "gcce"; - } else { - plat = "gcc98"; - } - } else { - // assume some version of rvct. no need to do anything since the dep files are generated correctly } + if (plat.length() > 0) { newRule = newRule + "\tperl -S " + dep_file_paths_perl_script + " " + destPath.toOSString() + " " + plat + view.getEOL() + view.getEOL(); } diff -r 952666b15772 -r a5748c5d7b31 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo.java --- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo.java Mon May 17 08:52:30 2010 -0500 +++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo.java Mon May 17 09:23:33 2010 -0500 @@ -309,11 +309,7 @@ if (cpi.areMakefilesManaged()) { // we have to use something other than NO_DEPENDENCIES in EKA1 since some SDK's like S60_2nd_FP3 // have part of the no dependency support but not all, which would cause errors. - if (sdk.isEKA1()) { - returnEnvArray = addToArray(returnEnvArray, CARBIDE_NO_DEPENDENCIES + EQUALS + NO_DEPENDENCIES_VALUE); - } else { - returnEnvArray = addToArray(returnEnvArray, NO_DEPENDENCIES + EQUALS + NO_DEPENDENCIES_VALUE); - } + returnEnvArray = addToArray(returnEnvArray, NO_DEPENDENCIES + EQUALS + NO_DEPENDENCIES_VALUE); } // set the MAKE variable to the correct value when concurrent building is enabled diff -r 952666b15772 -r a5748c5d7b31 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo2.java --- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo2.java Mon May 17 08:52:30 2010 -0500 +++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo2.java Mon May 17 09:23:33 2010 -0500 @@ -327,13 +327,7 @@ if (!CarbideBuilderPlugin.getBuildManager().isCarbideSBSv2Project(projectTracker.getProject())) { // for managed projects, set the NO_DEPENDENCIES env variable to -nd to turn off dependency generation in makmake if (cpi.areMakefilesManaged()) { - // we have to use something other than NO_DEPENDENCIES in EKA1 since some SDK's like S60_2nd_FP3 - // have part of the no dependency support but not all, which would cause errors. - if (sdk.isEKA1()) { - returnEnvArray = addToArray(returnEnvArray, CARBIDE_NO_DEPENDENCIES + EQUALS + NO_DEPENDENCIES_VALUE); - } else { - returnEnvArray = addToArray(returnEnvArray, NO_DEPENDENCIES + EQUALS + NO_DEPENDENCIES_VALUE); - } + returnEnvArray = addToArray(returnEnvArray, NO_DEPENDENCIES + EQUALS + NO_DEPENDENCIES_VALUE); } // set the MAKE variable to the correct value when concurrent building is enabled diff -r 952666b15772 -r a5748c5d7b31 core/com.nokia.carbide.cpp.sdk.core/data/symbianMacroStore.xml --- a/core/com.nokia.carbide.cpp.sdk.core/data/symbianMacroStore.xml Mon May 17 08:52:30 2010 -0500 +++ b/core/com.nokia.carbide.cpp.sdk.core/data/symbianMacroStore.xml Mon May 17 09:23:33 2010 -0500 @@ -619,162 +619,6 @@ - - - - CW32 - WINS - WINSCW - - - GCC32 - EPOC32 - MARM - GENERIC_MARM - MARM_THUMB - - - GCC32 - EPOC32 - MARM - GENERIC_MARM - MARM_ARMI - - - GCC32 - EPOC32 - MARM - GENERIC_MARM - MARM_ARM4 - - - - EKA1 - - - - - - - CW32 - WINS - WINSCW - - - GCC32 - EPOC32 - MARM - GENERIC_MARM - MARM_THUMB - - - GCC32 - EPOC32 - MARM - GENERIC_MARM - MARM_ARMI - - - GCC32 - EPOC32 - MARM - GENERIC_MARM - MARM_ARM4 - - - - EKA1 - - - - - - - CW32 - WINS - WINSCW - - - GCC32 - EPOC32 - MARM - GENERIC_MARM - MARM_THUMB - - - GCC32 - EPOC32 - MARM - GENERIC_MARM - MARM_ARMI - - - GCC32 - EPOC32 - MARM - GENERIC_MARM - MARM_ARM4 - - - - EKA1 - - - - - - - CW32 - WINS - WINSCW - - - GCC32 - EPOC32 - MARM - GENERIC_MARM - MARM_THUMB - - - GCC32 - EPOC32 - MARM - GENERIC_MARM - MARM_ARMI - - - GCC32 - EPOC32 - MARM - GENERIC_MARM - MARM_ARM4 - - - - EKA1 - - - - - - - CW32 - WINS - WINSCW - - - GCC32 - EPOC32 - MARM - GENERIC_MARM - MARM_THUMB - - - - EKA2 - - - diff -r 952666b15772 -r a5748c5d7b31 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildPlat.java --- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildPlat.java Mon May 17 08:52:30 2010 -0500 +++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildPlat.java Mon May 17 09:23:33 2010 -0500 @@ -14,7 +14,6 @@ public class BuildPlat { - public static final String EKA1_IDENTIFIER = "EKA1"; public static final String EKA2_IDENTIFIER = "EKA2"; private String platName; diff -r 952666b15772 -r a5748c5d7b31 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java --- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java Mon May 17 08:52:30 2010 -0500 +++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java Mon May 17 09:23:33 2010 -0500 @@ -268,11 +268,7 @@ } private String getDefFileDirectoryNameForPlatform(String platform) { - if (platform.equals(THUMB_PLATFORM) - || platform.equals(ARM4_PLATFORM) - || platform.equals(ARMI_PLATFORM)) { - return "BMARM"; //$NON-NLS-1$ - } else if (platform.equals(EMULATOR_PLATFORM)) { + if (platform.equals(EMULATOR_PLATFORM)) { return "BWINS"; //$NON-NLS-1$ } else if (platform.equals(ARMV5_PLATFORM) || platform.equals(ARMV5_ABIV2_PLATFORM) @@ -293,11 +289,6 @@ || platform.equals(ARMV6_PLATFORM) || platform.equals(ARMV6_ABIV2_PLATFORM)) { return getRVCTPrefixFilePath(); - } else if (platform.equals(EMULATOR_PLATFORM) - || platform.equals(ARMI_PLATFORM) - || platform.equals(ARM4_PLATFORM) - || platform.equals(THUMB_PLATFORM)) { - return null; } else { // check BSF's IBSFCatalog catalog = getSDK().getBSFCatalog(); diff -r 952666b15772 -r a5748c5d7b31 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java --- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java Mon May 17 08:52:30 2010 -0500 +++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java Mon May 17 09:23:33 2010 -0500 @@ -264,12 +264,6 @@ continue; } - if (!currPlat.equals(ISymbianBuildContext.ARM4_PLATFORM) && - !currPlat.equals(ISymbianBuildContext.ARMI_PLATFORM) && - !currPlat.equals(ISymbianBuildContext.THUMB_PLATFORM)) { // EKA1 targets don't get debug builds - buildTargets.add(new SymbianBuildContext(this, currPlat, ISymbianBuildContext.DEBUG_TARGET)); - } - // everything gets release except for WINSCW buildTargets.add(new SymbianBuildContext(this, currPlat, ISymbianBuildContext.RELEASE_TARGET)); } @@ -358,16 +352,12 @@ if (currPlat.getPlatName().equals(currContext.getPlatformString())){ if (!currPlat.isEnabled()){ - if (isEKA1()&& currPlat.getOsIdentifier().equals(BuildPlat.EKA1_IDENTIFIER)){ - li.remove(); // filtered out in UI, don't show - break; - } else if (isEKA2() && currPlat.getOsIdentifier().equals(BuildPlat.EKA2_IDENTIFIER)){ + if (isEKA2() && currPlat.getOsIdentifier().equals(BuildPlat.EKA2_IDENTIFIER)){ li.remove(); // filtered out in UI, don't show break; } } } - } } diff -r 952666b15772 -r a5748c5d7b31 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISymbianBuildContext.java --- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISymbianBuildContext.java Mon May 17 08:52:30 2010 -0500 +++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISymbianBuildContext.java Mon May 17 09:23:33 2010 -0500 @@ -33,9 +33,6 @@ * Platform constants */ public static final String EMULATOR_PLATFORM = "WINSCW"; - public static final String ARMI_PLATFORM = "ARMI"; - public static final String ARM4_PLATFORM = "ARM4"; - public static final String THUMB_PLATFORM = "THUMB"; public static final String GCCE_PLATFORM = "GCCE"; public static final String ARMV5_PLATFORM = "ARMV5"; public static final String ARMV6_PLATFORM = "ARMV6"; diff -r 952666b15772 -r a5748c5d7b31 core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/api/sdk/ui/SBSv1PlatformFilterComposite.java --- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/api/sdk/ui/SBSv1PlatformFilterComposite.java Mon May 17 08:52:30 2010 -0500 +++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/api/sdk/ui/SBSv1PlatformFilterComposite.java Mon May 17 09:23:33 2010 -0500 @@ -46,11 +46,6 @@ private Button platEKA2_ARMV5_ABIV2; private Button platEKA2_ARMV5_ABIV1; - private Button platEKA1_WINSCW; - private Button platEKA1_ARMI; - private Button platEKA1_ARM4; - private Button platEKA1_THUMB; - private Button enableBSFScanner; @@ -95,18 +90,6 @@ eka1PlatformsGroup.setText(Messages.getString("BuildPlatformFilterPage.EKA1_Platforms_Label")); //$NON-NLS-1$ eka1PlatformsGroup.setLayout(new GridLayout()); - platEKA1_WINSCW = new Button(eka1PlatformsGroup, SWT.CHECK); - platEKA1_WINSCW.setText("Emulation (WINSCW)"); //$NON-NLS-1$ - - platEKA1_ARMI = new Button(eka1PlatformsGroup, SWT.CHECK); - platEKA1_ARMI.setText("ARMI"); //$NON-NLS-1$ - - platEKA1_ARM4 = new Button(eka1PlatformsGroup, SWT.CHECK); - platEKA1_ARM4.setText("ARM4"); //$NON-NLS-1$ - - platEKA1_THUMB = new Button(eka1PlatformsGroup, SWT.CHECK); - platEKA1_THUMB.setText("THUMB"); //$NON-NLS-1$ - enableBSFScanner = new Button(this, SWT.CHECK); enableBSFScanner.setToolTipText(Messages.getString("BuildPlatformFilterPage.BSF_Help")); //$NON-NLS-1$ enableBSFScanner.setText(Messages.getString("BuildPlatformFilterPage.BSF_Label")); //$NON-NLS-1$ @@ -123,17 +106,7 @@ for (BuildPlat currBldPlat : bldPlatList) { if (currBldPlat.getPlatName().equals("WINSCW")){ //$NON-NLS-1$ - if (currBldPlat.getOsIdentifier().equals(BuildPlat.EKA1_IDENTIFIER)){ - platEKA1_WINSCW.setSelection(currBldPlat.isEnabled()); - } else { platEKA2_WINSCW.setSelection(currBldPlat.isEnabled()); - } - } else if (currBldPlat.getPlatName().equals("THUMB")){ //$NON-NLS-1$ - platEKA1_THUMB.setSelection(currBldPlat.isEnabled()); - } else if (currBldPlat.getPlatName().equals("ARMI")){ //$NON-NLS-1$ - platEKA1_ARMI.setSelection(currBldPlat.isEnabled()); - } else if (currBldPlat.getPlatName().equals("ARM4")){ //$NON-NLS-1$ - platEKA1_ARM4.setSelection(currBldPlat.isEnabled()); } else if (currBldPlat.getPlatName().equals("GCCE")){ //$NON-NLS-1$ platEKA2_GCCE.setSelection(currBldPlat.isEnabled()); } else if (currBldPlat.getPlatName().equals("ARMV5")){ //$NON-NLS-1$ @@ -155,12 +128,6 @@ ISDKManager sdkMgr = SDKCorePlugin.getSDKManager(); sdkMgr.enableBSFScanner(prefsStore.getBoolean(SDKUIPreferenceConstants.ENABLE_BSF_SCANNER)); - BuildPlat bldPlat = new BuildPlat("WINSCW", BuildPlat.EKA1_IDENTIFIER, prefsStore.getBoolean(SDKUIPreferenceConstants.PLAT_EKA1_WINSCW)); - buildPlatList.add(bldPlat); - buildPlatList.add(new BuildPlat("ARM4", BuildPlat.EKA1_IDENTIFIER, prefsStore.getBoolean(SDKUIPreferenceConstants.PLAT_EKA1_ARM4))); - buildPlatList.add(new BuildPlat("ARMI", BuildPlat.EKA1_IDENTIFIER, prefsStore.getBoolean(SDKUIPreferenceConstants.PLAT_EKA1_ARMI))); - buildPlatList.add(new BuildPlat("THUMB", BuildPlat.EKA1_IDENTIFIER, prefsStore.getBoolean(SDKUIPreferenceConstants.PLAT_EKA1_THUMB))); - buildPlatList.add(new BuildPlat("WINSCW", BuildPlat.EKA2_IDENTIFIER, prefsStore.getBoolean(SDKUIPreferenceConstants.PLAT_EKA2_WINSCW))); buildPlatList.add(new BuildPlat("ARMV5", BuildPlat.EKA2_IDENTIFIER, prefsStore.getBoolean(SDKUIPreferenceConstants.PLAT_EKA2_ARMV5))); buildPlatList.add(new BuildPlat("ARMV5_ABIV2", BuildPlat.EKA2_IDENTIFIER, prefsStore.getBoolean(SDKUIPreferenceConstants.PLAT_EKA2_ARMV5_ABIV2))); @@ -181,12 +148,7 @@ writePlatFilterOptionSetting(SDKUIPreferenceConstants.PLAT_EKA2_ARMV5, platEKA2_ARMV5.getSelection()); writePlatFilterOptionSetting(SDKUIPreferenceConstants.PLAT_EKA2_ARMV5_ABIV2, platEKA2_ARMV5_ABIV2.getSelection()); writePlatFilterOptionSetting(SDKUIPreferenceConstants.PLAT_EKA2_ARMV5_ABIV1, platEKA2_ARMV5_ABIV1.getSelection()); - - writePlatFilterOptionSetting(SDKUIPreferenceConstants.PLAT_EKA1_WINSCW, platEKA1_WINSCW.getSelection()); - writePlatFilterOptionSetting(SDKUIPreferenceConstants.PLAT_EKA1_THUMB, platEKA1_THUMB.getSelection()); - writePlatFilterOptionSetting(SDKUIPreferenceConstants.PLAT_EKA1_ARMI, platEKA1_ARMI.getSelection()); - writePlatFilterOptionSetting(SDKUIPreferenceConstants.PLAT_EKA1_ARM4, platEKA1_ARM4.getSelection()); - + // update data structures that are passed back to the sdk.core getPlatFilterPrefsStore(); } @@ -199,10 +161,6 @@ platEKA2_ARMV5_ABIV2.setSelection(false); platEKA2_ARMV5_ABIV1.setSelection(false); - platEKA1_WINSCW.setSelection(true); - platEKA1_THUMB.setSelection(true); - platEKA1_ARMI.setSelection(true); - platEKA1_ARM4.setSelection(true); } private void writePlatFilterOptionSetting(String platFilterIdName, boolean value){ @@ -210,14 +168,6 @@ if (platFilterIdName.equals(SDKUIPreferenceConstants.ENABLE_BSF_SCANNER)){ prefsStore.setValue(SDKUIPreferenceConstants.ENABLE_BSF_SCANNER, value); - } else if (platFilterIdName.equals(SDKUIPreferenceConstants.PLAT_EKA1_ARM4)){ - prefsStore.setValue(SDKUIPreferenceConstants.PLAT_EKA1_ARM4, value); - } else if (platFilterIdName.equals(SDKUIPreferenceConstants.PLAT_EKA1_ARMI)){ - prefsStore.setValue(SDKUIPreferenceConstants.PLAT_EKA1_ARMI, value); - } else if (platFilterIdName.equals(SDKUIPreferenceConstants.PLAT_EKA1_THUMB)){ - prefsStore.setValue(SDKUIPreferenceConstants.PLAT_EKA1_THUMB, value); - } else if (platFilterIdName.equals(SDKUIPreferenceConstants.PLAT_EKA1_WINSCW)){ - prefsStore.setValue(SDKUIPreferenceConstants.PLAT_EKA1_WINSCW, value); } else if (platFilterIdName.equals(SDKUIPreferenceConstants.PLAT_EKA2_ARMV5)){ prefsStore.setValue(SDKUIPreferenceConstants.PLAT_EKA2_ARMV5, value); } else if (platFilterIdName.equals(SDKUIPreferenceConstants.PLAT_EKA2_ARMV5_ABIV2)){ diff -r 952666b15772 -r a5748c5d7b31 core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKUIPreferenceConstants.java --- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKUIPreferenceConstants.java Mon May 17 08:52:30 2010 -0500 +++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKUIPreferenceConstants.java Mon May 17 09:23:33 2010 -0500 @@ -26,10 +26,5 @@ public final static String PLAT_EKA2_ARMV5_ABIV2 = "platEKA2_ARMV5_ABIV2"; //$NON-NLS-1$ public final static String PLAT_EKA2_ARMV5_ABIV1 = "platEKA2_ARMV5_ABIV1"; //$NON-NLS-1$ - public final static String PLAT_EKA1_WINSCW = "platEKA1_WINSCW"; //$NON-NLS-1$ - public final static String PLAT_EKA1_ARMI = "platEKA1_ARMI"; //$NON-NLS-1$ - public final static String PLAT_EKA1_ARM4 = "platEKA1_ARM4"; //$NON-NLS-1$ - public final static String PLAT_EKA1_THUMB = "platEKA1_THUMB"; //$NON-NLS-1$ - public final static String LISTEN_FOR_DEVICES_XML_CHANGE = "listenForDevicesXMLChange"; //$NON-NLS-1$ } diff -r 952666b15772 -r a5748c5d7b31 core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKUIPreferenceInitializer.java --- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKUIPreferenceInitializer.java Mon May 17 08:52:30 2010 -0500 +++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKUIPreferenceInitializer.java Mon May 17 09:23:33 2010 -0500 @@ -40,11 +40,6 @@ store.setDefault(SDKUIPreferenceConstants.PLAT_EKA2_ARMV5, true); store.setDefault(SDKUIPreferenceConstants.PLAT_EKA2_ARMV5_ABIV2, false); store.setDefault(SDKUIPreferenceConstants.PLAT_EKA2_ARMV5_ABIV1, false); - - store.setDefault(SDKUIPreferenceConstants.PLAT_EKA1_WINSCW, true); - store.setDefault(SDKUIPreferenceConstants.PLAT_EKA1_ARMI, true); - store.setDefault(SDKUIPreferenceConstants.PLAT_EKA1_ARM4, false); - store.setDefault(SDKUIPreferenceConstants.PLAT_EKA1_THUMB, true); } } diff -r 952666b15772 -r a5748c5d7b31 project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestMMPView3.java --- a/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestMMPView3.java Mon May 17 08:52:30 2010 -0500 +++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestMMPView3.java Mon May 17 09:23:33 2010 -0500 @@ -44,7 +44,6 @@ ISymbianSDK sdk; ISymbianBuildContext winscwContext; ISymbianBuildContext armv5Context; - ISymbianBuildContext armiContext; ISymbianBuildContext gcceContext; @Override protected void setUp() throws Exception { @@ -71,11 +70,9 @@ if (sdk != null) { winscwContext = new SymbianBuildContext(sdk, "WINSCW", "UDEB"); armv5Context = new SymbianBuildContext(sdk, "ARMV5", "UDEB"); - armiContext = new SymbianBuildContext(sdk, "ARMI", "UREL"); gcceContext = new SymbianBuildContext(sdk, "GCCE", "UREL"); buildContexts.add(winscwContext); buildContexts.add(armv5Context); - buildContexts.add(armiContext); buildContexts.add(gcceContext); } } @@ -87,8 +84,6 @@ if (context == winscwContext) { viewConfiguration.getExtraMacros().add(DefineFactory.createSimpleFreeformDefine("WINS")); - } else if (context == armiContext) { - viewConfiguration.getExtraMacros().add(DefineFactory.createSimpleFreeformDefine("GCC32")); } ((DefaultViewParserConfiguration)viewConfiguration.getViewParserConfiguration()).setProjectPath(projectPath); @@ -177,7 +172,6 @@ assertDefFile(text, winscwContext, "bwins/unnamedU.def"); assertDefFile(text, armv5Context, "eabi/unnamedU.def"); - assertDefFile(text, armiContext, "bmarm/unnamedU.def"); assertDefFile(text, gcceContext, "eabi/unnamedU.def"); // target-based filename @@ -185,7 +179,6 @@ "TARGETTYPE EXEdll\n"; assertDefFile(text, winscwContext, "bwins/fooU.def"); assertDefFile(text, armv5Context, "eabi/fooU.def"); - assertDefFile(text, armiContext, "bmarm/fooU.def"); assertDefFile(text, gcceContext, "eabi/fooU.def"); // default filename, no U @@ -194,7 +187,6 @@ assertDefFile(text, winscwContext, "bwins/unnamed.def"); assertDefFile(text, armv5Context, "eabi/unnamed.def"); - assertDefFile(text, armiContext, "bmarm/unnamed.def"); assertDefFile(text, gcceContext, "eabi/unnamed.def"); // target-based filename, no U @@ -203,7 +195,6 @@ "TARGETTYPE EXEdll\n"; assertDefFile(text, winscwContext, "bwins/foo.def"); assertDefFile(text, armv5Context, "eabi/foo.def"); - assertDefFile(text, armiContext, "bmarm/foo.def"); assertDefFile(text, gcceContext, "eabi/foo.def"); } @@ -220,7 +211,6 @@ assertDefFile(text, winscwContext, "bwins/myfileU.def"); assertDefFile(text, armv5Context, "eabi/myfileU.def"); - assertDefFile(text, armiContext, "bmarm/myfileU.def"); assertDefFile(text, gcceContext, "eabi/myfileU.def"); // target-based filename, no U @@ -230,7 +220,6 @@ "DEFFILE myfile"; assertDefFile(text, winscwContext, "bwins/myfile.def"); assertDefFile(text, armv5Context, "eabi/myfile.def"); - assertDefFile(text, armiContext, "bmarm/myfile.def"); assertDefFile(text, gcceContext, "eabi/myfile.def"); } @@ -246,14 +235,12 @@ assertDefFile(text, winscwContext, "myfileU.def"); assertDefFile(text, armv5Context, "myfileU.def"); - assertDefFile(text, armiContext, "myfileU.def"); assertDefFile(text, gcceContext, "myfileU.def"); text = "NOSTRICTDEF\n"+ "DEFFILE ..\\myfile"; assertDefFile(text, winscwContext, "myfile.def"); assertDefFile(text, armv5Context, "myfile.def"); - assertDefFile(text, armiContext, "myfile.def"); assertDefFile(text, gcceContext, "myfile.def"); } @@ -270,7 +257,6 @@ assertDefFile(text, winscwContext, "group/deffiles/myfileU.def"); assertDefFile(text, armv5Context, "group/deffiles/myfileU.def"); - assertDefFile(text, armiContext, "group/deffiles/myfileU.def"); assertDefFile(text, gcceContext, "group/deffiles/myfileU.def"); // this fixes the directory meaning platform is not supplied @@ -285,7 +271,6 @@ "#endif\n"; assertDefFile(text, winscwContext, "group/deffiles/winscw/myfileU.def"); assertDefFile(text, armv5Context, "group/deffiles/eabi/myfileU.def"); - assertDefFile(text, armiContext, "group/deffiles/bmarm/myfileU.def"); assertDefFile(text, gcceContext, "group/deffiles/eabi/myfileU.def"); } @@ -300,7 +285,6 @@ assertDefFile(text, winscwContext, "/bwins/release/deffiles/myfileU.def"); assertDefFile(text, armv5Context, "/eabi/release/deffiles/myfileU.def"); - assertDefFile(text, armiContext, "/bmarm/release/deffiles/myfileU.def"); assertDefFile(text, gcceContext, "/eabi/release/deffiles/myfileU.def"); text = "TARGETTYPE DlL\n"+ @@ -309,7 +293,6 @@ assertDefFile(text, winscwContext, "places/bwins/myfileU.def"); assertDefFile(text, armv5Context, "places/eabi/myfileU.def"); - assertDefFile(text, armiContext, "places/bmarm/myfileU.def"); assertDefFile(text, gcceContext, "places/eabi/myfileU.def"); text = "TARGETTYPE DlL\n"+ @@ -318,7 +301,6 @@ assertDefFile(text, winscwContext, "group/bwins/fileU.def"); assertDefFile(text, armv5Context, "group/eabi/fileU.def"); - assertDefFile(text, armiContext, "group/bmarm/fileU.def"); assertDefFile(text, gcceContext, "group/eabi/fileU.def"); /// @@ -330,7 +312,6 @@ assertDefFile(text, winscwContext, "/bwins/release/deffiles/myfile.def"); assertDefFile(text, armv5Context, "/eabi/release/deffiles/myfile.def"); - assertDefFile(text, armiContext, "/bmarm/release/deffiles/myfile.def"); assertDefFile(text, gcceContext, "/eabi/release/deffiles/myfile.def"); text = "TARGETTYPE DlL\n"+ @@ -340,7 +321,6 @@ assertDefFile(text, winscwContext, "places/bwins/myfile.def"); assertDefFile(text, armv5Context, "places/eabi/myfile.def"); - assertDefFile(text, armiContext, "places/bmarm/myfile.def"); assertDefFile(text, gcceContext, "places/eabi/myfile.def"); text = "TARGETTYPE DlL\n"+ @@ -350,7 +330,6 @@ assertDefFile(text, winscwContext, "group/bwins/file.def"); assertDefFile(text, armv5Context, "group/eabi/file.def"); - assertDefFile(text, armiContext, "group/bmarm/file.def"); assertDefFile(text, gcceContext, "group/eabi/file.def"); } diff -r 952666b15772 -r a5748c5d7b31 project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/ResourcePresentationModel.java --- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/ResourcePresentationModel.java Mon May 17 08:52:30 2010 -0500 +++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/mmpEditor/ResourcePresentationModel.java Mon May 17 09:23:33 2010 -0500 @@ -680,7 +680,8 @@ supportOldStyleResource = userResources.size() > 0 || systemResources.size() > 0; // Only support AIF if we're on a pre 9.0 (EKA1) system - supportAIF = editorContext.activeBuildConfig.getSDK().isEKA1(); + //supportAIF = editorContext.activeBuildConfig.getSDK().isEKA1(); + supportAIF = false; // Carbide 3.0 does not support EKA1 List nodes = new ArrayList(); nodes.add(resourceBlocks);