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

Make a couple of more things common. Clean up scanner info.

Browse source 
Make the build folder common for build configs. Makes things
consistent.

Also make it clear that we are caching scanner info with the
names of the API calls.

Change-Id: I1da0d90b3358065e28e437d0dfeea730e13c9aef
This commit is contained in:
Doug Schaefer 2016-01-19 16:27:21 -05:00 • committed by Gerrit Code Review @ Eclipse.org
parent e347a841c0
commit cba0b62a96
3 changed files with 48 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@
package org.eclipse.cdt.build.core;
import java.io.IOException;
import java.nio.file.Path;
import java.util.Collection;
import org.eclipse.cdt.build.core.internal.Activator;
@ -17,11 +18,13 @@ import org.eclipse.cdt.core.model.ILanguage;
import org.eclipse.cdt.core.parser.IExtendedScannerInfo;
import org.eclipse.cdt.core.parser.IScannerInfo;
import org.eclipse.core.resources.IBuildConfiguration;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.PlatformObject;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.osgi.service.prefs.BackingStoreException;
@ -41,7 +44,7 @@ public abstract class CBuildConfiguration extends PlatformObject {
private final IBuildConfiguration config;
private final IToolChain toolChain;
private ScannerInfoData scannerInfoData;
private ScannerInfoData scannerInfoCache;
protected CBuildConfiguration(IBuildConfiguration config) {
this.config = config;
@ -78,6 +81,35 @@ public abstract class CBuildConfiguration extends PlatformObject {
return config.getProject();
}
public IFolder getBuildFolder() {
String configName = getBuildConfiguration().getName();
if (configName.isEmpty()) {
configName = "default"; //$NON-NLS-1$
}
try {
// TODO should really be passing a monitor in here or create this in
// a better spot. should also throw the core exception
// TODO make the name of this folder a project property
IFolder buildRootFolder = getProject().getFolder("build"); //$NON-NLS-1$
if (!buildRootFolder.exists()) {
buildRootFolder.create(IResource.FORCE | IResource.DERIVED, true, new NullProgressMonitor());
}
IFolder buildFolder = buildRootFolder.getFolder(configName);
if (!buildFolder.exists()) {
buildFolder.create(true, true, new NullProgressMonitor());
}
return buildFolder;
} catch (CoreException e) {
Activator.log(e);
}
return null;
}
public Path getBuildDirectory() {
return getBuildFolder().getLocation().toFile().toPath();
}
public void setActive(IProgressMonitor monitor) throws CoreException {
IProject project = config.getProject();
if (config.equals(project.getActiveBuildConfig())) {
@ -100,26 +132,30 @@ public abstract class CBuildConfiguration extends PlatformObject {
}
public IScannerInfo getScannerInfo(IResource resource) throws IOException {
return getScannerInfoData().getScannerInfo(resource);
return getCachedScannerInfo(resource);
}
protected IScannerInfo getCachedScannerInfo(IResource resource) throws IOException {
return getScannerInfoCache().getScannerInfo(resource);
}
public void putScannerInfo(ILanguage language, IExtendedScannerInfo info) {
getScannerInfoData().putScannerInfo(language, info);
getScannerInfoCache().putScannerInfo(language, info);
}
public void putScannerInfo(IResource resource, ToolChainScannerInfo info) {
getScannerInfoData().putScannerInfo(resource, info);
getScannerInfoCache().putScannerInfo(resource, info);
}
private ScannerInfoData getScannerInfoData() {
if (scannerInfoData == null) {
scannerInfoData = ScannerInfoData.load(this);
private ScannerInfoData getScannerInfoCache() {
if (scannerInfoCache == null) {
scannerInfoCache = ScannerInfoData.load(this);
}
return scannerInfoData;
return scannerInfoCache;
}
public void clearScannerInfo() throws CoreException {
scannerInfoData = null;
public void clearScannerInfoCache() throws CoreException {
scannerInfoCache = null;
}
public Collection<CConsoleParser> getConsoleParsers() throws CoreException {

33
build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java
View file

@ -22,10 +22,7 @@ import org.eclipse.cdt.core.model.LanguageManager;
import org.eclipse.cdt.core.parser.IExtendedScannerInfo;
import org.eclipse.cdt.core.parser.IScannerInfo;
import org.eclipse.core.resources.IBuildConfiguration;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
public class CMakeBuildConfiguration extends CBuildConfiguration {
@ -37,37 +34,9 @@ public class CMakeBuildConfiguration extends CBuildConfiguration {
super(config, toolChain);
}
private IFolder getBuildFolder() {
String configName = getBuildConfiguration().getName();
if (configName.isEmpty()) {
configName = "default"; //$NON-NLS-1$
}
try {
// TODO should really be passing a monitor in here or create this in
// a better spot. should also throw the core exception
IFolder buildRootFolder = getProject().getFolder("build"); //$NON-NLS-1$
if (!buildRootFolder.exists()) {
buildRootFolder.create(IResource.FORCE | IResource.DERIVED, true, new NullProgressMonitor());
}
IFolder buildFolder = buildRootFolder.getFolder(configName);
if (!buildFolder.exists()) {
buildFolder.create(true, true, new NullProgressMonitor());
}
return buildFolder;
} catch (CoreException e) {
Activator.log(e);
}
return null;
}
public Path getBuildDirectory() {
return getBuildFolder().getLocation().toFile().toPath();
}
@Override
public IScannerInfo getScannerInfo(IResource resource) throws IOException {
IScannerInfo info = super.getScannerInfo(resource);
IScannerInfo info = getCachedScannerInfo(resource);
if (info == null) {
ILanguage language = LanguageManager.getInstance()
.getLanguage(CCorePlugin.getContentType(getProject(), resource.getName()), getProject()); // $NON-NLS-1$

33
qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/QtBuildConfiguration.java
View file

@ -28,10 +28,7 @@ import org.eclipse.cdt.core.parser.IExtendedScannerInfo;
import org.eclipse.cdt.core.parser.IScannerInfo;
import org.eclipse.cdt.internal.qt.core.Activator;
import org.eclipse.core.resources.IBuildConfiguration;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.osgi.service.prefs.BackingStoreException;
import org.osgi.service.prefs.Preferences;
@ -110,34 +107,6 @@ public class QtBuildConfiguration extends CBuildConfiguration {
}
}
private IFolder getBuildFolder() {
String configName = getBuildConfiguration().getName();
if (configName.isEmpty()) {
configName = "default"; //$NON-NLS-1$
}
try {
// TODO should really be passing a monitor in here or create this in
// a better spot. should also throw the core exception
IFolder buildRootFolder = getProject().getFolder("build"); //$NON-NLS-1$
if (!buildRootFolder.exists()) {
buildRootFolder.create(IResource.FORCE | IResource.DERIVED, true, new NullProgressMonitor());
}
IFolder buildFolder = buildRootFolder.getFolder(configName);
if (!buildFolder.exists()) {
buildFolder.create(true, true, new NullProgressMonitor());
}
return buildFolder;
} catch (CoreException e) {
Activator.log(e);
}
return null;
}
public Path getBuildDirectory() {
return getBuildFolder().getLocation().toFile().toPath();
}
public String getProperty(String key) {
if (properties == null) {
List<String> cmd = new ArrayList<>();
@ -176,7 +145,7 @@ public class QtBuildConfiguration extends CBuildConfiguration {
@Override
public IScannerInfo getScannerInfo(IResource resource) throws IOException {
IScannerInfo info = super.getScannerInfo(resource);
IScannerInfo info = getCachedScannerInfo(resource);
if (info == null) {
String cxx = getProperty("QMAKE_CXX"); //$NON-NLS-1$
if (cxx == null) {