Index: testing/iossim/iossim.gyp |
diff --git a/testing/iossim/iossim.gyp b/testing/iossim/iossim.gyp |
index 2a8c2ae7383b5f1022e31e959375fddcffadd39a..d6bb4eac9b526e25227f3b6513f4447de0781b88 100644 |
--- a/testing/iossim/iossim.gyp |
+++ b/testing/iossim/iossim.gyp |
@@ -6,6 +6,8 @@ |
'variables': { |
'mac_deployment_target': '10.9', |
'mac_sdk_min': '10.9', |
+ 'class_dump_bin': '<(PRODUCT_DIR)/class-dump', |
+ 'class_dump_py': '<(DEPTH)/third_party/class-dump/class-dump.py', |
}, |
'conditions': [ |
['OS!="ios" or "<(GENERATOR)"!="xcode" or "<(GENERATOR_FLAVOR)"=="ninja"', { |
@@ -33,65 +35,66 @@ |
], |
'actions': [ |
{ |
- 'action_name': 'generate_dvt_foundation_header', |
+ 'action_name': 'generate_dvt_core_simulator', |
'inputs': [ |
- '<(iphone_sim_path)/DVTFoundation.framework/Versions/Current/DVTFoundation', |
- '<(PRODUCT_DIR)/class-dump', |
+ '<(class_dump_bin)', |
+ '<(class_dump_py)', |
+ '<(developer_dir)/Library/PrivateFrameworks/CoreSimulator.framework/Versions/Current/CoreSimulator', |
], |
'outputs': [ |
- '<(INTERMEDIATE_DIR)/iossim/DVTFoundation.h' |
+ '<(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 -CDVTStackBacktrace|DVTInvalidation|DVTMixIn <(iphone_sim_path)/DVTFoundation.framework', |
- '<(INTERMEDIATE_DIR)/iossim/DVTFoundation.h', |
+ 'python', |
+ '<(class_dump_py)', |
+ '-t', '<(class_dump_bin)', |
+ '-o', '<(INTERMEDIATE_DIR)/iossim/CoreSimulator.h', |
+ '--', |
+ '-CSim', |
+ '<(developer_dir)/Library/PrivateFrameworks/CoreSimulator.framework', |
], |
- 'message': 'Generating DVTFoundation.h', |
+ 'message': 'Generating CoreSimulator.h', |
}, |
{ |
- 'action_name': 'generate_dvt_core_simulator', |
+ 'action_name': 'generate_dvt_foundation_header', |
'inputs': [ |
- '<(developer_dir)/Library/PrivateFrameworks/CoreSimulator.framework/Versions/Current/CoreSimulator', |
- '<(PRODUCT_DIR)/class-dump', |
+ '<(class_dump_bin)', |
+ '<(class_dump_py)', |
+ '<(iphone_sim_path)/DVTFoundation.framework/Versions/Current/DVTFoundation', |
], |
'outputs': [ |
- '<(INTERMEDIATE_DIR)/iossim/CoreSimulator.h' |
+ '<(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 -CSim <(developer_dir)/Library/PrivateFrameworks/CoreSimulator.framework', |
- '<(INTERMEDIATE_DIR)/iossim/CoreSimulator.h', |
+ 'python', |
+ '<(class_dump_py)', |
+ '-t', '<(class_dump_bin)', |
+ '-o', '<(INTERMEDIATE_DIR)/iossim/DVTFoundation.h', |
+ '--', |
+ '-CDVTStackBacktrace|DVTInvalidation|DVTMixIn', |
+ '<(iphone_sim_path)/DVTFoundation.framework', |
], |
- 'message': 'Generating CoreSimulator.h', |
+ 'message': 'Generating DVTFoundation.h', |
}, |
{ |
'action_name': 'generate_dvt_iphone_sim_header', |
'inputs': [ |
+ '<(class_dump_bin)', |
+ '<(class_dump_py)', |
'<(iphone_sim_path)/DVTiPhoneSimulatorRemoteClient.framework/Versions/Current/DVTiPhoneSimulatorRemoteClient', |
- '<(PRODUCT_DIR)/class-dump', |
], |
'outputs': [ |
'<(INTERMEDIATE_DIR)/iossim/DVTiPhoneSimulatorRemoteClient.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 -I -CiPhoneSimulator <(iphone_sim_path)/DVTiPhoneSimulatorRemoteClient.framework', |
- '<(INTERMEDIATE_DIR)/iossim/DVTiPhoneSimulatorRemoteClient.h', |
+ 'python', |
+ '<(class_dump_py)', |
+ '-t', '<(class_dump_bin)', |
+ '-o', '<(INTERMEDIATE_DIR)/iossim/DVTiPhoneSimulatorRemoteClient.h', |
+ '--', |
+ '-I', |
+ '-CiPhoneSimulator', |
+ '<(iphone_sim_path)/DVTiPhoneSimulatorRemoteClient.framework', |
], |
'message': 'Generating DVTiPhoneSimulatorRemoteClient.h', |
}, |