From 5c3adfda29a13d64bd37b7a90756c33b1d87883d Mon Sep 17 00:00:00 2001 From: Andrew Hankinson Date: Fri, 22 Mar 2013 09:43:25 -0400 Subject: [PATCH] Fixed: XCodeCapp adding duplicate files to Xcode project Previously, XCC would indiscriminately add files to the Xcode project via the pbxprojModifier.py script. This resulted in duplicate references to a file. This fix adds a check to see if the file is already included in the project's sourceGroup folder, and will return None if it is. Fixes #1866 --- Tools/XcodeCapp/pbxprojModifier.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Tools/XcodeCapp/pbxprojModifier.py b/Tools/XcodeCapp/pbxprojModifier.py index 434210bbd..8904d2367 100755 --- a/Tools/XcodeCapp/pbxprojModifier.py +++ b/Tools/XcodeCapp/pbxprojModifier.py @@ -22,6 +22,9 @@ def update_general_include(project, projectBaseURL): def add_file(project, shadowGroup, sourceGroup, shadowHeaderPath, shadowImplementationFilePath, sourcePath, projectBaseURL): project.add_file(shadowHeaderPath, parent=shadowGroup) project.add_file(shadowImplementationFilePath, parent=shadowGroup) + + if sourcePath in project.get_files_by_os_path(os.path.relpath(sourcePath, projectBaseURL)): + return project.add_file(sourcePath, parent=sourceGroup) def remove_file(project, shadowGroup, sourceGroup, shadowHeaderPath, shadowImplementationFilePath, sourcePath, projectBaseURL):