Index: pylib/gyp/generator/xcode.py |
diff --git a/pylib/gyp/generator/xcode.py b/pylib/gyp/generator/xcode.py |
index f39f20209a364387dd2d611e715149b5dcf7ee4c..a0f6077c92d0162f52e3bf5692a7dec5a35ff1ff 100644 |
--- a/pylib/gyp/generator/xcode.py |
+++ b/pylib/gyp/generator/xcode.py |
@@ -113,6 +113,19 @@ class XcodeProject(object): |
os.path.dirname(os.path.abspath(self.gyp_path)), |
os.path.dirname(path) or '.') |
self.project.SetProperty('projectDirPath', projectDirPath) |
+ if 'xcode_settings' in build_file_dict: |
+ xcs = build_file_dict['xcode_settings'] |
+ # Only avoid add projectRoot to avoid hash collision, if both SYMROOT |
Mark Mentovai
2014/11/25 15:59:31
I don’t really understand this comment.
|
+ # and CONFIGURATION_BUILD_DIR are set. Otherwise ignore everything. |
+ if 'SYMROOT' in xcs and 'CONFIGURATION_BUILD_DIR' in xcs: |
Mark Mentovai
2014/11/25 15:59:31
I also don’t know how or why you’ve chosen this co
|
+ self.project.SetProperty('projectRoot', os.path.dirname(path)) |
Mark Mentovai
2014/11/25 15:59:31
What is path here? Absolute or relative?
Mark Mentovai
2014/11/25 15:59:31
Is projectRoot a real thing that Xcode ever sets?
|
+ elif 'SYMROOT' not in xcs and 'CONFIGURATION_BUILD_DIR' not in xcs: |
+ pass |
+ else: |
+ sys.stderr.write("Warning: Only one of 'SYMROOT' and \ |
+ 'CONFIGURATION_BUILD_DIR' defined in %s. Either define both or none" % |
Mark Mentovai
2014/11/25 15:59:31
Where does this requirement come from?
|
+ gyp_path) |
+ pass |
Mark Mentovai
2014/11/25 15:59:31
Not needed since you already have the (questionabl
|
self.project_file = \ |
gyp.xcodeproj_file.XCProjectFile({'rootObject': self.project}) |
self.build_file_dict = build_file_dict |