Bug 220251

Summary: [WinCairo][CMake][MSBuild][ANGLE] entry_points_*.h was generated twice both in LibGLESv2EntryPointsHeaders and GLESv2 projects
Product: WebKit Reporter: Fujii Hironori <Hironori.Fujii>
Component: ANGLEAssignee: Fujii Hironori <Hironori.Fujii>
Status: RESOLVED FIXED    
Severity: Normal CC: annulen, dino, don.olmstead, ews-watchlist, graouts, gyuyoung.kim, jdarpinian, kbr, kkinnunen, kondapallykalyan, ryuan.choi, sergio, webkit-bug-importer, ysuzuki
Priority: P2 Keywords: InRadar
Version: WebKit Nightly Build   
Hardware: Unspecified   
OS: Unspecified   
Attachments:
Description Flags
WinCairo build log
none
Patch none

Fujii Hironori
Reported 2021-01-04 12:36:04 PST
WinCairo CMake+MSBuild builds report the following error in clean build. 27>C:\home\webkit\gb\WebKitBuild\Release\ANGLE\Headers\ANGLE/entry_points_egl.h(13,10): fatal error C1083: Cannot open include file: 'export.h': No such file or directory (compiling source file C:\home\webkit\gb\Source\WebCore\platform\graphics\texmap\ANGLEContext.cpp) This issue was reported by Microsoft Playwright team. https://webkit.slack.com/archives/CU84Q46JZ/p1609781605032600 CMake+Ninja can compile.
Attachments
WinCairo build log (193.69 KB, text/plain)
2021-01-04 12:37 PST, Fujii Hironori 		no flags
Details
Patch (2.46 KB, patch)
2021-01-04 13:19 PST, Fujii Hironori 		no flags
DetailsFormatted DiffDiff
View All Add attachment proposed patch, testcase, etc.
Fujii Hironori
Comment 1 2021-01-04 12:37:06 PST
Created attachment 416959 [details] WinCairo build log entry_points_egl.h was generated twice both in LibGLESv2EntryPointsHeaders and GLESv2 projects. 10>------ Build started: Project: LibGLESv2EntryPointsHeaders, Configuration: Debug x64 ------ 10>Generating ../../../ANGLE/Headers/ANGLE/entry_points_egl.h 16>------ Build started: Project: ANGLE-webgl-headers, Configuration: Debug x64 ------ 16>Postprocessed ANGLE header entry_points_egl.h 23>------ Build started: Project: GLESv2, Configuration: Debug x64 ------ 23>Generating ../../../ANGLE/Headers/ANGLE/entry_points_egl.h
Fujii Hironori
Comment 2 2021-01-04 12:42:33 PST
The fundamental issue of this bug was fixed in CMake v3.12. https://gitlab.kitware.com/cmake/cmake/-/commit/5a6c6292898fe238f3a5105133b8904209fbedaf https://gitlab.kitware.com/cmake/cmake/issues/16767 See also: Bug 213226 – [CMake][Visual Studio] CSSPropertyNames.h is generated twice in WebCore.vcxproj and WebCore_CopyPrivateHeaders.vcxproj Bug 213225 – [CMake][Visual Studio] CombinedDomains.json is generated twice in JavaScriptCore.vcxproj and InspectorBackendCommands.vcxproj Bug 198853 – [CMake][Win] CombinedDomains.json is generated twice in JavaScriptCore_CopyPrivateHeaders and JavaScriptCore projects
Fujii Hironori
Comment 3 2021-01-04 13:19:59 PST
Created attachment 416962 [details] Patch
EWS Watchlist
Comment 4 2021-01-04 13:20:41 PST
Note that there are important steps to take when updating ANGLE. See https://trac.webkit.org/wiki/UpdatingANGLE
Kenneth Russell
Comment 5 2021-01-04 13:57:27 PST
Comment on attachment 416962 [details] Patch Looks good to me. r+
Yusuke Suzuki
Comment 6 2021-01-04 15:09:31 PST
Comment on attachment 416962 [details] Patch Nice!
EWS
Comment 7 2021-01-04 15:18:16 PST
Committed r271139: <https://trac.webkit.org/changeset/271139> All reviewed patches have been landed. Closing bug and clearing flags on attachment 416962 [details].
Radar WebKit Bug Importer
Comment 8 2021-01-04 15:19:14 PST
<rdar://problem/72797771>
Note You need to log in before you can comment on or make changes to this bug.