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

Side by Side Diff: testing/iossim/iossim.gyp

Issue 589493002: Fix compilation with Xcode 6.0.1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'conditions': [ 6 'conditions': [
7 ['OS!="ios" or "<(GENERATOR)"=="ninja"', { 7 ['OS!="ios" or "<(GENERATOR)"=="ninja"', {
8 'targets': [ 8 'targets': [
9 { 9 {
10 'target_name': 'iossim', 10 'target_name': 'iossim',
11 'toolsets': ['host'], 11 'toolsets': ['host'],
12 'type': 'executable', 12 'type': 'executable',
13 'variables': { 13 'variables': {
14 'developer_dir': '<!(xcode-select -print-path)', 14 'developer_dir': '<!(xcode-select -print-path)',
15 # TODO(lliabraa): Once all builders are on Xcode 6 this variable can 15 # TODO(lliabraa): Once all builders are on Xcode 6 this variable can
16 # be removed and the actions gated by this variable can be run by 16 # be removed and the actions gated by this variable can be run by
17 # default (crbug.com/385030). 17 # default (crbug.com/385030).
18 'xcode_version': '<!(xcodebuild -version | grep Xcode | awk \'{print $2}\')', 18 'xcode_version': '<!(xcodebuild -version | grep Xcode | awk \'{print $2}\')',
19 }, 19 },
20 'conditions': [ 20 'conditions': [
21 ['xcode_version=="6.0"', { 21 ['xcode_version>="6.0"', {
22 'variables': { 22 'variables': {
23 'iphone_sim_path': '<(developer_dir)/../SharedFrameworks', 23 'iphone_sim_path': '<(developer_dir)/../SharedFrameworks',
24 }, 24 },
25 'defines': [ 25 'defines': [
26 'IOSSIM_USE_XCODE_6', 26 'IOSSIM_USE_XCODE_6',
27 ], 27 ],
28 'xcode_settings': { 28 'xcode_settings': {
29 # The CoreSimulator.h file generated by class-dump defines a 29 # The CoreSimulator.h file generated by class-dump defines a
30 # property of type |NSString*| and a setter for the property 30 # property of type |NSString*| and a setter for the property
31 # that takes a parameter of type |id|. This type mismatch causes 31 # that takes a parameter of type |id|. This type mismatch causes
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 # write the output to the file specified as the second argum ent. 69 # write the output to the file specified as the second argum ent.
70 # -I sorts classes, categories, and protocols by inheritance . 70 # -I sorts classes, categories, and protocols by inheritance .
71 # -C <regex> only displays classes matching regular expressi on. 71 # -C <regex> only displays classes matching regular expressi on.
72 './redirect-stdout.sh', 72 './redirect-stdout.sh',
73 '<(PRODUCT_DIR)/class-dump -CSim <(developer_dir)/Library/Pr ivateFrameworks/CoreSimulator.framework', 73 '<(PRODUCT_DIR)/class-dump -CSim <(developer_dir)/Library/Pr ivateFrameworks/CoreSimulator.framework',
74 '<(INTERMEDIATE_DIR)/iossim/CoreSimulator.h', 74 '<(INTERMEDIATE_DIR)/iossim/CoreSimulator.h',
75 ], 75 ],
76 'message': 'Generating CoreSimulator.h', 76 'message': 'Generating CoreSimulator.h',
77 }, 77 },
78 ], # actions 78 ], # actions
79 }, { # else: xcode_version!="6" 79 }, { # else: xcode_version<"6.0"
80 'variables': { 80 'variables': {
81 'iphone_sim_path': '<(developer_dir)/Platforms/iPhoneSimulator.p latform/Developer/Library/PrivateFrameworks', 81 'iphone_sim_path': '<(developer_dir)/Platforms/iPhoneSimulator.p latform/Developer/Library/PrivateFrameworks',
82 }, 82 },
83 }], # xcode_version 83 }], # xcode_version
84 ], # conditions 84 ], # conditions
85 'dependencies': [ 85 'dependencies': [
86 'third_party/class-dump/class-dump.gyp:class-dump#host', 86 'third_party/class-dump/class-dump.gyp:class-dump#host',
87 ], 87 ],
88 'include_dirs': [ 88 'include_dirs': [
89 '<(INTERMEDIATE_DIR)/iossim', 89 '<(INTERMEDIATE_DIR)/iossim',
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 'iossim', 153 'iossim',
154 ], 154 ],
155 'message': 'Generating the iossim executable', 155 'message': 'Generating the iossim executable',
156 }, 156 },
157 ], 157 ],
158 }, 158 },
159 ], 159 ],
160 }], 160 }],
161 ], 161 ],
162 } 162 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698