| Summary: | [iOS] Do not hard-code iphoneos.internal SDK in buildXCodeProject() | ||||||
|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | David Kilzer (:ddkilzer) <ddkilzer> | ||||
| Component: | Tools / Tests | Assignee: | David Kilzer (:ddkilzer) <ddkilzer> | ||||
| Status: | RESOLVED FIXED | ||||||
| Severity: | Normal | CC: | ap, darin, dbates, ddkilzer, jake.nielsen.webkit, mrowe, msaboff | ||||
| Priority: | P2 | ||||||
| Version: | 528+ (Nightly build) | ||||||
| Hardware: | Unspecified | ||||||
| OS: | Unspecified | ||||||
| Bug Depends on: | 140585 | ||||||
| Bug Blocks: | |||||||
| Attachments: |
|
||||||
Created attachment 244907 [details]
Patch v1
Comment on attachment 244907 [details] Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=244907&action=review > Tools/Scripts/webkitdirs.pm:438 > + $xcodeSDK ||= $hasInternalSDK ? 'iphoneos.internal' : 'iphoneos'; Nit: We should take this opportunity to use double quotes instead of single quotes to be more consistent with the majority of the Perl code. This also makes --device prefer the "iphoneos.internal" SDK if it is installed, else it falls back to the "iphoneos" SDK. Comment on attachment 244907 [details]
Patch v1
r=me too.
I think that this patch needs to fix build-webkit --help output:
$ build-webkit --help
...
--device Use the current iphoneos.internal SDK (iOS only)
Also, perhaps EWS should use --device now, not --sdk=iphoneos. Not a big deal though.
Comment on attachment 244907 [details] Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=244907&action=review > Tools/Scripts/webkitdirs.pm:1643 > Nit: We can write the simplify the if condition to isIOSWebKit(). Committed r178656: <http://trac.webkit.org/changeset/178656> |
When starting the ios-ews queue, the following command is run to kick off a build: Tools/Scripts/build-webkit --release --sdk=iphoneos ARCHS=armv7 However, buildXCodeProject() changes the SDK from 'iphoneos' to 'iphoneos.internal', causing an error: xcodebuild: error: SDK "iphoneos.internal" cannot be located. The fix is to stop buildXCodeProject() from assuming that building for the device always means using the internal SDK.