Skip to content

Commit e2c6592

Browse files
eecksteineeckstein
authored
Merge pull request swiftlang#43 from eeckstein/fix-config
Set the build configuration for xcode-build correctly.
2 parents e905ee2 + 59de964 commit e2c6592

File tree

2 files changed

+107
-58
lines changed

2 files changed

+107
-58
lines changed

Diff for: ‎project.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,10 @@ def get_build_command(self, incremental=False):
114114
'ENABLE_BITCODE=NO',
115115
'GCC_TREAT_WARNINGS_AS_ERRORS=0'])
116116
for setting, value in self._build_settings.iteritems():
117-
command += ['%s=%s' % (setting, value)]
117+
if setting == 'CONFIGURATION':
118+
command += ['-configuration', value]
119+
else:
120+
command += ['%s=%s' % (setting, value)]
118121

119122
return command
120123

Diff for: ‎projects.json

+103-57
Original file line numberDiff line numberDiff line change
@@ -96,56 +96,136 @@
9696
"project": "AsyncNinja.xcodeproj",
9797
"scheme": "AsyncNinja",
9898
"destination": "generic/platform=macOS",
99-
"configuration": "Release"
99+
"configuration": "Release",
100+
"xfail": {
101+
"compatibility": {
102+
"3.1": {
103+
"branch": {
104+
"master": "https://bugs.swift.org/browse/SR-4854",
105+
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-4854"
106+
}
107+
}
108+
}
109+
}
100110
},
101111
{
102112
"action": "TestXcodeProjectScheme",
103113
"project": "AsyncNinja.xcodeproj",
104114
"scheme": "AsyncNinja",
105115
"destination": "platform=macOS",
106-
"configuration": "Release"
116+
"configuration": "Release",
117+
"xfail": {
118+
"compatibility": {
119+
"3.1": {
120+
"branch": {
121+
"master": "https://bugs.swift.org/browse/SR-4854",
122+
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-4854"
123+
}
124+
}
125+
}
126+
}
107127
},
108128
{
109129
"action": "BuildXcodeProjectScheme",
110130
"project": "AsyncNinja.xcodeproj",
111131
"scheme": "AsyncNinja",
112132
"destination": "generic/platform=iOS",
113-
"configuration": "Release"
133+
"configuration": "Release",
134+
"xfail": {
135+
"compatibility": {
136+
"3.1": {
137+
"branch": {
138+
"master": "https://bugs.swift.org/browse/SR-4854",
139+
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-4854"
140+
}
141+
}
142+
}
143+
}
114144
},
115145
{
116146
"action": "TestXcodeProjectScheme",
117147
"project": "AsyncNinja.xcodeproj",
118148
"scheme": "AsyncNinja",
119149
"destination": "platform=iOS Simulator,name=iPhone 5",
120-
"configuration": "Release"
150+
"configuration": "Release",
151+
"xfail": {
152+
"compatibility": {
153+
"3.1": {
154+
"branch": {
155+
"master": "https://bugs.swift.org/browse/SR-4854",
156+
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-4854"
157+
}
158+
}
159+
}
160+
}
121161
},
122162
{
123163
"action": "TestXcodeProjectScheme",
124164
"project": "AsyncNinja.xcodeproj",
125165
"scheme": "AsyncNinja",
126166
"destination": "platform=iOS Simulator,name=iPhone 7",
127-
"configuration": "Release"
167+
"configuration": "Release",
168+
"xfail": {
169+
"compatibility": {
170+
"3.1": {
171+
"branch": {
172+
"master": "https://bugs.swift.org/browse/SR-4854",
173+
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-4854"
174+
}
175+
}
176+
}
177+
}
128178
},
129179
{
130180
"action": "BuildXcodeProjectScheme",
131181
"project": "AsyncNinja.xcodeproj",
132182
"scheme": "AsyncNinja",
133183
"destination": "generic/platform=tvOS",
134-
"configuration": "Release"
184+
"configuration": "Release",
185+
"xfail": {
186+
"compatibility": {
187+
"3.1": {
188+
"branch": {
189+
"master": "https://bugs.swift.org/browse/SR-4854",
190+
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-4854"
191+
}
192+
}
193+
}
194+
}
135195
},
136196
{
137197
"action": "TestXcodeProjectScheme",
138198
"project": "AsyncNinja.xcodeproj",
139199
"scheme": "AsyncNinja",
140200
"destination": "platform=tvOS Simulator,name=Apple TV 1080p",
141-
"configuration": "Release"
201+
"configuration": "Release",
202+
"xfail": {
203+
"compatibility": {
204+
"3.1": {
205+
"branch": {
206+
"master": "https://bugs.swift.org/browse/SR-4854",
207+
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-4854"
208+
}
209+
}
210+
}
211+
}
142212
},
143213
{
144214
"action": "BuildXcodeProjectScheme",
145215
"project": "AsyncNinja.xcodeproj",
146216
"scheme": "AsyncNinja",
147217
"destination": "generic/platform=watchOS",
148-
"configuration": "Release"
218+
"configuration": "Release",
219+
"xfail": {
220+
"compatibility": {
221+
"3.1": {
222+
"branch": {
223+
"master": "https://bugs.swift.org/browse/SR-4854",
224+
"swift-4.0-branch": "https://bugs.swift.org/browse/SR-4854"
225+
}
226+
}
227+
}
228+
}
149229
},
150230
{
151231
"action": "BuildSwiftPackage",
@@ -417,72 +497,28 @@
417497
"project": "ReactiveExtensions.xcodeproj",
418498
"scheme": "ReactiveExtensions-iOS",
419499
"destination": "generic/platform=iOS",
420-
"configuration": "Release",
421-
"xfail": {
422-
"compatibility": {
423-
"3.0": {
424-
"branch": {
425-
"master": "<rdar://problem/30788078>",
426-
"swift-4.0-branch": "<rdar://problem/30788078>",
427-
"swift-3.1-branch": "<rdar://problem/30788078>"
428-
}
429-
}
430-
}
431-
}
500+
"configuration": "Release"
432501
},
433502
{
434503
"action": "BuildXcodeProjectScheme",
435504
"project": "ReactiveExtensions.xcodeproj",
436505
"scheme": "ReactiveExtensions-TestHelpers-iOS",
437506
"destination": "generic/platform=iOS",
438-
"configuration": "Release",
439-
"xfail": {
440-
"compatibility": {
441-
"3.0": {
442-
"branch": {
443-
"master": "<rdar://problem/30788078>",
444-
"swift-4.0-branch": "<rdar://problem/30788078>",
445-
"swift-3.1-branch": "<rdar://problem/30788078>"
446-
}
447-
}
448-
}
449-
}
507+
"configuration": "Release"
450508
},
451509
{
452510
"action": "BuildXcodeProjectScheme",
453511
"project": "ReactiveExtensions.xcodeproj",
454512
"scheme": "ReactiveExtensions-TestHelpers-tvOS",
455513
"destination": "generic/platform=tvOS",
456-
"configuration": "Release",
457-
"xfail": {
458-
"compatibility": {
459-
"3.0": {
460-
"branch": {
461-
"master": "<rdar://problem/30788078>",
462-
"swift-4.0-branch": "<rdar://problem/30788078>",
463-
"swift-3.1-branch": "<rdar://problem/30788078>"
464-
}
465-
}
466-
}
467-
}
514+
"configuration": "Release"
468515
},
469516
{
470517
"action": "BuildXcodeProjectScheme",
471518
"project": "ReactiveExtensions.xcodeproj",
472519
"scheme": "ReactiveExtensions-tvOS",
473520
"destination": "generic/platform=tvOS",
474-
"configuration": "Release",
475-
"xfail": {
476-
"compatibility": {
477-
"3.0": {
478-
"branch": {
479-
"master": "<rdar://problem/30788078>",
480-
"swift-4.0-branch": "<rdar://problem/30788078>",
481-
"swift-3.1-branch": "<rdar://problem/30788078>"
482-
}
483-
}
484-
}
485-
}
521+
"configuration": "Release"
486522
}
487523
]
488524
},
@@ -1993,7 +2029,17 @@
19932029
"actions": [
19942030
{
19952031
"action": "BuildSwiftPackage",
1996-
"configuration": "release"
2032+
"configuration": "release",
2033+
"xfail": {
2034+
"compatibility": {
2035+
"3.0": {
2036+
"branch": {
2037+
"master": "rdar://problem/32222500",
2038+
"swift-4.0-branch": "rdar://problem/32222500"
2039+
}
2040+
}
2041+
}
2042+
}
19972043
}
19982044
]
19992045
}

0 commit comments

Comments
 (0)