Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Recoskie2008-01-28 18:27:49 +0000
committerChris Recoskie2008-01-28 18:27:49 +0000
commit790670050d1e2af9cc897ad0717a9d2c72e94b95 (patch)
tree3c3eb99927df30798d31893ed82672117dbc09d4 /xlc/org.eclipse.cdt.managedbuilder.xlc.core
parentf497803515d09922a250ec0422646bf8ed7769a7 (diff)
downloadorg.eclipse.cdt-790670050d1e2af9cc897ad0717a9d2c72e94b95.tar.gz
org.eclipse.cdt-790670050d1e2af9cc897ad0717a9d2c72e94b95.tar.xz
org.eclipse.cdt-790670050d1e2af9cc897ad0717a9d2c72e94b95.zip
RESOLVED - bug 193605: need scanner config support for XL compiler toolchains
https://bugs.eclipse.org/bugs/show_bug.cgi?id=193605
Diffstat (limited to 'xlc/org.eclipse.cdt.managedbuilder.xlc.core')
-rw-r--r--xlc/org.eclipse.cdt.managedbuilder.xlc.core/META-INF/MANIFEST.MF2
-rw-r--r--xlc/org.eclipse.cdt.managedbuilder.xlc.core/plugin.properties3
-rw-r--r--xlc/org.eclipse.cdt.managedbuilder.xlc.core/plugin.xml38
3 files changed, 40 insertions, 3 deletions
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.core/META-INF/MANIFEST.MF b/xlc/org.eclipse.cdt.managedbuilder.xlc.core/META-INF/MANIFEST.MF
index 0496514a26f..84d7333b445 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlc.core/META-INF/MANIFEST.MF
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.xlc.core;singleton:=true
-Bundle-Version: 4.0.3.qualifier
+Bundle-Version: 5.0.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.cdt.managedbuilder.core,
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.core/plugin.properties b/xlc/org.eclipse.cdt.managedbuilder.xlc.core/plugin.properties
index d109ae0d3b5..fe51574e0bf 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlc.core/plugin.properties
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.core/plugin.properties
@@ -15,4 +15,5 @@ providerName=Eclipse.org
objectFileName=Object File
-profileName=XL C/C++ managed make per project SCD profile \ No newline at end of file
+profileName=XL C managed make per project scanner discovery profile
+profileNameCPP=XL C++ managed make per project scanner discovery profile \ No newline at end of file
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.core/plugin.xml b/xlc/org.eclipse.cdt.managedbuilder.xlc.core/plugin.xml
index 7bd7f2b71a7..625c844edc1 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlc.core/plugin.xml
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.core/plugin.xml
@@ -29,7 +29,7 @@
<!-- The output for C or C++ projects will be different as the ScannerInfoProvider substitute the ${specs_file} variable below with a dummy "c" file or "cpp" file -->
<run
arguments="-E -v ${plugin_state_location}/${specs_file}"
- command="xlc"
+ command="${XL_compilerRoot}/xlc"
class="org.eclipse.cdt.make.xlc.core.scannerconfig.XlCSpecsRunSIProvider">
</run>
<!-- Specifies the parser for the output generated by the compiler with the above command line -->
@@ -39,5 +39,41 @@
</scannerInfoProvider>
</extension>
+ <!-- -->
+ <!-- Xl C ScannerConfigurationDiscoveryProfile definitions -->
+ <!-- -->
+
+ <!-- We have to extend the core of CDT's make so that we can define a new ScannerConfigurationDiscoveryProfile -->
+ <!-- A ScannerConfigurationDiscoveryProfile is used to discover information about the standard options used by the compiler, e.g. the standard include directories -->
+
+ <!-- Xl C Managed Make Per Project Profile -->
+ <!-- The Profile gathers together information about the standard include directories and standard definitions used by the compiler -->
+ <extension
+ id="XLCManagedMakePerProjectProfileCPP"
+ name="%profileNameCPP"
+ point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
+
+ <!-- The ScannerInfoCollector manages the information generated by the Profile so that it can be easily accessed afterwards -->
+ <scannerInfoCollector
+ class="org.eclipse.cdt.make.xlc.core.scannerconfig.DefaultXlCScannerInfoCollector"
+ scope="project">
+ </scannerInfoCollector>
+ <!-- The ScannerInfoProvider search for the information needed by the profile and send it to the ScannerInfoCollector -->
+ <scannerInfoProvider providerId="specsFile">
+ <!-- Specifies the compiler command that returns the information about standard include directories and standard definitions -->
+ <!-- The compiler command used will be always a C compiler command -->
+ <!-- The output for C or C++ projects will be different as the ScannerInfoProvider substitute the ${specs_file} variable below with a dummy "c" file or "cpp" file -->
+ <run
+ arguments="-E -v ${plugin_state_location}/${specs_file}"
+ command="${XL_compilerRoot}/xlC"
+ class="org.eclipse.cdt.make.xlc.core.scannerconfig.XlCSpecsRunSIProvider">
+ </run>
+ <!-- Specifies the parser for the output generated by the compiler with the above command line -->
+ <scannerInfoConsoleParser
+ class="org.eclipse.cdt.make.xlc.core.scannerconfig.XlCSpecsConsoleParser">
+ </scannerInfoConsoleParser>
+ </scannerInfoProvider>
+
+ </extension>
</plugin>

Back to the top