Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

Side by Side Diff: test/ios/app-bundle/test-archs.gyp

Issue 81213003: Fix default ARCHS value for iOS project. (Closed) Base URL: http://gyp.googlecode.com/svn/trunk
Patch Set: Add a file that does not compile in 64-bit Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2011 Google Inc. All rights reserved. 1 # Copyright (c) 2011 Google Inc. All rights reserved.
Nico 2013/11/25 19:39:07 2013
sdefresne 2013/11/26 09:29:16 Done everywhere.
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 'OTHER_CFLAGS': [
30 '-fobjc-abi-version=2', 31 '-fobjc-abi-version=2',
Nico 2013/11/25 19:39:07 (do you need this?)
sdefresne 2013/11/26 09:29:16 Removed (came from copying file).
31 ], 32 ],
32 'SDKROOT': 'iphonesimulator', # -isysroot 33 'SDKROOT': 'iphonesimulator', # -isysroot
33 'TARGETED_DEVICE_FAMILY': '1,2', 34 'TARGETED_DEVICE_FAMILY': '1,2',
34 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist', 35 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist',
35 'IPHONEOS_DEPLOYMENT_TARGET': '4.2', 36 'IPHONEOS_DEPLOYMENT_TARGET': '7.0',
36 'CONFIGURATION_BUILD_DIR':'build/Default', 37 'CONFIGURATION_BUILD_DIR':'build/Default',
37 }, 38 },
38 }, 39 },
39 { 40 {
40 'target_name': 'sig_test', 41 'target_name': 'test_archs_i386',
41 'product_name': 'sig_test', 42 'product_name': 'Test Archs i386',
42 'type': 'executable', 43 'type': 'executable',
43 'product_extension': 'bundle', 44 'product_extension': 'bundle',
44 'mac_bundle': 1, 45 'mac_bundle': 1,
45 'sources': [ 46 'sources': [
46 'TestApp/main.m', 47 'TestApp/main.m',
47 ], 48 ],
48 'mac_bundle_resources': [ 49 'mac_bundle_resources': [
49 'TestApp/English.lproj/InfoPlist.strings', 50 'TestApp/English.lproj/InfoPlist.strings',
50 'TestApp/English.lproj/MainMenu.xib', 51 'TestApp/English.lproj/MainMenu.xib',
51 ], 52 ],
52 'link_settings': { 53 'link_settings': {
53 'libraries': [ 54 'libraries': [
54 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 55 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
55 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', 56 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework',
56 ], 57 ],
57 }, 58 },
58 'postbuilds': [
59 {
60 'postbuild_name': 'Verify no signature',
61 'action': [
62 'python',
63 'TestApp/check_no_signature.py'
64 ],
65 },
66 ],
67 'xcode_settings': { 59 'xcode_settings': {
68 'OTHER_CFLAGS': [ 60 'OTHER_CFLAGS': [
69 '-fobjc-abi-version=2', 61 '-fobjc-abi-version=2',
70 ], 62 ],
71 'SDKROOT': 'iphonesimulator', # -isysroot 63 'SDKROOT': 'iphonesimulator', # -isysroot
72 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer', 64 'TARGETED_DEVICE_FAMILY': '1,2',
73 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist', 65 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist',
74 'IPHONEOS_DEPLOYMENT_TARGET': '4.2', 66 'IPHONEOS_DEPLOYMENT_TARGET': '7.0',
75 'CONFIGURATION_BUILD_DIR':'buildsig/Default', 67 'CONFIGURATION_BUILD_DIR':'build/Default',
68 'ARCHS': ['i386'],
69 },
70 },
71 {
72 'target_name': 'test_archs_x86_64',
73 'product_name': 'Test Archs x86_64',
74 'type': 'executable',
75 'product_extension': 'bundle',
76 'mac_bundle': 1,
77 'sources': [
78 'TestApp/main.m',
79 ],
80 'mac_bundle_resources': [
81 'TestApp/English.lproj/InfoPlist.strings',
82 'TestApp/English.lproj/MainMenu.xib',
83 ],
84 'link_settings': {
85 'libraries': [
86 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
87 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework',
88 ],
89 },
90 'xcode_settings': {
91 'OTHER_CFLAGS': [
92 '-fobjc-abi-version=2',
93 ],
94 'SDKROOT': 'iphonesimulator', # -isysroot
95 'TARGETED_DEVICE_FAMILY': '1,2',
96 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist',
97 'IPHONEOS_DEPLOYMENT_TARGET': '7.0',
98 'CONFIGURATION_BUILD_DIR':'build/Default',
99 'ARCHS': ['x86_64'],
76 }, 100 },
77 }, 101 },
78 ], 102 ],
79 } 103 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698