mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-29 20:05:35 +02:00
Fix for the [Bug 189593] [Internal Builder] Builder always performing full build (reopening workspace)
This commit is contained in:
parent
e843b0a7d4
commit
05a1de46e9
4 changed files with 8 additions and 10 deletions
|
@ -157,7 +157,7 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild
|
||||||
//property for holding the resource change state
|
//property for holding the resource change state
|
||||||
private static final String RC_CHANGE_STATE = "rcState"; //$NON-NLS-1$
|
private static final String RC_CHANGE_STATE = "rcState"; //$NON-NLS-1$
|
||||||
//resource change state
|
//resource change state
|
||||||
private int resourceChangeState;
|
private int resourceChangeState = -1;
|
||||||
|
|
||||||
//Internal Builder state
|
//Internal Builder state
|
||||||
//NOTE: these are temporary properties
|
//NOTE: these are temporary properties
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* Copyright (c) 2005 Intel Corporation and others.
|
* Copyright (c) 2005, 2007 Intel Corporation and others.
|
||||||
* All rights reserved. This program and the accompanying materials
|
* All rights reserved. This program and the accompanying materials
|
||||||
* are made available under the terms of the Eclipse Public License v1.0
|
* are made available under the terms of the Eclipse Public License v1.0
|
||||||
* which accompanies this distribution, and is available at
|
* which accompanies this distribution, and is available at
|
||||||
|
@ -20,7 +20,6 @@ import org.eclipse.core.runtime.IConfigurationElement;
|
||||||
|
|
||||||
public class EnvVarBuildPath implements
|
public class EnvVarBuildPath implements
|
||||||
IEnvVarBuildPath {
|
IEnvVarBuildPath {
|
||||||
private ITool tool;
|
|
||||||
|
|
||||||
private int type;
|
private int type;
|
||||||
private String variableNames[];
|
private String variableNames[];
|
||||||
|
@ -36,7 +35,6 @@ public class EnvVarBuildPath implements
|
||||||
* @param element The element containing the information about the tool.
|
* @param element The element containing the information about the tool.
|
||||||
*/
|
*/
|
||||||
public EnvVarBuildPath(ITool tool, IManagedConfigElement element) {
|
public EnvVarBuildPath(ITool tool, IManagedConfigElement element) {
|
||||||
this.tool = tool;
|
|
||||||
loadFromManifest(element);
|
loadFromManifest(element);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* Copyright (c) 2006 Intel Corporation and others.
|
* Copyright (c) 2006, 2007 Intel Corporation and others.
|
||||||
* All rights reserved. This program and the accompanying materials
|
* All rights reserved. This program and the accompanying materials
|
||||||
* are made available under the terms of the Eclipse Public License v1.0
|
* are made available under the terms of the Eclipse Public License v1.0
|
||||||
* which accompanies this distribution, and is available at
|
* which accompanies this distribution, and is available at
|
||||||
|
@ -25,6 +25,7 @@ import org.eclipse.cdt.managedbuilder.core.IConfiguration;
|
||||||
import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
|
import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
|
||||||
import org.eclipse.cdt.managedbuilder.core.IManagedProject;
|
import org.eclipse.cdt.managedbuilder.core.IManagedProject;
|
||||||
import org.eclipse.cdt.managedbuilder.core.IResourceConfiguration;
|
import org.eclipse.cdt.managedbuilder.core.IResourceConfiguration;
|
||||||
|
import org.eclipse.cdt.managedbuilder.core.IResourceInfo;
|
||||||
import org.eclipse.cdt.managedbuilder.core.ITool;
|
import org.eclipse.cdt.managedbuilder.core.ITool;
|
||||||
import org.eclipse.cdt.managedbuilder.core.IToolChain;
|
import org.eclipse.cdt.managedbuilder.core.IToolChain;
|
||||||
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
|
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
|
||||||
|
@ -316,8 +317,8 @@ public class PropertyManager {
|
||||||
setProperty(cfg, cfg, key, value);
|
setProperty(cfg, cfg, key, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setProperty(IResourceConfiguration rcCfg, String key, String value){
|
public void setProperty(IResourceInfo rcInfo, String key, String value){
|
||||||
setProperty(rcCfg.getParent(), rcCfg, key, value);
|
setProperty(rcInfo.getParent(), rcInfo, key, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setProperty(IToolChain tc, String key, String value){
|
public void setProperty(IToolChain tc, String key, String value){
|
||||||
|
@ -339,8 +340,8 @@ public class PropertyManager {
|
||||||
return getProperty(cfg, cfg, key);
|
return getProperty(cfg, cfg, key);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getProperty(IResourceConfiguration rcCfg, String key){
|
public String getProperty(IResourceInfo rcInfo, String key){
|
||||||
return getProperty(rcCfg.getParent(), rcCfg, key);
|
return getProperty(rcInfo.getParent(), rcInfo, key);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getProperty(IToolChain tc, String key){
|
public String getProperty(IToolChain tc, String key){
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
package org.eclipse.cdt.managedbuilder.internal.core;
|
package org.eclipse.cdt.managedbuilder.internal.core;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import org.eclipse.cdt.core.settings.model.ICStorageElement;
|
import org.eclipse.cdt.core.settings.model.ICStorageElement;
|
||||||
|
|
Loading…
Add table
Reference in a new issue