| OLD | NEW | 
|---|
| 1 # Copyright (c) 2011 Google Inc. All rights reserved. | 1 # Copyright (c) 2013 Google Inc. 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   'make_global_settings': [ | 5   'make_global_settings': [ | 
| 6     ['CC', '/usr/bin/clang'], | 6     ['CC', '/usr/bin/clang'], | 
| 7   ], | 7   ], | 
| 8   'targets': [ | 8   'targets': [ | 
| 9     { | 9     { | 
| 10       'target_name': 'test_app', | 10       'target_name': 'test_no_archs', | 
| 11       'product_name': 'Test App Gyp', | 11       'product_name': 'Test No Archs', | 
| 12       'type': 'executable', | 12       'type': 'executable', | 
| 13       'product_extension': 'bundle', | 13       'product_extension': 'bundle', | 
| 14       'mac_bundle': 1, | 14       'mac_bundle': 1, | 
| 15       'sources': [ | 15       'sources': [ | 
| 16         'TestApp/main.m', | 16         'TestApp/main.m', | 
|  | 17         'TestApp/only-compile-in-32-bits.m', | 
| 17       ], | 18       ], | 
| 18       'mac_bundle_resources': [ | 19       'mac_bundle_resources': [ | 
| 19         'TestApp/English.lproj/InfoPlist.strings', | 20         'TestApp/English.lproj/InfoPlist.strings', | 
| 20         'TestApp/English.lproj/MainMenu.xib', | 21         'TestApp/English.lproj/MainMenu.xib', | 
| 21       ], | 22       ], | 
| 22       'link_settings': { | 23       'link_settings': { | 
| 23         'libraries': [ | 24         'libraries': [ | 
| 24           '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', | 25           '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', | 
| 25           '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', | 26           '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', | 
| 26         ], | 27         ], | 
| 27       }, | 28       }, | 
| 28       'xcode_settings': { | 29       'xcode_settings': { | 
| 29         'OTHER_CFLAGS': [ |  | 
| 30           '-fobjc-abi-version=2', |  | 
| 31         ], |  | 
| 32         'SDKROOT': 'iphonesimulator',  # -isysroot | 30         'SDKROOT': 'iphonesimulator',  # -isysroot | 
| 33         'TARGETED_DEVICE_FAMILY': '1,2', | 31         'TARGETED_DEVICE_FAMILY': '1,2', | 
| 34         'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist', | 32         'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist', | 
| 35         'IPHONEOS_DEPLOYMENT_TARGET': '4.2', | 33         'IPHONEOS_DEPLOYMENT_TARGET': '7.0', | 
| 36         'CONFIGURATION_BUILD_DIR':'build/Default', | 34         'CONFIGURATION_BUILD_DIR':'build/Default', | 
| 37       }, | 35       }, | 
| 38     }, | 36     }, | 
| 39     { | 37     { | 
| 40       'target_name': 'sig_test', | 38       'target_name': 'test_archs_i386', | 
| 41       'product_name': 'sig_test', | 39       'product_name': 'Test Archs i386', | 
| 42       'type': 'executable', | 40       'type': 'executable', | 
| 43       'product_extension': 'bundle', | 41       'product_extension': 'bundle', | 
| 44       'mac_bundle': 1, | 42       'mac_bundle': 1, | 
| 45       'sources': [ | 43       'sources': [ | 
| 46         'TestApp/main.m', | 44         'TestApp/main.m', | 
|  | 45         'TestApp/only-compile-in-32-bits.m', | 
| 47       ], | 46       ], | 
| 48       'mac_bundle_resources': [ | 47       'mac_bundle_resources': [ | 
| 49         'TestApp/English.lproj/InfoPlist.strings', | 48         'TestApp/English.lproj/InfoPlist.strings', | 
| 50         'TestApp/English.lproj/MainMenu.xib', | 49         'TestApp/English.lproj/MainMenu.xib', | 
| 51       ], | 50       ], | 
| 52       'link_settings': { | 51       'link_settings': { | 
| 53         'libraries': [ | 52         'libraries': [ | 
| 54           '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', | 53           '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', | 
| 55           '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', | 54           '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', | 
| 56         ], | 55         ], | 
| 57       }, | 56       }, | 
| 58       'postbuilds': [ | 57       'xcode_settings': { | 
| 59         { | 58         'SDKROOT': 'iphonesimulator',  # -isysroot | 
| 60           'postbuild_name': 'Verify no signature', | 59         'TARGETED_DEVICE_FAMILY': '1,2', | 
| 61           'action': [ | 60         'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist', | 
| 62             'python', | 61         'IPHONEOS_DEPLOYMENT_TARGET': '7.0', | 
| 63             'TestApp/check_no_signature.py' | 62         'CONFIGURATION_BUILD_DIR':'build/Default', | 
| 64           ], | 63         'ARCHS': ['i386'], | 
| 65         }, | 64       }, | 
|  | 65     }, | 
|  | 66     { | 
|  | 67       'target_name': 'test_archs_x86_64', | 
|  | 68       'product_name': 'Test Archs x86_64', | 
|  | 69       'type': 'executable', | 
|  | 70       'product_extension': 'bundle', | 
|  | 71       'mac_bundle': 1, | 
|  | 72       'sources': [ | 
|  | 73         'TestApp/main.m', | 
|  | 74         'TestApp/only-compile-in-64-bits.m', | 
| 66       ], | 75       ], | 
|  | 76       'mac_bundle_resources': [ | 
|  | 77         'TestApp/English.lproj/InfoPlist.strings', | 
|  | 78         'TestApp/English.lproj/MainMenu.xib', | 
|  | 79       ], | 
|  | 80       'link_settings': { | 
|  | 81         'libraries': [ | 
|  | 82           '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', | 
|  | 83           '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', | 
|  | 84         ], | 
|  | 85       }, | 
| 67       'xcode_settings': { | 86       'xcode_settings': { | 
| 68         'OTHER_CFLAGS': [ |  | 
| 69           '-fobjc-abi-version=2', |  | 
| 70         ], |  | 
| 71         'SDKROOT': 'iphonesimulator',  # -isysroot | 87         'SDKROOT': 'iphonesimulator',  # -isysroot | 
| 72         'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer', | 88         'TARGETED_DEVICE_FAMILY': '1,2', | 
| 73         'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist', | 89         'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist', | 
| 74         'IPHONEOS_DEPLOYMENT_TARGET': '4.2', | 90         'IPHONEOS_DEPLOYMENT_TARGET': '7.0', | 
| 75         'CONFIGURATION_BUILD_DIR':'buildsig/Default', | 91         'CONFIGURATION_BUILD_DIR':'build/Default', | 
|  | 92         'ARCHS': ['x86_64'], | 
| 76       }, | 93       }, | 
| 77     }, | 94     }, | 
| 78   ], | 95   ], | 
| 79 } | 96 } | 
| OLD | NEW | 
|---|