Bug 198098

Summary:

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

Product:

WebKit

Reporter:

Stephan Szabo <stephan.szabo>

Component:

Tools / Tests

Assignee:

Nobody <webkit-unassigned>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

commit-queue, dbates, don.olmstead, ews-watchlist, fujii.hironori, webkit-bug-importer

Priority:

Keywords:

InRadar

Version:

WebKit Nightly Build

Hardware:

Unspecified

OS:

Unspecified

Attachments:

Description	Flags
Patch	ews-watchlist: commit-queue-
Archive of layout-test-results from ews210 for win-future	none
Patch	don.olmstead: review+
Patch	none

Stephan Szabo

Reported 2019-05-21 17:57:36 PDT

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.

Attachments
Patch (2.39 KB, patch) 2019-05-22 09:49 PDT, Stephan Szabo	ews-watchlist: commit-queue-	Details Formatted Diff Diff
Archive of layout-test-results from ews210 for win-future (13.88 MB, application/zip) 2019-05-22 11:37 PDT, EWS Watchlist	no flags	Details
Patch (2.39 KB, patch) 2019-05-22 15:54 PDT, Stephan Szabo	don.olmstead: review+	Details Formatted Diff Diff
Patch (2.69 KB, patch) 2019-05-23 09:58 PDT, Stephan Szabo	no flags	Details Formatted Diff Diff
Show Obsolete (2) View All Add attachment proposed patch, testcase, etc.

Stephan Szabo

Comment 1 2019-05-22 09:49:06 PDT

Created attachment 370408 [details] Patch Seeing what applewin's ews makes of this.

EWS Watchlist

Comment 2 2019-05-22 11:27:58 PDT

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 3 2019-05-22 11:37:21 PDT

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

Comment 4 2019-05-22 11:37:32 PDT

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

Comment 5 2019-05-22 15:54:16 PDT

Created attachment 370458 [details] Patch Checking again.

Don Olmstead

Comment 6 2019-05-22 18:54:56 PDT

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

Comment 7 2019-05-23 09:58:52 PDT

Created attachment 370507 [details] Patch

WebKit Commit Bot

Comment 8 2019-05-23 13:16:01 PDT

Comment on attachment 370507 [details] Patch Clearing flags on attachment: 370507 Committed r245707: <https://trac.webkit.org/changeset/245707>

WebKit Commit Bot

Comment 9 2019-05-23 13:16:03 PDT

All reviewed patches have been landed. Closing bug.

Radar WebKit Bug Importer

Comment 10 2019-05-23 13:17:46 PDT

<rdar://problem/51079792>

Note You need to log in before you can comment on or make changes to this bug.