Bug 195977 – Add support for more platforms to generate-xcfilelists

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

[Keith Rollin]

generate-xcfilelists incorrectly complains when involved with building WebKit for iphonesimulator:

$ make debug SDKROOT=iphonesimulator.internal -C Internal/
…
PhaseScriptExecution Check\ .xcfilelists /Volumes/Data/Safari/OpenSource/WebKitBuild/JavaScriptCore.build/Debug-iphonesimulator/JavaScriptCore.build/Script-53609F9021DFFA9C008FA60A.sh
    cd /Volumes/Data/Safari/OpenSource/Source/JavaScriptCore
    /bin/sh -c /Volumes/Data/Safari/OpenSource/WebKitBuild/JavaScriptCore.build/Debug-iphonesimulator/JavaScriptCore.build/Script-53609F9021DFFA9C008FA60A.sh
### (die get_canonical_platform_name main main) Unrecognized platform name: iphonesimulator
GXCF: === Generating .xcfilelists for JavaScriptCore/iphonesimulator/Debug ===
GXCF: === Merging .xcfilelists for JavaScriptCore ===

Address this by teaching generate-xcfilelists about more platforms.


rdar://problem/48616075

[Keith Rollin]

Created attachment 365257 [details]
Patch

[Keith Rollin]

Created attachment 365260 [details]
Fix the location of the 'Reviewed by' statement in the changelog.

[Alexey Proskuryakov]

Comment on attachment 365260 [details]
Fix the location of the 'Reviewed by' statement in the changelog.

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

Conditional r=me assuming that you either tested tvOS simulator code path, or will test it and fix as necessary.

> Tools/Scripts/generate-xcfilelists:642
> +    [[ "${GX_PROVISIONAL_PLATFORM_NAME}" == "tvsimulator" ]] && { echo "tvsimulator"; return; }

I'm not quite sure where this string goes in the end, but my guess is that it should be appletvsimulator, not tvsimulator.

[Keith Rollin]

Created attachment 365283 [details]
Fixed tvos-related aliases.

[WebKit Commit Bot]

Comment on attachment 365283 [details]
Fixed tvos-related aliases.

Clearing flags on attachment: 365283

Committed r243188: <https://trac.webkit.org/changeset/243188>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Alexey Proskuryakov]

Can GX_PROVISIONAL_PLATFORM_NAME actually be "tvsimulator"? It seems undesirable to be lax with input unless there is a specific string reason to accept multiple variants.

[Keith Rollin]

I accept variants on the command line when executing the script by hand. I didn't want people to have to remember that it's "macosx" as opposed to "osx" or "macos", or "iphoneos" as opposed to "ios". What you're seeing with "tvsimulator" is that thought extended to tvOS and friends. Since I made the mistake of omitting the "apple" prefix in an earlier version of the patch, this seems like it might be a common mistake for people to make.

This system of aliases is in-line with the Robustness Principle / Postel's Law: "Be conservative in what you do, be liberal in what you accept from others" (though, admittedly, this principle is not without its critics).