pylib/gyp/xcode_ninja.py - Issue 428913002: Guard against configurations without 'xcode_settings'

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: pylib/gyp/xcode_ninja.py

Issue 428913002: Guard against configurations without 'xcode_settings' (Closed) Base URL: https://chromium.googlesource.com/external/gyp.git@Fix-Xcode-ninja-workspace-1

Patch Set: Created 6 years, 5 months 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

Index: pylib/gyp/xcode_ninja.py

diff --git a/pylib/gyp/xcode_ninja.py b/pylib/gyp/xcode_ninja.py

index 2a89fa9815c5ceec790262d5d9d4d40f01c4761c..0bcfd0e8a3917495617f0b609084f5a8d05b2cb2 100644

--- a/pylib/gyp/xcode_ninja.py

+++ b/pylib/gyp/xcode_ninja.py

@@ -80,11 +80,13 @@ def _TargetFromSpec(old_spec, params):

if 'configurations' in old_spec:

for config in old_spec['configurations'].iterkeys():

- old_xcode_settings = old_spec['configurations'][config]['xcode_settings']

- if 'IPHONEOS_DEPLOYMENT_TARGET' in old_xcode_settings:

- new_xcode_settings['CODE_SIGNING_REQUIRED'] = "NO"

- new_xcode_settings['IPHONEOS_DEPLOYMENT_TARGET'] = \

- old_xcode_settings['IPHONEOS_DEPLOYMENT_TARGET']

+ if 'xcode_settings' in old_spec['configurations'][config]:

sdefresne 2014/07/30 12:07:27 nit: you could use instead the following and leave

+ old_xcode_settings = \

+ old_spec['configurations'][config]['xcode_settings']

+ if 'IPHONEOS_DEPLOYMENT_TARGET' in old_xcode_settings:

+ new_xcode_settings['CODE_SIGNING_REQUIRED'] = "NO"

+ new_xcode_settings['IPHONEOS_DEPLOYMENT_TARGET'] = \

+ old_xcode_settings['IPHONEOS_DEPLOYMENT_TARGET']

ninja_target['configurations'][config] = {}

ninja_target['configurations'][config]['xcode_settings'] = \

new_xcode_settings

« no previous file with comments | « no previous file | no next file » | no next file with comments »