Fixed problem due to library access restrictions.

3 files changed, 44 insertions, 28 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
deleted file mode 100644
index 4871fa1..0000000
--- a/org.rtems.cdt.toolchain2/org/rtems/cdt/build/ScannerInfoCollector.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * 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
index 70b6dab..6667ade 100644
--- a/org.rtems.cdt.toolchain2/org/rtems/cdt/build/WinScannerInfoCollector.java
+++ b/org.rtems.cdt.toolchain2/org/rtems/cdt/build/WinScannerInfoCollector.java
@@ -12,11 +12,49 @@
 
 package org.rtems.cdt.build;
 
-import org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGnuWinScannerInfoCollector;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.cdt.make.core.scannerconfig.InfoContext;
+import org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector3;
+import org.eclipse.cdt.make.core.scannerconfig.ScannerInfoTypes;
+import org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector;
+import org.eclipse.cdt.make.internal.core.scannerconfig.util.CygpathTranslator;
+import org.eclipse.cdt.managedbuilder.scannerconfig.IManagedScannerInfoCollector;
+import org.eclipse.core.resources.IProject;
 
 /**
  * This class exists only to disable the specialized UI elements of the scanner configuration.
+ * 
+ * See also 'org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGnuWinScannerInfoCollector'.
  */
-public class WinScannerInfoCollector extends DefaultGnuWinScannerInfoCollector {
-	// Empty
+public class WinScannerInfoCollector extends PerProjectSICollector implements IScannerInfoCollector3, IManagedScannerInfoCollector {
+	private IProject mProject;
+
+	public void contributeToScannerConfig( Object resource, Map scannerInfo) {
+		List<String> includes = (List<String>) scannerInfo.get( ScannerInfoTypes.INCLUDE_PATHS);
+		List<String> translatedIncludes = CygpathTranslator.translateIncludePaths( mProject, includes);
+
+		Iterator<String> iter = translatedIncludes.listIterator();
+		while (iter.hasNext()) {
+			String convertedPath = iter.next();
+			if (convertedPath.startsWith( "/")) {
+				iter.remove();
+			}
+		}
+		scannerInfo.put( ScannerInfoTypes.INCLUDE_PATHS, translatedIncludes);
+		
+		super.contributeToScannerConfig( resource, scannerInfo);
+        }
+
+	public void setProject( IProject project) {
+		mProject = project;
+		super.setProject( project);
+	}
+
+	public void setInfoContext( InfoContext context) {
+		mProject = context.getProject();
+		super.setInfoContext( context);
+	}
 }
diff --git a/org.rtems.cdt.toolchain2/plugin.xml b/org.rtems.cdt.toolchain2/plugin.xml
index fb68170..5741067 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.rtems.cdt.build.ScannerInfoCollector"
+            class="org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector"
             scope="project"/>
       <buildOutputProvider>
          <open/>
@@ -36,7 +36,7 @@
          name="RTEMS Scanner Configuration Discovery Profile"
          point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
       <scannerInfoCollector
-            class="org.rtems.cdt.build.ScannerInfoCollector"
+            class="org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector"
             scope="project"/>
       <buildOutputProvider>
          <open/>
@@ -54,7 +54,7 @@
          name="RTEMS Scanner Configuration Discovery Profile"
          point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
       <scannerInfoCollector
-            class="org.rtems.cdt.build.ScannerInfoCollector"
+            class="org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector"
             scope="project"/>
       <buildOutputProvider>
          <open/>