Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDorothea Pilz-Roeder2019-05-03 08:15:00 -0400
committerDoug Schaefer2019-05-07 14:09:27 -0400
commit8b88c9bffea13b448e5149e4edb52245fcc916d6 (patch)
tree660e04e2b6511cf539dc7721617613ee9733eaa1
parentdb891f98dd0b4c0c42f70d3559d09629a331b228 (diff)
downloadorg.eclipse.cdt-8b88c9bffea13b448e5149e4edb52245fcc916d6.tar.gz
org.eclipse.cdt-8b88c9bffea13b448e5149e4edb52245fcc916d6.tar.xz
org.eclipse.cdt-8b88c9bffea13b448e5149e4edb52245fcc916d6.zip
Bug 180451 - fix generateMakefiles() on incremental build
- generateMakefiles() requires similar patch for the top build directory like regenerateMakefiles(). - need to extend the check in isGeneratedResource for config directories located in subdirectory of the project root. Change-Id: Id1809e216aee54524bc6cb072f8883ea5a202b61 Signed-off-by: Dorothea Pilz-Roeder <dorothea.pilz-roeder@advantest.com>
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
index 82bd52a106..b75bdcfea1 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
@@ -659,7 +659,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
}
// Make sure the build directory is available
- topBuildDir = createDirectory(config.getName());
+ ensureTopBuildDir();
checkCancel();
// Make sure that there is a makefile containing all the folders participating
@@ -792,12 +792,11 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
//TODO: fix to use builder output dir instead
String[] configNames = ManagedBuildManager.getBuildInfo(project).getConfigurationNames();
for (String name : configNames) {
- IPath root = new Path(name);
- // It is if it is a root of the resource pathname
- if (root.isPrefixOf(path))
+ IPath pathOfConfig = computeTopBuildDir(name);
+ if (pathOfConfig.isPrefixOf(path)) {
return true;
+ }
}
-
return false;
}

Back to the top