mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
Fix for PR 102015: [Scanner Config] Per file discovery does not discover any info for a new project.
Missing files are now created during MakeCorePlugin startup.
This commit is contained in:
parent
af0f510c86
commit
e7527608ff
2 changed files with 3 additions and 5 deletions
|
@ -30,6 +30,7 @@ import org.eclipse.cdt.make.internal.core.makefile.gnu.GNUMakefile;
|
||||||
import org.eclipse.cdt.make.internal.core.makefile.posix.PosixMakefile;
|
import org.eclipse.cdt.make.internal.core.makefile.posix.PosixMakefile;
|
||||||
import org.eclipse.cdt.make.internal.core.scannerconfig.DiscoveredPathManager;
|
import org.eclipse.cdt.make.internal.core.scannerconfig.DiscoveredPathManager;
|
||||||
import org.eclipse.cdt.make.internal.core.scannerconfig.ScannerConfigInfoFactory;
|
import org.eclipse.cdt.make.internal.core.scannerconfig.ScannerConfigInfoFactory;
|
||||||
|
import org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCScannerConfigUtil;
|
||||||
import org.eclipse.cdt.make.internal.core.scannerconfig.util.TraceUtil;
|
import org.eclipse.cdt.make.internal.core.scannerconfig.util.TraceUtil;
|
||||||
import org.eclipse.core.resources.IFile;
|
import org.eclipse.core.resources.IFile;
|
||||||
import org.eclipse.core.resources.IProject;
|
import org.eclipse.core.resources.IProject;
|
||||||
|
@ -311,6 +312,8 @@ public class MakeCorePlugin extends Plugin {
|
||||||
|
|
||||||
//Set debug tracing options
|
//Set debug tracing options
|
||||||
configurePluginDebugOptions();
|
configurePluginDebugOptions();
|
||||||
|
// Scanner config discovery setup
|
||||||
|
GCCScannerConfigUtil.createSpecs();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final String SCANNER_CONFIG = MakeCorePlugin.getUniqueIdentifier() + "/debug/scdiscovery"; //$NON-NLS-1$
|
private static final String SCANNER_CONFIG = MakeCorePlugin.getUniqueIdentifier() + "/debug/scdiscovery"; //$NON-NLS-1$
|
||||||
|
|
|
@ -19,7 +19,6 @@ import org.eclipse.cdt.make.core.scannerconfig.ScannerInfoTypes;
|
||||||
import org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCScannerConfigUtil;
|
import org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCScannerConfigUtil;
|
||||||
import org.eclipse.core.resources.IProject;
|
import org.eclipse.core.resources.IProject;
|
||||||
import org.eclipse.core.runtime.CoreException;
|
import org.eclipse.core.runtime.CoreException;
|
||||||
import org.eclipse.core.runtime.IPath;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Runs a command to retrieve compiler intrinsic scanner info from 'specs' file.
|
* Runs a command to retrieve compiler intrinsic scanner info from 'specs' file.
|
||||||
|
@ -44,10 +43,6 @@ public class GCCSpecsRunSIProvider extends DefaultRunSIProvider {
|
||||||
else if (project.hasNature(CProjectNature.C_NATURE_ID)) {
|
else if (project.hasNature(CProjectNature.C_NATURE_ID)) {
|
||||||
targetFile = GCCScannerConfigUtil.C_SPECS_FILE;
|
targetFile = GCCScannerConfigUtil.C_SPECS_FILE;
|
||||||
}
|
}
|
||||||
IPath path2File = MakeCorePlugin.getWorkingDirectory().append(targetFile);
|
|
||||||
if (!path2File.toFile().exists()) {
|
|
||||||
GCCScannerConfigUtil.createSpecs();
|
|
||||||
}
|
|
||||||
// replace string variables in compile arguments
|
// replace string variables in compile arguments
|
||||||
// TODO Vmir - use string variable replacement
|
// TODO Vmir - use string variable replacement
|
||||||
for (int i = 0; i < fCompileArguments.length; ++i) {
|
for (int i = 0; i < fCompileArguments.length; ++i) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue