Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Evoy2004-06-02 10:30:30 -0400
committerSean Evoy2004-06-02 10:30:30 -0400
commitbdf0ba75308971f715c5841529e0ace8eb0786b8 (patch)
treeff6f850d24e730b3906a44f7611af9705f56b79c /build/org.eclipse.cdt.managedbuilder.core
parentaec08ee34da6010c28b0dcd9c5a40d9d0c15b35f (diff)
downloadorg.eclipse.cdt-bdf0ba75308971f715c5841529e0ace8eb0786b8.tar.gz
org.eclipse.cdt-bdf0ba75308971f715c5841529e0ace8eb0786b8.tar.xz
org.eclipse.cdt-bdf0ba75308971f715c5841529e0ace8eb0786b8.zip
Fix for bugzilla 62660 -- Target definition for MinGW is inconsistent. I have simply removed the target. If the user wants to use MinGW, they will have to also get MSYS (which is free and recommended for MinGW developers). The problem is that the clean command for Win32 is 'del" and it does not handle front-slashes in the path properly. The effort needed to generate the makefiles in a different way is greater than the effort to answer the odd newsgroup HOWTO question, so I am simply replacing Cygwin and MinGW targets with Gnu on Windows
Diffstat (limited to 'build/org.eclipse.cdt.managedbuilder.core')
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/DefaultGnuWinScannerInfoCollector.java (renamed from build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/DefaultCygwinScannerInfoCollector.java)9
1 files changed, 7 insertions, 2 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/DefaultCygwinScannerInfoCollector.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/DefaultGnuWinScannerInfoCollector.java
index 90d4c2164d6..0ad7a94af62 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/DefaultCygwinScannerInfoCollector.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/DefaultGnuWinScannerInfoCollector.java
@@ -23,7 +23,7 @@ import org.eclipse.core.resources.IResource;
*
* @since 2.0
*/
-public class DefaultCygwinScannerInfoCollector extends DefaultGCCScannerInfoCollector {
+public class DefaultGnuWinScannerInfoCollector extends DefaultGCCScannerInfoCollector {
/* (non-Javadoc)
* @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector#contributeToScannerConfig(org.eclipse.core.resources.IResource, java.util.List, java.util.List, java.util.List)
@@ -34,7 +34,12 @@ public class DefaultCygwinScannerInfoCollector extends DefaultGCCScannerInfoColl
while (pathIter.hasNext()) {
String path = (String) pathIter.next();
String convertedPath = convertPath(path);
- getIncludePaths().add(convertedPath);
+ // On MinGW, there is no facility for converting paths
+ if (convertedPath.startsWith("/")) continue; //$NON-NLS-1$
+ // Add it if it is not a duplicate
+ if (!getIncludePaths().contains(convertedPath)){
+ getIncludePaths().add(convertedPath);
+ }
}
// Now add the macros

Back to the top