Skip to content

Commit 9d8618a

Browse files
committed
Fix compilation for CDT 8.2
1 parent 1b68bf9 commit 9d8618a

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

it.baeyens.arduino.core/src/it/baeyens/arduino/toolchain/ArduinoLanguageProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private enum State {
4242
new MacroOptionParser("#define\\s+(\\S*)\\s*(\\S*)", "$1", "$2", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), };
4343

4444
@Override
45-
protected String getToolchainId() {
45+
public String getToolchainId() {
4646
return GCC_TOOLCHAIN_ID;
4747
}
4848

it.baeyens.arduino.core/src/it/baeyens/arduino/tools/ShouldHaveBeenInCDT.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package it.baeyens.arduino.tools;
22

3+
import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvidersKeeper;
34
import org.eclipse.cdt.core.model.CoreModel;
45
import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
56
import org.eclipse.cdt.core.settings.model.ICProjectDescription;
@@ -12,11 +13,12 @@
1213
import org.eclipse.cdt.managedbuilder.internal.core.ManagedBuildInfo;
1314
import org.eclipse.cdt.managedbuilder.internal.core.ManagedProject;
1415
import org.eclipse.cdt.managedbuilder.internal.core.ToolChain;
15-
import org.eclipse.cdt.managedbuilder.internal.dataprovider.ConfigurationDataProvider;
1616
import org.eclipse.core.resources.IProject;
1717
import org.eclipse.core.runtime.CoreException;
1818
import org.eclipse.core.runtime.IProgressMonitor;
19+
1920
import it.baeyens.arduino.ui.BuildConfigurationsPage.ConfigurationDescriptor;
21+
2022
import java.util.ArrayList;
2123

2224
@SuppressWarnings("restriction")
@@ -99,7 +101,12 @@ public static void setCProjectDescription(IProject project,
99101
}
100102
CConfigurationData data = cfg.getConfigurationData();
101103
ICConfigurationDescription cfgDes = des.createConfiguration(ManagedBuildManager.CFG_DATA_PROVIDER_ID, data);
102-
ConfigurationDataProvider.setDefaultLanguageSettingsProviders(project, cfg, cfgDes);
104+
105+
if (cfgDes instanceof ILanguageSettingsProvidersKeeper) {
106+
ILanguageSettingsProvidersKeeper lspk = (ILanguageSettingsProvidersKeeper)cfgDes;
107+
lspk.setDefaultLanguageSettingsProvidersIds(new String[] {alCfgs.get(i).ToolchainID});
108+
}
109+
// ConfigurationDataProvider.setDefaultLanguageSettingsProviders(project, cfg, cfgDes);
103110
}
104111
monitor.worked(50);
105112
mngr.setProjectDescription(project, des);

0 commit comments

Comments
 (0)