Bug 170267 – Support tvOS and watchOS in webkitdirs.pm

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Aakash Jain]

webkitdirs.pm should support watchOS and tvOS.

[Aakash Jain]

Created attachment 305823 [details]
Proposed patch

[Alexey Proskuryakov]

Comment on attachment 305823 [details]
Proposed patch

View in context: https://bugs.webkit.org/attachment.cgi?id=305823&action=review

> Tools/Scripts/webkitdirs.pm:469
> +    if (checkForArgumentAndRemoveFromARGV("--tv-device")) {

I wonder if it would be better to have "os" in the option name, for consistency with ios.

> Tools/Scripts/webkitdirs.pm:1353
> +    return  isIOSWebKit() || isTVOSWebKit() ||  isWATCHOSWebKit();

Double space here.

[Daniel Bates]

Comment on attachment 305823 [details]
Proposed patch

View in context: https://bugs.webkit.org/attachment.cgi?id=305823&action=review

> Tools/Scripts/webkitdirs.pm:105
> +    TVOS     => "tvOS",

TVOS => tvOS

> Tools/Scripts/webkitdirs.pm:106
> +    WATCHOS  => "watchOS",

WATCHOS => watchOS

> Tools/Scripts/webkitdirs.pm:471
> +        $xcodeSDK ||=  $hasInternalSDK ? 'appletvos.internal' : 'appletvos';

' => "

> Tools/Scripts/webkitdirs.pm:478
> +        $xcodeSDK ||=  $hasInternalSDK ? 'watchos.internal' : 'watchos';

Ditto.

> Tools/Scripts/webkitdirs.pm:504
> +    return "appletvos" if $xcodeSDK =~ /appletvos/i;

Please sort the added lines.

> Tools/Scripts/webkitdirs.pm:1343
> +    return portName() eq TVOS;

TVOS => tvOS

> Tools/Scripts/webkitdirs.pm:1346
> +sub isWATCHOSWebKit()

isWatchOSWebKit()

> Tools/Scripts/webkitdirs.pm:1348
> +    return portName() eq WATCHOS;

WATCHOS => watchOS

[Aakash Jain]

Created attachment 305905 [details]
Updated patch

Incorporated review comments.

[WebKit Commit Bot]

Comment on attachment 305905 [details]
Updated patch

Clearing flags on attachment: 305905

Committed r214631: <http://trac.webkit.org/changeset/214631>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Aakash Jain]

Followup commit to rename isIOSLikeWebKit to isEmbeddedWebKit. https://trac.webkit.org/changeset/214957/webkit