Update iossim.gyp to use src/build/ios/mac_build.gypi.

testing/iossim/iossim.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
-  'variables': {
-    'iphone_sim_path': '$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks',
-    'other_frameworks_path': '$(DEVELOPER_DIR)/../OtherFrameworks'
-  },
   'targets': [
     {
       'target_name': 'iossim',
-      'type': 'executable',
-      'dependencies': [
-        '<(DEPTH)/testing/iossim/third_party/class-dump/class-dump.gyp:class-dump',
-      ],
-      'include_dirs': [
-        '<(INTERMEDIATE_DIR)/iossim',
-      ],
-      'sources': [
-        'iossim.mm',
-        '<(INTERMEDIATE_DIR)/iossim/iPhoneSimulatorRemoteClient.h',
-      ],
-      'libraries': [
-        '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
-      ],
-      'actions': [
-        {
-          'action_name': 'generate_iphone_sim_header',
-          'inputs': [
-            '<(iphone_sim_path)/iPhoneSimulatorRemoteClient.framework/Versions/Current/iPhoneSimulatorRemoteClient',
-            '$(BUILD_DIR)/$(CONFIGURATION)/class-dump',
+      'conditions': [
+        ['OS!="ios"', {

[stuartmorgan, 2012/08/07 17:40:37]

Let's do OS != "ios" (with spaces). It's not consistent in the code base, but I
find it more readable so I'd like to use it in new files.

[lliabraa, 2012/08/16 15:40:59]

Done.

+          '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'
+          },
+          'dependencies': [
+            '<(DEPTH)/testing/iossim/third_party/class-dump/class-dump.gyp:class-dump',

[stuartmorgan, 2012/08/07 17:40:37]

Since this is a gyp file, not a gypi file included in anything else, can't this
just be 'third_party/class-dump/...' ?

[lliabraa, 2012/08/16 15:40:59]

Done.

           ],
-          'outputs': [
-            '<(INTERMEDIATE_DIR)/iossim/iPhoneSimulatorRemoteClient.h'
+          'include_dirs': [
+            '<(INTERMEDIATE_DIR)/iossim',
           ],
-          '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.
-            '<(DEPTH)/testing/iossim/redirect-stdout.sh',
-            '$(BUILD_DIR)/$(CONFIGURATION)/class-dump -CiPhoneSimulator <(iphone_sim_path)/iPhoneSimulatorRemoteClient.framework',
+          'sources': [
+            'iossim.mm',
             '<(INTERMEDIATE_DIR)/iossim/iPhoneSimulatorRemoteClient.h',
           ],
-          'message': 'Generating header',
-        },
+          'libraries': [
+            '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
+          ],
+          'actions': [
+            {
+              'action_name': 'generate_iphone_sim_header',
+              'inputs': [
+                '<(iphone_sim_path)/iPhoneSimulatorRemoteClient.framework/Versions/Current/iPhoneSimulatorRemoteClient',
+                '<(PRODUCT_DIR)/class-dump',
+              ],
+              'outputs': [
+                '<(INTERMEDIATE_DIR)/iossim/iPhoneSimulatorRemoteClient.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.
+                '<(DEPTH)/testing/iossim/redirect-stdout.sh',

[stuartmorgan, 2012/08/07 17:40:37]

Same path comment here.

[lliabraa, 2012/08/16 15:40:59]

Done.

+                '<(PRODUCT_DIR)/class-dump -CiPhoneSimulator <(iphone_sim_path)/iPhoneSimulatorRemoteClient.framework',
+                '<(INTERMEDIATE_DIR)/iossim/iPhoneSimulatorRemoteClient.h',
+              ],
+              'message': 'Generating header',
+            },
+          ],
+        }, {  # else, OS=="ios"
+          'type': 'none',
+          'variables': {
+            'ninja_output_dir': 'ninja-iossim',
+            # Gyp to rerun
+            're_run_targets': [
+               'testing/iossim/iossim.gyp',
+            ],
+          },
+          'includes': ['../../build/ios/mac_build.gypi'],
+          'actions': [
+            {
+              'action_name': 'compile iossim',
+              'inputs': [],
+              'outputs': [],
+              'action': [
+                '<@(ninja_cmd)',
+                'iossim',
+              ],
+              'message': 'Generating the iossim executable',
+            },
+            {
+              'action_name': 'copy iossim',
+              'inputs': [
+                # TODO(ios): It should be possible to define the input, but
+                # adding it causes gyp to complain about duplicate id.
+                # '<(ninja_product_dir)/iossim',
+              ],
+              'outputs': [
+                '<(DEPTH)/xcodebuild/<(CONFIGURATION_NAME)/iossim',
+              ],
+              'action': [
+                'cp',
+                '<(ninja_product_dir)/iossim',
+                '<(DEPTH)/xcodebuild/<(CONFIGURATION_NAME)/iossim',
+              ],
+            },
+          ],
+        }],
       ],
     },
   ],
 }