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

Bug 413771: Retrofit LLVM toolchain with language settings providers

Browse source
This commit is contained in:
Andrew Gvozdev 2013-07-31 21:49:19 -04:00
parent bb3e0bf7e0
commit ad9c3fb0e1
2 changed files with 21 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

133
llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.xml
View file

@ -968,7 +968,6 @@
dependencyExtensions="h" dependencyExtensions="h"
id="cdt.managedbuild.tool.llvm.c.compiler.input" id="cdt.managedbuild.tool.llvm.c.compiler.input"
languageId="org.eclipse.cdt.core.gcc" languageId="org.eclipse.cdt.core.gcc"
scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.llvm.ui.LLVMManagedMakePerProjectProfileClang|org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"
sourceContentType="org.eclipse.cdt.core.cSource" sourceContentType="org.eclipse.cdt.core.cSource"
sources="c"> sources="c">
</inputType> </inputType>
@ -991,7 +990,6 @@
dependencyExtensions="h,H,hpp" dependencyExtensions="h,H,hpp"
id="cdt.managedbuild.tool.llvm.cpp.compiler.input" id="cdt.managedbuild.tool.llvm.cpp.compiler.input"
languageId="org.eclipse.cdt.core.g++" languageId="org.eclipse.cdt.core.g++"
scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.llvm.ui.LLVMManagedMakePerProjectProfileClang++|org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"
sourceContentType="org.eclipse.cdt.core.cxxSource" sourceContentType="org.eclipse.cdt.core.cxxSource"
sources="c,C,cc,cxx,cpp"> sources="c,C,cc,cxx,cpp">
</inputType> </inputType>
@ -1014,7 +1012,6 @@
dependencyExtensions="h" dependencyExtensions="h"
id="cdt.managedbuild.tool.llvm.gcc.compiler.input" id="cdt.managedbuild.tool.llvm.gcc.compiler.input"
languageId="org.eclipse.cdt.core.gcc" languageId="org.eclipse.cdt.core.gcc"
scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.llvm.ui.LLVMManagedMakePerProjectProfileLLVMGCC|org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"
sourceContentType="org.eclipse.cdt.core.cSource" sourceContentType="org.eclipse.cdt.core.cSource"
sources="c"> sources="c">
</inputType> </inputType>
@ -1037,7 +1034,6 @@
dependencyExtensions="h,H,hpp" dependencyExtensions="h,H,hpp"
id="cdt.managedbuild.tool.llvm.g++.compiler.input" id="cdt.managedbuild.tool.llvm.g++.compiler.input"
languageId="org.eclipse.cdt.core.g++" languageId="org.eclipse.cdt.core.g++"
scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.llvm.ui.LLVMManagedMakePerProjectProfileLLVMG++|org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"
sourceContentType="org.eclipse.cdt.core.cxxSource" sourceContentType="org.eclipse.cdt.core.cxxSource"
sources="c,C,cc,cxx,cpp"> sources="c,C,cc,cxx,cpp">
</inputType> </inputType>
@ -1112,6 +1108,7 @@
archList="all" archList="all"
id="cdt.managedbuild.toolchain.llvm.clang.base" id="cdt.managedbuild.toolchain.llvm.clang.base"
isAbstract="true" isAbstract="true"
languageSettingsProviders="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser;org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector"
name="%ToolChainName.llvm.clang" name="%ToolChainName.llvm.clang"
osList="all" osList="all"
secondaryOutputs="cdt.managedbuild.tool.llvm.c.linker.output.exe.bc" secondaryOutputs="cdt.managedbuild.tool.llvm.c.linker.output.exe.bc"
@ -1208,6 +1205,7 @@
id="cdt.managedbuild.toolchain.llvm.clang.win32.cygwin.base" id="cdt.managedbuild.toolchain.llvm.clang.win32.cygwin.base"
isAbstract="false" isAbstract="false"
isToolChainSupported="org.eclipse.cdt.managedbuilder.gnu.cygwin.IsGnuCygwinToolChainSupported" isToolChainSupported="org.eclipse.cdt.managedbuilder.gnu.cygwin.IsGnuCygwinToolChainSupported"
languageSettingsProviders="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser;org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorCygwin"
name="%ToolChainName.llvm.clang.win32.cygwin" name="%ToolChainName.llvm.clang.win32.cygwin"
osList="win32" osList="win32"
superClass="cdt.managedbuild.toolchain.llvm.clang.base"> superClass="cdt.managedbuild.toolchain.llvm.clang.base">
@ -1226,6 +1224,7 @@
id="cdt.managedbuild.toolchain.llvm.clang.win32.mingw.base" id="cdt.managedbuild.toolchain.llvm.clang.win32.mingw.base"
isAbstract="false" isAbstract="false"
isToolChainSupported="org.eclipse.cdt.managedbuilder.gnu.mingw.MingwIsToolChainSupported" isToolChainSupported="org.eclipse.cdt.managedbuilder.gnu.mingw.MingwIsToolChainSupported"
languageSettingsProviders="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser;org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW"
name="%ToolChainName.llvm.clang.win32.mingw" name="%ToolChainName.llvm.clang.win32.mingw"
osList="win32" osList="win32"
superClass="cdt.managedbuild.toolchain.llvm.clang.base"> superClass="cdt.managedbuild.toolchain.llvm.clang.base">
@ -1242,6 +1241,7 @@
archList="all" archList="all"
id="cdt.managedbuild.toolchain.llvm.gnu.base" id="cdt.managedbuild.toolchain.llvm.gnu.base"
isAbstract="true" isAbstract="true"
languageSettingsProviders="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser;org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector"
name="%ToolChainName.llvm.gnu" name="%ToolChainName.llvm.gnu"
osList="all" osList="all"
secondaryOutputs="cdt.managedbuild.tool.llvm.c.linker.output.exe.bc" secondaryOutputs="cdt.managedbuild.tool.llvm.c.linker.output.exe.bc"
@ -1330,6 +1330,7 @@
id="cdt.managedbuild.toolchain.llvm.gnu.win32.cygwin.base" id="cdt.managedbuild.toolchain.llvm.gnu.win32.cygwin.base"
isAbstract="false" isAbstract="false"
isToolChainSupported="org.eclipse.cdt.managedbuilder.gnu.cygwin.IsGnuCygwinToolChainSupported" isToolChainSupported="org.eclipse.cdt.managedbuilder.gnu.cygwin.IsGnuCygwinToolChainSupported"
languageSettingsProviders="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser;org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorCygwin"
name="%ToolChainName.llvm.gnu.win32.cygwin" name="%ToolChainName.llvm.gnu.win32.cygwin"
osList="win32" osList="win32"
superClass="cdt.managedbuild.toolchain.llvm.gnu.base"> superClass="cdt.managedbuild.toolchain.llvm.gnu.base">
@ -1348,6 +1349,7 @@
id="cdt.managedbuild.toolchain.llvm.gnu.win32.mingw.base" id="cdt.managedbuild.toolchain.llvm.gnu.win32.mingw.base"
isAbstract="false" isAbstract="false"
isToolChainSupported="org.eclipse.cdt.managedbuilder.gnu.mingw.MingwIsToolChainSupported" isToolChainSupported="org.eclipse.cdt.managedbuilder.gnu.mingw.MingwIsToolChainSupported"
languageSettingsProviders="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser;org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW"
name="%ToolChainName.llvm.gnu.win32.mingw" name="%ToolChainName.llvm.gnu.win32.mingw"
osList="win32" osList="win32"
superClass="cdt.managedbuild.toolchain.llvm.gnu.base"> superClass="cdt.managedbuild.toolchain.llvm.gnu.base">
@ -1494,7 +1496,8 @@
</toolChain> </toolChain>
<configuration <configuration
cleanCommand="rm -rf" cleanCommand="rm -rf"
id="cdt.managedbuild.config.llvm.clang.linux.base"> id="cdt.managedbuild.config.llvm.clang.linux.base"
languageSettingsProviders="org.eclipse.cdt.ui.UserLanguageSettingsProvider;org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider;${Toolchain};-org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser">
<enablement <enablement
attribute="artifactExtension" attribute="artifactExtension"
extensionAdjustment="false" extensionAdjustment="false"
@ -1782,7 +1785,8 @@
</projectType> </projectType>
<configuration <configuration
cleanCommand="rm -rf" cleanCommand="rm -rf"
id="cdt.managedbuild.config.llvm.clang.macosx.base"> id="cdt.managedbuild.config.llvm.clang.macosx.base"
languageSettingsProviders="org.eclipse.cdt.ui.UserLanguageSettingsProvider;org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider;${Toolchain};-org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser">
<enablement <enablement
attribute="artifactExtension" attribute="artifactExtension"
extensionAdjustment="false" extensionAdjustment="false"
@ -2068,7 +2072,8 @@
</projectType> </projectType>
<configuration <configuration
cleanCommand="rm -rf" cleanCommand="rm -rf"
id="cdt.managedbuild.config.llvm.clang.win32.cygwin.base"> id="cdt.managedbuild.config.llvm.clang.win32.cygwin.base"
languageSettingsProviders="org.eclipse.cdt.ui.UserLanguageSettingsProvider;org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider;${Toolchain};-org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser">
<enablement <enablement
attribute="artifactExtension" attribute="artifactExtension"
extensionAdjustment="false" extensionAdjustment="false"
@ -2355,8 +2360,9 @@
</configuration> </configuration>
</projectType> </projectType>
<configuration <configuration
cleanCommand="rm -rf" cleanCommand="rm -rf"
id="cdt.managedbuild.config.llvm.clang.win32.mingw.base"> id="cdt.managedbuild.config.llvm.clang.win32.mingw.base"
languageSettingsProviders="org.eclipse.cdt.ui.UserLanguageSettingsProvider;org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider;${Toolchain};-org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser">
<enablement <enablement
attribute="artifactExtension" attribute="artifactExtension"
extensionAdjustment="false" extensionAdjustment="false"
@ -2644,7 +2650,8 @@
</projectType> </projectType>
<configuration <configuration
cleanCommand="rm -rf" cleanCommand="rm -rf"
id="cdt.managedbuild.config.llvm.gnu.linux.base"> id="cdt.managedbuild.config.llvm.gnu.linux.base"
languageSettingsProviders="org.eclipse.cdt.ui.UserLanguageSettingsProvider;org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider;${Toolchain};-org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser">
<enablement <enablement
attribute="artifactExtension" attribute="artifactExtension"
extensionAdjustment="false" extensionAdjustment="false"
@ -3223,7 +3230,8 @@
<configuration <configuration
artifactExtension="exe" artifactExtension="exe"
cleanCommand="rm -rf" cleanCommand="rm -rf"
id="cdt.managedbuild.config.llvm.gnu.win32.cygwin.base"> id="cdt.managedbuild.config.llvm.gnu.win32.cygwin.base"
languageSettingsProviders="org.eclipse.cdt.ui.UserLanguageSettingsProvider;org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider;${Toolchain};-org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser">
<enablement <enablement
attribute="artifactExtension" attribute="artifactExtension"
extensionAdjustment="false" extensionAdjustment="false"
@ -3512,7 +3520,8 @@
<configuration <configuration
artifactExtension="exe" artifactExtension="exe"
cleanCommand="rm -rf" cleanCommand="rm -rf"
id="cdt.managedbuild.config.llvm.gnu.win32.mingw.base"> id="cdt.managedbuild.config.llvm.gnu.win32.mingw.base"
languageSettingsProviders="org.eclipse.cdt.ui.UserLanguageSettingsProvider;org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider;${Toolchain};-org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser">
<enablement <enablement
attribute="artifactExtension" attribute="artifactExtension"
extensionAdjustment="false" extensionAdjustment="false"
@ -5175,106 +5184,6 @@
</contentType> </contentType>
</language> </language>
</extension> </extension>
<extension
id="LLVMManagedMakePerProjectProfileClang++"
name="%extension.name"
point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
<scannerInfoCollector
class="org.eclipse.cdt.managedbuilder.llvm.scannerconfig.LlvmScannerInfoCollector"
scope="project">
</scannerInfoCollector>
<buildOutputProvider>
<scannerInfoConsoleParser
class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.ManagedGCCScannerInfoConsoleParser">
</scannerInfoConsoleParser>
</buildOutputProvider>
<scannerInfoProvider
providerId="specsFile">
<run
arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp"
class="org.eclipse.cdt.make.internal.core.scannerconfig2.GCCSpecsRunSIProvider"
command="clang++">
</run>
<scannerInfoConsoleParser
class="org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCSpecsConsoleParser">
</scannerInfoConsoleParser>
</scannerInfoProvider>
</extension>
<extension
id="LLVMManagedMakePerProjectProfileClang"
name="%extension.name.0"
point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
<scannerInfoCollector
class="org.eclipse.cdt.managedbuilder.llvm.scannerconfig.LlvmScannerInfoCollector"
scope="project">
</scannerInfoCollector>
<buildOutputProvider>
<scannerInfoConsoleParser
class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.ManagedGCCScannerInfoConsoleParser">
</scannerInfoConsoleParser>
</buildOutputProvider>
<scannerInfoProvider
providerId="specsFile">
<run
arguments="-E -P -v -dD ${plugin_state_location}/specs.c"
class="org.eclipse.cdt.make.internal.core.scannerconfig2.GCCSpecsRunSIProvider"
command="clang">
</run>
<scannerInfoConsoleParser
class="org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCSpecsConsoleParser">
</scannerInfoConsoleParser>
</scannerInfoProvider>
</extension>
<extension
id="LLVMManagedMakePerProjectProfileLLVMG++"
name="%extension.name.1"
point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
<scannerInfoCollector
class="org.eclipse.cdt.managedbuilder.llvm.scannerconfig.LlvmScannerInfoCollector"
scope="project">
</scannerInfoCollector>
<buildOutputProvider>
<scannerInfoConsoleParser
class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.ManagedGCCScannerInfoConsoleParser">
</scannerInfoConsoleParser>
</buildOutputProvider>
<scannerInfoProvider
providerId="specsFile">
<run
arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp"
class="org.eclipse.cdt.make.internal.core.scannerconfig2.GCCSpecsRunSIProvider"
command="llvm-g++">
</run>
<scannerInfoConsoleParser
class="org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCSpecsConsoleParser">
</scannerInfoConsoleParser>
</scannerInfoProvider>
</extension>
<extension
id="LLVMManagedMakePerProjectProfileLLVMGCC"
name="%extension.name.2"
point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
<scannerInfoCollector
class="org.eclipse.cdt.managedbuilder.llvm.scannerconfig.LlvmScannerInfoCollector"
scope="project">
</scannerInfoCollector>
<buildOutputProvider>
<scannerInfoConsoleParser
class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.ManagedGCCScannerInfoConsoleParser">
</scannerInfoConsoleParser>
</buildOutputProvider>
<scannerInfoProvider
providerId="specsFile">
<run
arguments="-E -P -v -dD ${plugin_state_location}/specs.c"
class="org.eclipse.cdt.make.internal.core.scannerconfig2.GCCSpecsRunSIProvider"
command="llvm-gcc">
</run>
<scannerInfoConsoleParser
class="org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCSpecsConsoleParser">
</scannerInfoConsoleParser>
</scannerInfoProvider>
</extension>
<extension <extension
point="org.eclipse.cdt.core.templateAssociations"> point="org.eclipse.cdt.core.templateAssociations">
<template <template

27
llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/scannerconfig/LlvmScannerInfoCollector.java
View file

@ -1,27 +0,0 @@
/*******************************************************************************
* Copyright (c) 2010-2013 Nokia Siemens Networks Oyj, Finland.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Nokia Siemens Networks - initial implementation
* Leo Hippelainen - Initial implementation
*******************************************************************************/
package org.eclipse.cdt.managedbuilder.llvm.scannerconfig;
import org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector;
import org.eclipse.cdt.managedbuilder.scannerconfig.IManagedScannerInfoCollector;
/**
* Implementation class for gathering the built-in compiler settings for
* Clang/LLVM targets. The assumption is that the tools will answer path
* information in POSIX format and that the Scanner will be able to search for
* files using this format.
*
*/
public class LlvmScannerInfoCollector
extends PerProjectSICollector
implements IManagedScannerInfoCollector {
}