| OLD | NEW | 
|    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   'variables': { | 
 |    7     'mac_deployment_target': '10.8' | 
 |    8   }, | 
|    6   'conditions': [ |    9   'conditions': [ | 
|    7     ['OS!="ios" or "<(GENERATOR)"!="xcode" or "<(GENERATOR_FLAVOR)"=="ninja"', { |   10     ['OS!="ios" or "<(GENERATOR)"!="xcode" or "<(GENERATOR_FLAVOR)"=="ninja"', { | 
|    8       'targets': [ |   11       'targets': [ | 
|    9         { |   12         { | 
|   10           'target_name': 'iossim', |   13           'target_name': 'iossim', | 
|   11           'toolsets': ['host'], |   14           'toolsets': ['host'], | 
|   12           'type': 'executable', |   15           'type': 'executable', | 
|   13           'variables': { |   16           'variables': { | 
|   14             'developer_dir': '<!(xcode-select -print-path)', |   17             'developer_dir': '<!(xcode-select -print-path)', | 
|   15             # TODO(lliabraa): Once all builders are on Xcode 6 this variable can |   18             # 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 |   19             # be removed and the actions gated by this variable can be run by | 
|   17             # default (crbug.com/385030). |   20             # default (crbug.com/385030). | 
|   18             'xcode_version': '<!(xcodebuild -version | grep Xcode | awk \'{print
      $2}\')', |   21             'xcode_version': '<!(xcodebuild -version | grep Xcode | awk \'{print
      $2}\')', | 
|   19           }, |   22           }, | 
|   20           'conditions': [ |   23           'conditions': [ | 
|   21             ['xcode_version>="6.0"', { |   24             ['xcode_version>="6.0"', { | 
|   22               'variables': { |   25               'variables': { | 
|   23                 'iphone_sim_path': '<(developer_dir)/../SharedFrameworks', |   26                 'iphone_sim_path': '<(developer_dir)/../SharedFrameworks', | 
|   24               }, |   27               }, | 
|   25               'defines': [ |   28               'defines': [ | 
|   26                 'IOSSIM_USE_XCODE_6', |   29                 'IOSSIM_USE_XCODE_6', | 
|   27               ], |   30               ], | 
|   28               'xcode_settings': { |  | 
|   29                 # The CoreSimulator.h file generated by class-dump defines a |  | 
|   30                 # property of type |NSString*| and a setter for the property |  | 
|   31                 # that takes a parameter of type |id|. This type mismatch causes |  | 
|   32                 # a compiler warning, so turn off -Werror. |  | 
|   33                 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', |  | 
|   34               }, |  | 
|   35               'actions': [ |   31               'actions': [ | 
|   36                 { |   32                 { | 
|   37                   'action_name': 'generate_dvt_foundation_header', |   33                   'action_name': 'generate_dvt_foundation_header', | 
|   38                   'inputs': [ |   34                   'inputs': [ | 
|   39                     '<(iphone_sim_path)/DVTFoundation.framework/Versions/Current
     /DVTFoundation', |   35                     '<(iphone_sim_path)/DVTFoundation.framework/Versions/Current
     /DVTFoundation', | 
|   40                     '<(PRODUCT_DIR)/class-dump', |   36                     '<(PRODUCT_DIR)/class-dump', | 
|   41                   ], |   37                   ], | 
|   42                   'outputs': [ |   38                   'outputs': [ | 
|   43                     '<(INTERMEDIATE_DIR)/iossim/DVTFoundation.h' |   39                     '<(INTERMEDIATE_DIR)/iossim/DVTFoundation.h' | 
|   44                   ], |   40                   ], | 
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   76                   'message': 'Generating CoreSimulator.h', |   72                   'message': 'Generating CoreSimulator.h', | 
|   77                 }, |   73                 }, | 
|   78               ],  # actions |   74               ],  # actions | 
|   79             }, {  # else: xcode_version<"6.0" |   75             }, {  # else: xcode_version<"6.0" | 
|   80               'variables': { |   76               'variables': { | 
|   81                 'iphone_sim_path': '<(developer_dir)/Platforms/iPhoneSimulator.p
     latform/Developer/Library/PrivateFrameworks', |   77                 'iphone_sim_path': '<(developer_dir)/Platforms/iPhoneSimulator.p
     latform/Developer/Library/PrivateFrameworks', | 
|   82               }, |   78               }, | 
|   83             }],  # xcode_version |   79             }],  # xcode_version | 
|   84           ],  # conditions |   80           ],  # conditions | 
|   85           'dependencies': [ |   81           'dependencies': [ | 
|   86             'third_party/class-dump/class-dump.gyp:class-dump#host', |   82             '<(DEPTH)/third_party/class-dump/class-dump.gyp:class-dump#host', | 
|   87           ], |   83           ], | 
|   88           'include_dirs': [ |   84           'include_dirs': [ | 
|   89             '<(INTERMEDIATE_DIR)/iossim', |   85             '<(INTERMEDIATE_DIR)/iossim', | 
|   90           ], |   86           ], | 
|   91           'sources': [ |   87           'sources': [ | 
|   92             'iossim.mm', |   88             'iossim.mm', | 
|   93             '<(INTERMEDIATE_DIR)/iossim/iPhoneSimulatorRemoteClient.h', |   89             '<(INTERMEDIATE_DIR)/iossim/iPhoneSimulatorRemoteClient.h', | 
|   94           ], |   90           ], | 
|   95           'libraries': [ |   91           'libraries': [ | 
|   96             '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', |   92             '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', | 
| (...skipping 16 matching lines...) Expand all  Loading... | 
|  113                 # -C <regex> only displays classes matching regular expression. |  109                 # -C <regex> only displays classes matching regular expression. | 
|  114                 './redirect-stdout.sh', |  110                 './redirect-stdout.sh', | 
|  115                 '<(PRODUCT_DIR)/class-dump -I -CiPhoneSimulator <(iphone_sim_pat
     h)/DVTiPhoneSimulatorRemoteClient.framework', |  111                 '<(PRODUCT_DIR)/class-dump -I -CiPhoneSimulator <(iphone_sim_pat
     h)/DVTiPhoneSimulatorRemoteClient.framework', | 
|  116                 '<(INTERMEDIATE_DIR)/iossim/DVTiPhoneSimulatorRemoteClient.h', |  112                 '<(INTERMEDIATE_DIR)/iossim/DVTiPhoneSimulatorRemoteClient.h', | 
|  117               ], |  113               ], | 
|  118               'message': 'Generating DVTiPhoneSimulatorRemoteClient.h', |  114               'message': 'Generating DVTiPhoneSimulatorRemoteClient.h', | 
|  119             }, |  115             }, | 
|  120           ],  # actions |  116           ],  # actions | 
|  121           'xcode_settings': { |  117           'xcode_settings': { | 
|  122             'ARCHS': ['x86_64'], |  118             'ARCHS': ['x86_64'], | 
|  123             'WARNING_CFLAGS': [ |  | 
|  124               '-Wno-objc-property-no-attribute', |  | 
|  125             ], |  | 
|  126           }, |  119           }, | 
|  127         }, |  120         }, | 
|  128       ], |  121       ], | 
|  129     }, {  # else, OS=="ios" and "<(GENERATOR)"=="xcode" and "<(GENERATOR_FLAVOR)
     "!="ninja" |  122     }, {  # else, OS=="ios" and "<(GENERATOR)"=="xcode" and "<(GENERATOR_FLAVOR)
     "!="ninja" | 
|  130       'variables': { |  123       'variables': { | 
|  131         'ninja_output_dir': 'ninja-iossim', |  124         'ninja_output_dir': 'ninja-iossim', | 
|  132         'ninja_product_dir': |  125         'ninja_product_dir': | 
|  133           '$(SYMROOT)/<(ninja_output_dir)/<(CONFIGURATION_NAME)', |  126           '$(SYMROOT)/<(ninja_output_dir)/<(CONFIGURATION_NAME)', | 
|  134       }, |  127       }, | 
|  135       'targets': [ |  128       'targets': [ | 
| (...skipping 18 matching lines...) Expand all  Loading... | 
|  154                 'iossim', |  147                 'iossim', | 
|  155               ], |  148               ], | 
|  156               'message': 'Generating the iossim executable', |  149               'message': 'Generating the iossim executable', | 
|  157             }, |  150             }, | 
|  158           ], |  151           ], | 
|  159         }, |  152         }, | 
|  160       ], |  153       ], | 
|  161     }], |  154     }], | 
|  162   ], |  155   ], | 
|  163 } |  156 } | 
| OLD | NEW |