mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 06:02:11 +02:00
Code Issues Wiki Activity

Bug 180451 - fix generateMakefiles() on incremental build

Browse source 
- 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>
This commit is contained in:
Dorothea Pilz-Roeder 2019-05-03 14:15:00 +02:00 • committed by Doug Schaefer
parent db891f98dd
commit 8b88c9bffe
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
View file

@ -659,7 +659,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
} }
// Make sure the build directory is available // Make sure the build directory is available
topBuildDir = createDirectory(config.getName()); ensureTopBuildDir();
checkCancel(); checkCancel();
// Make sure that there is a makefile containing all the folders participating // 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 //TODO: fix to use builder output dir instead
String[] configNames = ManagedBuildManager.getBuildInfo(project).getConfigurationNames(); String[] configNames = ManagedBuildManager.getBuildInfo(project).getConfigurationNames();
for (String name : configNames) { for (String name : configNames) {
IPath root = new Path(name); IPath pathOfConfig = computeTopBuildDir(name);
// It is if it is a root of the resource pathname if (pathOfConfig.isPrefixOf(path)) {
if (root.isPrefixOf(path))
return true; return true;
}
} }
return false; return false;
} }