mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 06:02:11 +02:00
Code Issues Wiki Activity

Bug 547174 - Clean core project doesn't always show active in console

Browse source 
- add missing ProjectDescription.setBuildConfigs calls to
  CoreBuildLaunchBarTracker, CoreBuildLaunchConfigDelegate
  and CBuildConfiguration

Change-Id: I0d1097d04f3a210a6a7e9f8ad35adb9ba5d7c3d6
This commit is contained in:
Jeff Johnston 2019-05-16 16:43:05 -04:00
parent dffd0d1513
commit 74e63a9013
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
View file

@ -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 * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0 * 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.remove(config.getName());
names.add(config.getName()); names.add(config.getName());
projectDesc.setBuildConfigs(names.toArray(new String[0]));
projectDesc.setActiveBuildConfig(config.getName()); projectDesc.setActiveBuildConfig(config.getName());
project.setDescription(projectDesc, monitor); project.setDescription(projectDesc, monitor);
} }

4
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchBarTracker.java
View file

@ -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 * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0 * 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 // active config last and this will be left in build console for user to see
names.remove(buildConfig.getBuildConfiguration().getName()); names.remove(buildConfig.getBuildConfiguration().getName());
names.add(buildConfig.getBuildConfiguration().getName()); names.add(buildConfig.getBuildConfiguration().getName());
desc.setBuildConfigs(names.toArray(new String[0]));
desc.setActiveBuildConfig(buildConfig.getBuildConfiguration().getName()); desc.setActiveBuildConfig(buildConfig.getBuildConfiguration().getName());
finalProject.setDescription(desc, monitor); finalProject.setDescription(desc, monitor);
} }

3
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchConfigDelegate.java
View file

@ -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 * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0 * 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.remove(buildConfig.getBuildConfiguration().getName());
names.add(buildConfig.getBuildConfiguration().getName()); names.add(buildConfig.getBuildConfiguration().getName());
desc.setBuildConfigs(names.toArray(new String[0]));
desc.setActiveBuildConfig(buildConfig.getBuildConfiguration().getName()); desc.setActiveBuildConfig(buildConfig.getBuildConfiguration().getName());
project.setDescription(desc, monitor); project.setDescription(desc, monitor);
} }