From 6fee13b0a5f9ed958c49428390cfc8b28f9fb578 Mon Sep 17 00:00:00 2001 From: Alexandre Wilhelm Date: Wed, 18 Nov 2015 11:29:09 -0800 Subject: [PATCH] Fixed: XcodeCapp did not ignore folder when sourcing them --- Tools/XcodeCapp/XcodeCapp/XCCSourcesFinderOperation.m | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Tools/XcodeCapp/XcodeCapp/XCCSourcesFinderOperation.m b/Tools/XcodeCapp/XcodeCapp/XCCSourcesFinderOperation.m index d3b2b7b03..b8c1d5102 100644 --- a/Tools/XcodeCapp/XcodeCapp/XCCSourcesFinderOperation.m +++ b/Tools/XcodeCapp/XcodeCapp/XCCSourcesFinderOperation.m @@ -106,7 +106,9 @@ NSString * const XCCNeedSourceToProjectPathMappingNotification = @"XCCNeedSource NSLog(@"%@: found directory. checking for source files: %@", self.cappuccinoProject.name, filename); - [sourcePaths addObjectsFromArray:[self _findSourceFilesAtProjectPath:projectRelativePath]]; + if (![XCCCappuccinoProject pathMatchesIgnoredPaths:realPath cappuccinoProjectIgnoredPathPredicates:self.cappuccinoProject.ignoredPathPredicates]) + [sourcePaths addObjectsFromArray:[self _findSourceFilesAtProjectPath:projectRelativePath]]; + continue; } @@ -130,7 +132,7 @@ NSString * const XCCNeedSourceToProjectPathMappingNotification = @"XCCNeedSource [sourcePaths addObject:projectSourcePath]; } } - + return sourcePaths; }