mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-25 18:05:33 +02:00
1. Scanner discovery fix
2. CDT variable contributor calculation fix
This commit is contained in:
parent
53d3c557b4
commit
bcb116eda7
2 changed files with 8 additions and 7 deletions
|
@ -87,7 +87,7 @@ public class SCJobsUtil {
|
|||
ISafeRunnable runnable = new ISafeRunnable() {
|
||||
|
||||
public void run() {
|
||||
esiProvider.invokeProvider(monitor, project, providerId, buildInfo, collector);
|
||||
esiProvider.invokeProvider(monitor, project, context, providerId, buildInfo, collector, null);
|
||||
rc.set(true);
|
||||
}
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@ import org.eclipse.core.runtime.IPath;
|
|||
|
||||
public class BuildConfigurationData extends CConfigurationData {
|
||||
private Configuration fCfg;
|
||||
private BuildVariablesContributor fCdtVars;
|
||||
// private BuildVariablesContributor fCdtVars;
|
||||
public BuildConfigurationData(IConfiguration cfg){
|
||||
fCfg = (Configuration)cfg;
|
||||
}
|
||||
|
@ -127,17 +127,18 @@ public class BuildConfigurationData extends CConfigurationData {
|
|||
}
|
||||
|
||||
public ICdtVariablesContributor getBuildVariablesContributor() {
|
||||
if(fCdtVars == null)
|
||||
fCdtVars = new BuildVariablesContributor(this);
|
||||
return fCdtVars;
|
||||
// if(fCdtVars == null)
|
||||
// fCdtVars = new BuildVariablesContributor(this);
|
||||
// return fCdtVars;
|
||||
return new BuildVariablesContributor(this);
|
||||
}
|
||||
|
||||
void clearCachedData(){
|
||||
fCfg.clearCachedData();
|
||||
CResourceData[] datas = getResourceDatas();
|
||||
CResourceData data;
|
||||
BuildLanguageData lData;
|
||||
BuildLanguageData[] lDatas;
|
||||
// BuildLanguageData lData;
|
||||
// BuildLanguageData[] lDatas;
|
||||
|
||||
|
||||
for(int i = 0; i < datas.length; i++){
|
||||
|
|
Loading…
Add table
Reference in a new issue