Bug 140623 - [iOS] Do not hard-code iphoneos.internal SDK in buildXCodeProject()
Summary: [iOS] Do not hard-code iphoneos.internal SDK in buildXCodeProject()
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: David Kilzer (:ddkilzer)
URL:
Keywords:
Depends on: 140585
Blocks:
  Show dependency treegraph
 
Reported: 2015-01-19 10:26 PST by David Kilzer (:ddkilzer)
Modified: 2015-01-19 11:05 PST (History)
7 users (show)

See Also:


Attachments
Patch v1 (2.10 KB, patch)
2015-01-19 10:33 PST, David Kilzer (:ddkilzer)
dbates: review+
ap: commit-queue-
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description David Kilzer (:ddkilzer) 2015-01-19 10:26:12 PST
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.
Comment 1 David Kilzer (:ddkilzer) 2015-01-19 10:33:30 PST
Created attachment 244907 [details]
Patch v1
Comment 2 Daniel Bates 2015-01-19 10:35:36 PST
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.
Comment 3 David Kilzer (:ddkilzer) 2015-01-19 10:36:21 PST
This also makes --device prefer the "iphoneos.internal" SDK if it is installed, else it falls back to the "iphoneos" SDK.
Comment 4 Alexey Proskuryakov 2015-01-19 10:39:17 PST
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 5 Daniel Bates 2015-01-19 10:40:14 PST
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().
Comment 6 David Kilzer (:ddkilzer) 2015-01-19 11:05:08 PST
Committed r178656: <http://trac.webkit.org/changeset/178656>