Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Johnston2019-05-16 16:43:05 -0400
committerJeff Johnston2019-05-16 16:46:02 -0400
commit74e63a90132d04caa1a7ca5dee70c36b9fb6c968 (patch)
treede80e877ed339bc543248dfc7e4da4cbbc633814
parentdffd0d1513f79745ef65861035717b1f6bebf77d (diff)
downloadorg.eclipse.cdt-74e63a90132d04caa1a7ca5dee70c36b9fb6c968.tar.gz
org.eclipse.cdt-74e63a90132d04caa1a7ca5dee70c36b9fb6c968.tar.xz
org.eclipse.cdt-74e63a90132d04caa1a7ca5dee70c36b9fb6c968.zip
Bug 547174 - Clean core project doesn't always show active in console
- add missing ProjectDescription.setBuildConfigs calls to CoreBuildLaunchBarTracker, CoreBuildLaunchConfigDelegate and CBuildConfiguration Change-Id: I0d1097d04f3a210a6a7e9f8ad35adb9ba5d7c3d6
-rw-r--r--core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java3
-rw-r--r--debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchBarTracker.java4
-rw-r--r--debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchConfigDelegate.java3
3 files changed, 7 insertions, 3 deletions
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
index 1a508884f1..3ac5234545 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015, 2016 QNX Software Systems and others.
+ * Copyright (c) 2015, 2019 QNX Software Systems and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -298,6 +298,7 @@ public abstract class CBuildConfiguration extends PlatformObject implements ICBu
names.remove(config.getName());
names.add(config.getName());
+ projectDesc.setBuildConfigs(names.toArray(new String[0]));
projectDesc.setActiveBuildConfig(config.getName());
project.setDescription(projectDesc, monitor);
}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchBarTracker.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchBarTracker.java
index bfa49df989..f6c98da379 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchBarTracker.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchBarTracker.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017 QNX Software Systems and others.
+ * Copyright (c) 2017, 2019 QNX Software Systems and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -147,6 +147,8 @@ public class CoreBuildLaunchBarTracker implements ILaunchBarListener {
// active config last and this will be left in build console for user to see
names.remove(buildConfig.getBuildConfiguration().getName());
names.add(buildConfig.getBuildConfiguration().getName());
+
+ desc.setBuildConfigs(names.toArray(new String[0]));
desc.setActiveBuildConfig(buildConfig.getBuildConfiguration().getName());
finalProject.setDescription(desc, monitor);
}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchConfigDelegate.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchConfigDelegate.java
index e255f80cb4..007c39fe54 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchConfigDelegate.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchConfigDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016 QNX Software Systems and others.
+ * Copyright (c) 2016, 2019 QNX Software Systems and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -158,6 +158,7 @@ public abstract class CoreBuildLaunchConfigDelegate extends LaunchConfigurationT
names.remove(buildConfig.getBuildConfiguration().getName());
names.add(buildConfig.getBuildConfiguration().getName());
+ desc.setBuildConfigs(names.toArray(new String[0]));
desc.setActiveBuildConfig(buildConfig.getBuildConfiguration().getName());
project.setDescription(desc, monitor);
}

Back to the top