Fixes for the scanner info collectors.

3 files changed, 53 insertions, 9 deletions

diff --git a/org.rtems.cdt.toolchain2/org/rtems/cdt/build/ScannerInfoCollector.java b/org.rtems.cdt.toolchain2/org/rtems/cdt/build/ScannerInfoCollector.java
new file mode 100644
index 0000000..4871fa1
--- /dev/null
+++ b/org.rtems.cdt.toolchain2/org/rtems/cdt/build/ScannerInfoCollector.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2008
+ * Embedded Brains GmbH
+ * Obere Lagerstr. 30
+ * D-82178 Puchheim
+ * Germany
+ * rtems@embedded-brains.de
+ *
+ * The license and distribution terms for this file may be found in the file
+ * LICENSE in this distribution or at http://www.rtems.com/license/LICENSE.
+ */
+
+package org.rtems.cdt.build;
+
+import org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector;
+
+/**
+ * This class exists only to disable the specialized UI elements of the scanner configuration.
+ */
+public class ScannerInfoCollector extends DefaultGCCScannerInfoCollector {
+	// Empty
+}
diff --git a/org.rtems.cdt.toolchain2/org/rtems/cdt/build/WinScannerInfoCollector.java b/org.rtems.cdt.toolchain2/org/rtems/cdt/build/WinScannerInfoCollector.java
new file mode 100644
index 0000000..70b6dab
--- /dev/null
+++ b/org.rtems.cdt.toolchain2/org/rtems/cdt/build/WinScannerInfoCollector.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2008
+ * Embedded Brains GmbH
+ * Obere Lagerstr. 30
+ * D-82178 Puchheim
+ * Germany
+ * rtems@embedded-brains.de
+ *
+ * The license and distribution terms for this file may be found in the file
+ * LICENSE in this distribution or at http://www.rtems.com/license/LICENSE.
+ */
+
+package org.rtems.cdt.build;
+
+import org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGnuWinScannerInfoCollector;
+
+/**
+ * This class exists only to disable the specialized UI elements of the scanner configuration.
+ */
+public class WinScannerInfoCollector extends DefaultGnuWinScannerInfoCollector {
+	// Empty
+}
diff --git a/org.rtems.cdt.toolchain2/plugin.xml b/org.rtems.cdt.toolchain2/plugin.xml
index 610f80d..fb68170 100644
--- a/org.rtems.cdt.toolchain2/plugin.xml
+++ b/org.rtems.cdt.toolchain2/plugin.xml
@@ -18,7 +18,7 @@
          name="RTEMS Scanner Configuration Discovery Profile"
          point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
       <scannerInfoCollector
-            class="org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector"
+            class="org.rtems.cdt.build.ScannerInfoCollector"
             scope="project"/>
       <buildOutputProvider>
          <open/>
@@ -36,7 +36,7 @@
          name="RTEMS Scanner Configuration Discovery Profile"
          point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
       <scannerInfoCollector
-            class="org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector"
+            class="org.rtems.cdt.build.ScannerInfoCollector"
             scope="project"/>
       <buildOutputProvider>
          <open/>
@@ -54,7 +54,7 @@
          name="RTEMS Scanner Configuration Discovery Profile"
          point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
       <scannerInfoCollector
-            class="org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector"
+            class="org.rtems.cdt.build.ScannerInfoCollector"
             scope="project"/>
       <buildOutputProvider>
          <open/>
@@ -72,7 +72,7 @@
          name="RTEMS Scanner Configuration Discovery Profile (Windows)"
          point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
       <scannerInfoCollector
-            class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGnuWinScannerInfoCollector"
+            class="org.rtems.cdt.build.WinScannerInfoCollector"
             scope="project"/>
       <buildOutputProvider>
          <open/>
@@ -90,7 +90,7 @@
          name="RTEMS Scanner Configuration Discovery Profile (Windows)"
          point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
       <scannerInfoCollector
-            class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGnuWinScannerInfoCollector"
+            class="org.rtems.cdt.build.WinScannerInfoCollector"
             scope="project"/>
       <buildOutputProvider>
          <open/>
@@ -108,7 +108,7 @@
          name="RTEMS Scanner Configuration Discovery Profile (Windows)"
          point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
       <scannerInfoCollector
-            class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGnuWinScannerInfoCollector"
+            class="org.rtems.cdt.build.WinScannerInfoCollector"
             scope="project"/>
       <buildOutputProvider>
          <open/>
@@ -229,7 +229,7 @@
             targetTool="org.rtems.cdt.linker.c.cygwin;org.rtems.cdt.linker.cpp.cygwin;org.rtems.cdt.archiver.cygwin"
             configurationEnvironmentSupplier="org.eclipse.cdt.managedbuilder.gnu.cygwin.GnuCygwinConfigurationEnvironmentSupplier"
             isToolChainSupported="org.eclipse.cdt.managedbuilder.gnu.cygwin.IsGnuCygwinToolChainSupported"
-            scannerConfigDiscoveryProfileId="org.rtems.cdt.toolchain2.RtemsSCDProfile">
+            scannerConfigDiscoveryProfileId="org.rtems.cdt.toolchain2.RtemsSCDProfileWin">
          <targetPlatform
             id="org.rtems.cdt.target.cygwin"
             name="RTEMS Target"
@@ -252,7 +252,7 @@
             <inputType
                   id="org.rtems.cdt.compiler.input.c.cygwin"
                   superClass="cdt.managedbuild.tool.gnu.c.compiler.input.cygwin"
-                  scannerConfigDiscoveryProfileId="org.rtems.cdt.toolchain2.RtemsSCDProfileC"/>
+                  scannerConfigDiscoveryProfileId="org.rtems.cdt.toolchain2.RtemsSCDProfileWinC"/>
          </tool>
          <tool
                id="org.rtems.cdt.compiler.cpp.cygwin"
@@ -260,7 +260,7 @@
                commandLineGenerator="org.rtems.cdt.build.CommandLineGenerator">
             <inputType
                   id="org.rtems.cdt.compiler.cpp.input.cygwin"
-                  scannerConfigDiscoveryProfileId="org.rtems.cdt.toolchain2.RtemsSCDProfileCPP"
+                  scannerConfigDiscoveryProfileId="org.rtems.cdt.toolchain2.RtemsSCDProfileWinCPP"
                   superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input.cygwin"/>
          </tool>
          <tool