Skip to content

Commit c23efab

Browse files
committed
[Project] Move the default ONLY_ACTIVE_ARCH setting to the project level.
This silences the project settings validation of Xcode 5.
1 parent 4eab6e2 commit c23efab

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

lib/xcodeproj/constants.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ module Constants
118118
'GCC_SYMBOLS_PRIVATE_EXTERN' => 'NO',
119119
'GCC_OPTIMIZATION_LEVEL' => '0',
120120
'COPY_PHASE_STRIP' => 'NO',
121-
'ONLY_ACTIVE_ARCH' => 'YES',
122121
}.freeze,
123122
:release => {
124123
'OTHER_CFLAGS' => ['-DNS_BLOCK_ASSERTIONS=1', "$(inherited)"],
@@ -156,8 +155,7 @@ module Constants
156155
:release => {
157156
}.freeze,
158157
:debug => {
159-
# TODO: enable after Xcode 4
160-
# 'ONLY_ACTIVE_ARCH' => 'YES',
158+
'ONLY_ACTIVE_ARCH' => 'YES',
161159
}.freeze,
162160
}.freeze
163161

lib/xcodeproj/gem_version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module Xcodeproj
22
# The version of the xcodeproj gem.
33
#
4-
VERSION = '0.10.1' unless defined? Xcodeproj::VERSION
4+
VERSION = '0.11.0' unless defined? Xcodeproj::VERSION
55
end
66

spec/project_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ module ProjectSpecs
6060

6161
configurations = list.build_configurations
6262
configurations.map(&:name).sort.should == %w| Debug Release |
63-
list.build_settings('Debug').should == {}
63+
list.build_settings('Debug').should == { 'ONLY_ACTIVE_ARCH' => 'YES' }
6464
list.build_settings('Release').should == {}
6565
end
6666

@@ -327,7 +327,7 @@ module ProjectSpecs
327327
list.default_configuration_name.should == 'Release'
328328
list.default_configuration_is_visible.should == '0'
329329

330-
@project.build_settings('Debug').should == {}
330+
@project.build_settings('Debug').should == { 'ONLY_ACTIVE_ARCH' => 'YES' }
331331
@project.build_settings('Release').should == {}
332332
end
333333

@@ -354,7 +354,7 @@ module ProjectSpecs
354354
],
355355
"Targets" => [],
356356
"Build Configurations" => [
357-
{ "Debug" => {"Build Settings" => {} } },
357+
{ "Debug" => {"Build Settings" => { 'ONLY_ACTIVE_ARCH' => 'YES' } } },
358358
{ "Release" => {"Build Settings" => {} } }
359359
]
360360
}

0 commit comments

Comments
 (0)