Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Inglis2006-12-11 15:10:44 +0000
committerDavid Inglis2006-12-11 15:10:44 +0000
commitff4f573e0f50cf2fdb6fe44ae598c736502229f6 (patch)
treea00027c03ee4e0e8d1ffece95d9fc73a5d8ba801
parente84e39ba2b78ccd0429da6479869b647d27f3143 (diff)
downloadorg.eclipse.cdt-ff4f573e0f50cf2fdb6fe44ae598c736502229f6.tar.gz
org.eclipse.cdt-ff4f573e0f50cf2fdb6fe44ae598c736502229f6.tar.xz
org.eclipse.cdt-ff4f573e0f50cf2fdb6fe44ae598c736502229f6.zip
fixed binary handleing on non output paths
bug#167431
-rw-r--r--core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainerInfo.java2
-rw-r--r--core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProjectInfo.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainerInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainerInfo.java
index dcd18c9318..3a3a4961c5 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainerInfo.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainerInfo.java
@@ -85,7 +85,7 @@ public class CContainerInfo extends OpenableInfo {
continue;
}
if (root.isOnSourceEntry(member)) {
- if (CModelManager.getDefault().createBinaryFile((IFile)member) != null) {
+ if (CModelManager.getDefault().createBinaryFile((IFile)member) != null && cproject.isOnOutputEntry(member)) {
continue;
}
}
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProjectInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProjectInfo.java
index 5eba9bc3bf..4cc62000a1 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProjectInfo.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProjectInfo.java
@@ -117,7 +117,7 @@ class CProjectInfo extends OpenableInfo {
continue;
} else if (!CoreModelUtil.isExcluded(member, exclusionPatterns)) {
Object o = CModelManager.getDefault().createBinaryFile((IFile)member);
- if (o != null) {
+ if (o != null && cproject.isOnOutputEntry(member)) {
continue;
}
}

Back to the top