Bug 198098 – [Win][CMake] Pass architecture to cmake via -A for both x64 and Win32

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

[Stephan Szabo]

Give the architecture explicitly to CMake for both Win32 and x86. There's also some potential cleanup potential since we have the names for passing to MSBuild.

[Stephan Szabo]

Created attachment 370408 [details]
Patch

Seeing what applewin's ews makes of this.

[EWS Watchlist]

Comment on attachment 370408 [details]
Patch

Attachment 370408 [details] did not pass jsc-ews (mac):
Output: https://webkit-queues.webkit.org/results/12258729

New failing tests:
mozilla-tests.yaml/js1_5/Array/regress-101964.js.mozilla-ftl-eager-no-cjit-validate-phases
apiTests

[EWS Watchlist]

Comment on attachment 370408 [details]
Patch

Attachment 370408 [details] did not pass win-ews (win):
Output: https://webkit-queues.webkit.org/results/12259072

New failing tests:
http/tests/misc/repeat-open-cancel.html

[EWS Watchlist]

Created attachment 370429 [details]
Archive of layout-test-results from ews210 for win-future

The attached test failures were seen while running run-webkit-tests on the win-ews.
Bot: ews210  Port: win-future  Platform: CYGWIN_NT-10.0-17763-3.0.5-338.x86_64-x86_64-64bit

[Stephan Szabo]

Created attachment 370458 [details]
Patch

Checking again.

[Don Olmstead]

Comment on attachment 370458 [details]
Patch

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

r=me with changes

> Tools/ChangeLog:14
> +        Reviewed by NOBODY (OOPS!).
> +
> +        * Scripts/webkitdirs.pm:
> +        (getVisualStudioToolset): Get toolset name for cmake/msbuild
> +        (getMSBuildPlatformArgument): Update to use getVisualStudioToolset
> +        (getCMakeWindowsToolsetArgument): Get -A argument for cmake
> +        based on toolset
> +        (generateBuildSystemFromCMakeProject): Remove explicit -A x64
> +        in 64-bit mode in favor of new getCMakeWindowsToolsetArgument.

Can you add why this is being done? I thought it was because with 2019 the default architecture was changed from Win32 to whatever the host operating system is.

[Stephan Szabo]

Created attachment 370507 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 370507 [details]
Patch

Clearing flags on attachment: 370507

Committed r245707: <https://trac.webkit.org/changeset/245707>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Radar WebKit Bug Importer]

<rdar://problem/51079792>