Remove makefile dependency checks on SBSv2 builder since they don't apply.
Remove SBSv2BuilderInfo.java and functionality. That has been used for loading the SBSv2 tab, which no longer exists.
Now the SBSv2 data in the .cproject is loaded directly by the build configuration loading mechanism.
--- a/builder/com.nokia.carbide.cdt.builder/META-INF/MANIFEST.MF Tue Aug 03 14:18:04 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/META-INF/MANIFEST.MF Tue Aug 03 16:29:13 2010 -0500
@@ -25,8 +25,9 @@
Bundle-ActivationPolicy: lazy
Export-Package: com.nokia.carbide.cdt.builder,
com.nokia.carbide.cdt.builder.builder,
+ com.nokia.carbide.cdt.builder.extension,
com.nokia.carbide.cdt.builder.project,
com.nokia.carbide.cdt.internal.api.builder,
com.nokia.carbide.cdt.internal.api.builder.ui,
- com.nokia.carbide.cdt.builder.extension
+ com.nokia.carbide.cdt.internal.builder;x-friends:="com.nokia.carbide.cpp.builder.utils"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java Tue Aug 03 14:18:04 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java Tue Aug 03 16:29:13 2010 -0500
@@ -2047,6 +2047,19 @@
invokeBuild(config, launcher, monitor, clearMarkers);
}
+ /**
+ * Check to see if abld.bat and the SDK's platform makefile exists. If either don't exist, re-generate makefiles
+ * This also tests to make sure the makefile target is OLDER than the bld.inf file.
+ * @param bldInfDir - The working dir of the bld.inf file (should not contain 'bld.inf')
+ * @param defaultConfig - The ISymbianBuildConfiguration to be built.
+ * @return true if makefiles need to be regenerated
+ *
+ * @deprecated use {@link #needsBldmakeMakefileGeneration(ICarbideBuildConfiguration)}
+ */
+ public static boolean projectNeedsMakefileGeneration(IPath bldInfDir, ICarbideBuildConfiguration defaultConfig){
+ return needsBldmakeMakefileGeneration(defaultConfig);
+ }
+
/**
* Checks the Problems view for any error markers.
* @param project - IProject to check for problem markers
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideBuildConfiguration.java Tue Aug 03 14:18:04 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideBuildConfiguration.java Tue Aug 03 16:29:13 2010 -0500
@@ -75,7 +75,7 @@
protected EnvironmentVarsInfo2 envVarsInfo;
protected BuildConfigurationData buildConfigData;
- protected SBSv2BuilderInfo sbsv2BuilderInfo;
+
protected boolean rebuildNeeded;
public CarbideBuildConfiguration(IProject project, ISymbianBuildContext context) {
@@ -85,9 +85,7 @@
envVarsInfo = new EnvironmentVarsInfo2(project, context);
buildConfigData = new BuildConfigurationData(this);
- if (CarbideBuilderPlugin.getBuildManager().isCarbideSBSv2Project(project)){
- sbsv2BuilderInfo = new SBSv2BuilderInfo((ISBSv2BuildContext)context);
- }
+
rebuildNeeded = true;
}
@@ -106,11 +104,7 @@
}
} else if (se.getName().equals(ENV_VAR_DATA_ID)) {
envVarsInfo.loadFromStorage(se);
- } else if (se.getName().equals(SBSV2_DATA_ID)){
- if (sbsv2BuilderInfo != null){
- sbsv2BuilderInfo.loadFromStorage(se);
- }
- }
+ }
// Load build context specific settings.
getBuildContext().loadConfigurationSettings(se);
@@ -135,15 +129,9 @@
// Save build context specific settings.
this.getBuildContext().saveConfigurationSettings(rootStorage);
-
- if (CarbideBuilderPlugin.getBuildManager().isCarbideSBSv2Project(getCarbideProject().getProject())){
- sbsv2BuilderInfo.saveToStorage(rootStorage.createChild(SBSV2_DATA_ID));
- }
}
}
-
-
public ICarbideProjectInfo getCarbideProject() {
// we need to get the project info from the build manager to ensure we
// have the correct object.
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java Tue Aug 03 14:18:04 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java Tue Aug 03 16:29:13 2010 -0500
@@ -3116,4 +3116,6 @@
public IPath getMakefileDirectory(ICarbideBuildConfiguration config) {
return new Path(config.getSDK().getEPOCROOT()).append(EPOC_BUILD_DIR).append(config.getCarbideProject().getAbsoluteBldInfPath().removeLastSegments(1).setDevice(null));
}
+
+
}
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java Tue Aug 03 14:18:04 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java Tue Aug 03 16:29:13 2010 -0500
@@ -29,7 +29,6 @@
import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
import com.nokia.carbide.cdt.builder.EpocEngineHelper;
-import com.nokia.carbide.cdt.builder.builder.CarbideCPPBuilder;
import com.nokia.carbide.cdt.builder.builder.CarbideCommandLauncher;
import com.nokia.carbide.cdt.builder.project.ICarbideBuildConfiguration;
import com.nokia.carbide.cdt.builder.project.ICarbideProjectInfo;
@@ -49,10 +48,6 @@
SubMonitor progress = SubMonitor.convert(monitor, 3);
progress.setTaskName(CarbideBuildManagerUtils.getBuildLabel(buildConfig, null));
-
- if (!CarbideCPPBuilder.generateBldmakeMakefilesIfNecessary(buildConfig, launcher)) {
- return false;
- }
progress.worked(1);
if (progress.isCanceled()) {
@@ -109,10 +104,6 @@
public boolean buildComponent(ICarbideBuildConfiguration buildConfig, IPath componentPath, boolean isTest, CarbideCommandLauncher launcher, IProgressMonitor monitor) {
String componentName = componentPath.lastSegment();
- if (!CarbideCPPBuilder.generateBldmakeMakefilesIfNecessary(buildConfig, launcher)) {
- return false;
- }
-
SubMonitor progress = SubMonitor.convert(monitor, 1);
progress.setTaskName(CarbideBuildManagerUtils.getBuildLabel(buildConfig, componentName));
@@ -139,10 +130,6 @@
SubMonitor progress = SubMonitor.convert(monitor, 1 + normalMakMakePaths.size() + testMakMakePaths.size());
progress.setTaskName(CarbideBuildManagerUtils.getBuildLabel(buildConfig, null));
- if (!CarbideCPPBuilder.generateBldmakeMakefilesIfNecessary(buildConfig, launcher)) {
- return false;
- }
-
progress.worked(1);
if (progress.isCanceled()) {
return false;
@@ -193,10 +180,6 @@
SubMonitor progress = SubMonitor.convert(monitor, 3);
progress.setTaskName("Cleaning " + buildConfig.getDisplayString());
- if (!CarbideCPPBuilder.generateBldmakeMakefilesIfNecessary(buildConfig, launcher)) {
- return;
- }
-
progress.worked(1);
if (progress.isCanceled()) {
return;
@@ -246,10 +229,6 @@
SubMonitor progress = SubMonitor.convert(monitor, 2);
progress.setTaskName("Cleaning " + componentName);
- if (!CarbideCPPBuilder.generateBldmakeMakefilesIfNecessary(buildConfig, launcher)) {
- return false;
- }
-
int cleanLevel = buildConfig.getCarbideProject().getCleanLevel();
String cleanCmd = REALLYCLEAN_CMD;
if (0 == cleanLevel) {
@@ -280,10 +259,6 @@
SubMonitor progress = SubMonitor.convert(monitor, 1 + normalMakMakePaths.size() + testMakMakePaths.size());
progress.setTaskName("Cleaning " + buildConfig.getDisplayString());
- if (!CarbideCPPBuilder.generateBldmakeMakefilesIfNecessary(buildConfig, launcher)) {
- return;
- }
-
progress.worked(1);
if (progress.isCanceled()) {
return;
@@ -345,10 +320,6 @@
SubMonitor progress = SubMonitor.convert(monitor, 3);
progress.setTaskName("Freezing " + buildConfig.getDisplayString());
- if (!CarbideCPPBuilder.generateBldmakeMakefilesIfNecessary(buildConfig, launcher)) {
- return;
- }
-
progress.worked(1);
if (progress.isCanceled()) {
return;
@@ -385,9 +356,6 @@
}
public boolean freezeComponent(ICarbideBuildConfiguration buildConfig, IPath componentPath, boolean isTest, CarbideCommandLauncher launcher, IProgressMonitor monitor) {
- if (!CarbideCPPBuilder.generateBldmakeMakefilesIfNecessary(buildConfig, launcher)) {
- return false;
- }
List<String> argsList = new ArrayList<String>();
argsList.add(FREEZE_CMD);
@@ -412,10 +380,6 @@
SubMonitor progress = SubMonitor.convert(monitor, 1 + normalMakMakePaths.size() + testMakMakePaths.size());
progress.setTaskName("Freezing " + buildConfig.getDisplayString());
- if (!CarbideCPPBuilder.generateBldmakeMakefilesIfNecessary(buildConfig, launcher)) {
- return;
- }
-
progress.worked(1);
if (progress.isCanceled()) {
return;
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/SBSv2BuilderInfo.java Tue Aug 03 14:18:04 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-/*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-package com.nokia.carbide.cdt.internal.builder;
-
-import java.util.HashMap;
-
-import org.eclipse.cdt.core.settings.model.ICStorageElement;
-
-import com.nokia.carbide.cpp.internal.api.sdk.ISBSv2BuildContext;
-import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext;
-
-public class SBSv2BuilderInfo implements ISBSv2BuildConfigInfo {
-
- HashMap<String, String> sbsv2ConfigDataMap = new HashMap<String, String>();
-
-// private static String TRUE = "true";
-// private static String FALSE = "false";
-
- ISymbianBuildContext context;
-
- public SBSv2BuilderInfo(ISBSv2BuildContext context) {
- String buildAlias = context.getSBSv2Alias() != null ? context.getSBSv2Alias() : "";
- sbsv2ConfigDataMap.put(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_BUILD_ALIAS, buildAlias);
- sbsv2ConfigDataMap.put(ISBSv2BuildConfigInfo.ATRRIB_CONFIG_BASE_PLATFORM, context.getPlatformString());
- sbsv2ConfigDataMap.put(ISBSv2BuildConfigInfo.ATTRIB_CONFIG_TARGET, context.getTargetString());
- sbsv2ConfigDataMap.put(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_CONFIG_DISPLAY_STRING, context.getDisplayString());
- sbsv2ConfigDataMap.put(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_SDK_ID, context.getSDK().getUniqueId());
- this.context = context;
- }
-
- public void loadFromStorage(ICStorageElement rootStorage) {
-
- String value = rootStorage.getAttribute(ATRRIB_CONFIG_BASE_PLATFORM);
- if (value != null) {
- sbsv2ConfigDataMap.put(ATRRIB_CONFIG_BASE_PLATFORM, value);
- }
-
- value = rootStorage.getAttribute(ATTRIB_CONFIG_TARGET);
- if (value != null) {
- sbsv2ConfigDataMap.put(ATTRIB_CONFIG_TARGET, value);
- }
-
- value = rootStorage.getAttribute(ATTRIB_SBSV2_BUILD_ALIAS);
- if (value != null) {
- sbsv2ConfigDataMap.put(ATTRIB_SBSV2_BUILD_ALIAS, value);
- }
-
- value = rootStorage.getAttribute(ATTRIB_SBSV2_CONFIG_DISPLAY_STRING);
- if (value != null) {
- sbsv2ConfigDataMap.put(ATTRIB_SBSV2_CONFIG_DISPLAY_STRING, value);
- }
-
- value = rootStorage.getAttribute(ATTRIB_SBSV2_SDK_ID);
- if (value != null) {
- sbsv2ConfigDataMap.put(ATTRIB_SBSV2_SDK_ID, value);
- }
- }
-
- public void saveToStorage(ICStorageElement rootStorage) {
-
- String value = sbsv2ConfigDataMap.get(ATRRIB_CONFIG_BASE_PLATFORM);
- if (value != null && value.trim().length() > 0){
- rootStorage.setAttribute(ATRRIB_CONFIG_BASE_PLATFORM, value);
- }
-
- value = sbsv2ConfigDataMap.get(ATTRIB_CONFIG_TARGET);
- if (value != null && value.trim().length() > 0){
- rootStorage.setAttribute(ATTRIB_CONFIG_TARGET, value);
- }
-
- value = sbsv2ConfigDataMap.get(ATTRIB_SBSV2_BUILD_ALIAS);
- if (value != null && value.trim().length() > 0){
- rootStorage.setAttribute(ATTRIB_SBSV2_BUILD_ALIAS, value);
- }
-
- value = sbsv2ConfigDataMap.get(ATTRIB_SBSV2_CONFIG_DISPLAY_STRING);
- if (value != null && value.trim().length() > 0){
- rootStorage.setAttribute(ATTRIB_SBSV2_CONFIG_DISPLAY_STRING, value);
- }
-
- value = sbsv2ConfigDataMap.get(ATTRIB_SBSV2_SDK_ID);
- if (value != null && value.trim().length() > 0){
- rootStorage.setAttribute(ATTRIB_SBSV2_SDK_ID, value);
- }
-
- }
-
- public String getSBSv2Setting(String id) {
- return sbsv2ConfigDataMap.get(id);
- }
-
- public void setSBSv2Setting(String id, String value) {
- sbsv2ConfigDataMap.put(id, value);
- }
-
-}