Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(320)

Unified Diff: pylib/gyp/xcode_ninja.py

Issue 421053005: Fix: xcode-ninja should generate Xcode workspace into generator_output (Closed) Base URL: https://chromium.googlesource.com/external/gyp.git@Fix-Xcode-ninja-workspace-2
Patch Set: Rebase onto 421453003 Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | test/generator-output/gyptest-actions.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pylib/gyp/xcode_ninja.py
diff --git a/pylib/gyp/xcode_ninja.py b/pylib/gyp/xcode_ninja.py
index a005dfde91d58d718ee5ef17a35d2ba79e9f0bd8..57e73c64fd7d03f40d13eee9226af3c84df91be9 100644
--- a/pylib/gyp/xcode_ninja.py
+++ b/pylib/gyp/xcode_ninja.py
@@ -19,10 +19,13 @@ import re
import xml.sax.saxutils
-def _WriteWorkspace(main_gyp, sources_gyp):
+def _WriteWorkspace(main_gyp, sources_gyp, params):
""" Create a workspace to wrap main and sources gyp paths. """
(build_file_root, build_file_ext) = os.path.splitext(main_gyp)
workspace_path = build_file_root + '.xcworkspace'
+ options = params['options']
+ if options.generator_output:
+ workspace_path = os.path.join(options.generator_output, workspace_path)
try:
os.makedirs(workspace_path)
except OSError, e:
@@ -255,5 +258,5 @@ def CreateWrapper(target_list, target_dicts, data, params):
new_data[sources_gyp]['targets'].append(new_data_target)
# Write workspace to file.
- _WriteWorkspace(main_gyp, sources_gyp)
+ _WriteWorkspace(main_gyp, sources_gyp, params)
return (new_target_list, new_target_dicts, new_data)
« no previous file with comments | « no previous file | test/generator-output/gyptest-actions.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698