Chromium Code Reviews| Index: testing/iossim/iossim.gyp |
| diff --git a/testing/iossim/iossim.gyp b/testing/iossim/iossim.gyp |
| index af80adb106cac9f39d826fbbaf7355a9d9ec6847..883b039b97f33715d1c5cd7d15f12f3a7f1f44ed 100644 |
| --- a/testing/iossim/iossim.gyp |
| +++ b/testing/iossim/iossim.gyp |
| @@ -12,9 +12,66 @@ |
| 'type': 'executable', |
| 'variables': { |
| 'developer_dir': '<!(xcode-select -print-path)', |
| - 'iphone_sim_path': '<(developer_dir)/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks', |
| - 'other_frameworks_path': '<(developer_dir)/../OtherFrameworks' |
| + 'xcode_version': '<!(xcodebuild -version | grep Xcode | awk \'{print $2}\')', |
| }, |
| + 'conditions': [ |
| + ['xcode_version=="6.0"', { |
| + 'variables': { |
| + 'iphone_sim_path': '<(developer_dir)/../SharedFrameworks', |
| + }, |
| + 'defines': [ |
| + 'XCODE_6', |
|
justincohen
2014/06/13 14:08:39
Is this necessary? Would it be more correct to lo
lliabraa
2014/06/13 15:07:30
iossim is compiled for host so it uses the mac SDK
|
| + ], |
| + 'actions': [ |
| + { |
| + 'action_name': 'generate_dvt_foundation_header', |
| + 'inputs': [ |
| + '<(iphone_sim_path)/DVTFoundation.framework/Versions/Current/DVTFoundation', |
| + '<(PRODUCT_DIR)/class-dump', |
| + ], |
| + 'outputs': [ |
| + '<(INTERMEDIATE_DIR)/iossim/DVTFoundation.h' |
| + ], |
| + 'action': [ |
| + # Actions don't provide a way to redirect stdout, so a custom |
| + # script is invoked that will execute the first argument and |
| + # write the output to the file specified as the second argument. |
| + # -I sorts classes, categories, and protocols by inheritance. |
| + # -C <regex> only displays classes matching regular expression. |
| + './redirect-stdout.sh', |
| + '<(PRODUCT_DIR)/class-dump -CDVTStackBacktrace|DVTInvalidation|DVTMixIn <(iphone_sim_path)/DVTFoundation.framework', |
| + '<(INTERMEDIATE_DIR)/iossim/DVTFoundation.h', |
| + ], |
| + 'message': 'Generating DVTFoundation.h', |
| + }, |
| + { |
| + 'action_name': 'generate_dvt_core_simulator', |
| + 'inputs': [ |
| + '<(developer_dir)/Library/PrivateFrameworks/CoreSimulator.framework/Versions/Current/CoreSimulator', |
| + '<(PRODUCT_DIR)/class-dump', |
| + ], |
| + 'outputs': [ |
| + '<(INTERMEDIATE_DIR)/iossim/CoreSimulator.h' |
| + ], |
| + 'action': [ |
| + # Actions don't provide a way to redirect stdout, so a custom |
| + # script is invoked that will execute the first argument and |
| + # write the output to the file specified as the second argument. |
| + # -I sorts classes, categories, and protocols by inheritance. |
| + # -C <regex> only displays classes matching regular expression. |
| + './redirect-stdout.sh', |
| + '<(PRODUCT_DIR)/class-dump -CSim <(developer_dir)/Library/PrivateFrameworks/CoreSimulator.framework', |
| + '<(INTERMEDIATE_DIR)/iossim/CoreSimulator.h', |
| + ], |
| + 'message': 'Generating CoreSimulator.h', |
| + }, |
| + ], # actions |
| + }, { # else: xcode_version!="6" |
| + 'variables': { |
| + 'iphone_sim_path': '<(developer_dir)/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks', |
| + }, |
| + }], # xcode_version |
| + ], # conditions |
| 'dependencies': [ |
| 'third_party/class-dump/class-dump.gyp:class-dump#host', |
| ], |
| @@ -48,9 +105,9 @@ |
| '<(PRODUCT_DIR)/class-dump -I -CiPhoneSimulator <(iphone_sim_path)/DVTiPhoneSimulatorRemoteClient.framework', |
| '<(INTERMEDIATE_DIR)/iossim/DVTiPhoneSimulatorRemoteClient.h', |
| ], |
| - 'message': 'Generating header', |
| + 'message': 'Generating DVTiPhoneSimulatorRemoteClient.h', |
| }, |
| - ], |
| + ], # actions |
| 'xcode_settings': { |
| 'ARCHS': ['x86_64'], |
| 'WARNING_CFLAGS': [ |