diff options
Diffstat (limited to 'launch/org.eclipse.cdt.launch')
| -rw-r--r-- | launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java | 4 | ||||
| -rw-r--r-- | launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate2.java | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java index 23e1b552431..c9fe5ec1f5d 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2014 QNX Software Systems and others. + * Copyright (c) 2005, 2016 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,6 +12,7 @@ * Anton Leherbauer (Wind River Systems) - bug 224187 * Alex Collins (Broadcom Corp.) - choose build config automatically * James Blackburn (Broadcom Corp.) + * Philip Langer (EclipseSource Services GmbH) - bug 506843 *******************************************************************************/ package org.eclipse.cdt.launch; @@ -548,6 +549,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat @Override public boolean buildForLaunch(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException { + buildFailed = false; workspaceBuildBeforeLaunch = true; // check the build before launch setting and honor it diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate2.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate2.java index a2fbd4e59b0..c9a6ac24590 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate2.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate2.java @@ -9,6 +9,7 @@ * Ken Ryall (Nokia) * James Blackburn (Broadcom Corp.) * Marc Khouzam (Ericsson) - Modernize Run launch (bug 464636) + * Philip Langer (EclipseSource Services GmbH) - bug 506843 *******************************************************************************/ package org.eclipse.cdt.launch; @@ -321,6 +322,8 @@ public abstract class AbstractCLaunchDelegate2 extends LaunchConfigurationDelega */ protected void buildProject(final IProject project, final String buildConfigID, IProgressMonitor monitor) throws CoreException { final int TOTAL_TICKS = 1000; + + buildFailed = false; // Some day, this will hopefully be a simple pass-thru to a cdt.core // utility. See bug 313927 |