199212 2019-06-25 16:47:49 -0700 Script which adjusts include paths in ANGLE's copied headers breaks incremental builds 2020-06-01 19:53:14 -0700 1 1 1 Unclassified WebKit ANGLE WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Major --- 169861 197755 198948 212444 212623 1 kbr kbr darin dino ews-watchlist graouts kondapallykalyan krollin ryanhaddad webkit-bug-importer oldest_to_newest 1547886 0 kbr 2019-06-25 16:47:49 -0700 Per this discussion on webkit-dev: https://lists.webkit.org/pipermail/webkit-dev/2019-June/030707.html and turning on the additional build logging: defaults write com.apple.dt.Xcode ExplainWhyBuildCommandsAreRun -bool YES it's clear that the adjust-angle-include-paths.sh script which was added as a build phase in Issue 197755 is causing ANGLE's headers (specifically ShaderLang.h, but soon others) to be modified every time the build runs, causing excessive recompilation. The necessary fix will be similar to that from Issue 169861. 1547911 1 372886 kbr 2019-06-25 17:52:39 -0700 Created attachment 372886 Patch 1547912 2 ews-watchlist 2019-06-25 17:54:46 -0700 Note that there are important steps to take when updating ANGLE. See http://trac.webkit.org/wiki/UpdatingANGLE 1547913 3 kbr 2019-06-25 17:55:32 -0700 Tested this modification locally. Works correctly on the first and subsequent builds. Note that the fix from bug 169861 didn't really apply. These headers are copied out as part of the "Headers" build phase, and it wasn't feasible to try to prevent running the adjust-angle-include-paths.sh script. 1547926 4 372886 darin 2019-06-25 18:31:06 -0700 Comment on attachment 372886 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372886&action=review > Source/ThirdParty/ANGLE/ChangeLog:11 > + * adjust-angle-include-paths.sh: I think there’s a tab here instead of spaces and the pre-commit Subversion hook will reject this patch as-is. 1547934 5 dino 2019-06-25 18:45:07 -0700 Committed r246825: <https://trac.webkit.org/changeset/246825> 1547969 6 ryanhaddad 2019-06-25 20:57:05 -0700 Reverted r246825 for reason: Breaks internal builds. Committed r246832: <https://trac.webkit.org/changeset/246832> 1547970 7 ryanhaddad 2019-06-25 20:58:57 -0700 (In reply to Ryan Haddad from comment #6) > Reverted r246825 for reason: > > Breaks internal builds. > > Committed r246832: <https://trac.webkit.org/changeset/246832> Emailed Dean the build failure log. 1548053 8 kbr 2019-06-26 10:26:09 -0700 (In reply to Darin Adler from comment #4) > Comment on attachment 372886 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=372886&action=review > > > Source/ThirdParty/ANGLE/ChangeLog:11 > > + * adjust-angle-include-paths.sh: > > I think there’s a tab here instead of spaces and the pre-commit Subversion > hook will reject this patch as-is. Sorry about that. I'll fix that up when attempting to reland. 1548074 9 dino 2019-06-26 11:28:19 -0700 \<Root>./usr/local/include/ANGLE/angle.timestamp **** buildit [INFO ] 2019-06-25T19:03:34-0700 **** File appears to be empty which is not allowed. **** buildit [INFO ] 2019-06-25T19:03:34-0700 **** **** buildit [INFO ] 2019-06-25T19:03:34-0700 **** <SDKContentRoot>./usr/local/include/ANGLE/angle.timestamp **** buildit [INFO ] 2019-06-25T19:03:34-0700 **** File appears to be empty which is not allowed. Simple fix. 1548075 10 dino 2019-06-26 11:28:56 -0700 Ken, I'll make the edit and re-land. Don't worry about submitting a new patch. 1548079 11 dino 2019-06-26 11:37:30 -0700 Landed again in r246842 1548081 12 kbr 2019-06-26 11:40:19 -0700 Thank you Dean for fixing up this patch and relanding it! 1548208 13 webkit-bug-importer 2019-06-26 16:40:14 -0700 <rdar://problem/52218406> 372886 2019-06-25 17:52:39 -0700 2019-06-25 18:31:06 -0700 Patch bug-199212-20190625175238.patch text/plain 1812 kbr U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2ODIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggNTNlOTcyZGU0MzRjYTgzZGYzNzA2MjljOGQ0OWE2NzQ0Y2QyOGE2NS4uNTcyOGMwMzViYWRj MTIxMWY5ZmIxNzdjNGQyNTlhYTM5YzgwNzEwNiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE1IEBACisyMDE5LTA2LTI1ICBLZW5uZXRoIFJ1c3NlbGwgIDxrYnJAY2hy b21pdW0ub3JnPgorCisgICAgICAgIFNjcmlwdCB3aGljaCBhZGp1c3RzIGluY2x1ZGUgcGF0aHMg aW4gQU5HTEUncyBjb3BpZWQgaGVhZGVycyBicmVha3MgaW5jcmVtZW50YWwgYnVpbGRzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTkyMTIKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWludGFpbiBhbmQg dGVzdCBhIHRpbWVzdGFtcCBpbiBhZGp1c3QtYW5nbGUtaW5jbHVkZS1wYXRocy5zaAorICAgICAg ICBpbiBvcmRlciB0byBhdm9pZCB0b3VjaGluZyB0aGUgaGVhZGVycyBkdXJpbmcgZWFjaCBidWls ZC4KKworCSogYWRqdXN0LWFuZ2xlLWluY2x1ZGUtcGF0aHMuc2g6CisKIDIwMTktMDYtMTggIEtl bm5ldGggUnVzc2VsbCAgPGtickBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQWRkIHByZWxpbWlu YXJ5IEFOR0xFIGJhY2tlbmQgdG8gV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvYWRqdXN0LWFuZ2xlLWluY2x1ZGUtcGF0aHMuc2ggYi9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9hZGp1c3QtYW5nbGUtaW5jbHVkZS1wYXRocy5zaAppbmRleCA0ZDUwZWYwZmMwOWM0 MmM0ZmE0YmUwMDAwODY1MzVhMzc1YWU4OTI4Li5kYzFkOTY1YmRjM2M2NzQwZDk2ODYwZjc3YTA4 YzA5MzA5MTg3NDRhIDEwMDc1NQotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9hZGp1c3Qt YW5nbGUtaW5jbHVkZS1wYXRocy5zaAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9hZGp1 c3QtYW5nbGUtaW5jbHVkZS1wYXRocy5zaApAQCAtMjgsNyArMjgsOCBAQCBlbHNlCiBmaQogCiBm b3IgaSBpbiAkb3V0cHV0X2Rpci8qLmggOyBkbwotICAgIHNlZCAtZSAnCisgICAgaWYgWyAhIC1m ICRvdXRwdXRfZGlyL2FuZ2xlLnRpbWVzdGFtcCBdIHx8IFsgJGkgLW50ICRvdXRwdXRfZGlyL2Fu Z2xlLnRpbWVzdGFtcCBdIDsgdGhlbgorICAgICAgICBzZWQgLWUgJwogcy9eI2luY2x1ZGUgPEVH TFwvXCguKlwpPi8jaW5jbHVkZSA8QU5HTEVcL1wxPi8KIHMvXiNpbmNsdWRlIDxHTEVTMlwvXCgu KlwpPi8jaW5jbHVkZSA8QU5HTEVcL1wxPi8KIHMvXiNpbmNsdWRlIDxHTEVTM1wvXCguKlwpPi8j aW5jbHVkZSA8QU5HTEVcL1wxPi8KQEAgLTM2LDQgKzM3LDggQEAgcy9eI2luY2x1ZGUgPEtIUlwv XCguKlwpPi8jaW5jbHVkZSA8QU5HTEVcL1wxPi8KIHMvXiNpbmNsdWRlIDxleHBvcnQuaD4vI2lu Y2x1ZGUgPEFOR0xFXC9leHBvcnQuaD4vCiBzL14jaW5jbHVkZSAiXChlZ2xleHRfYW5nbGVcfGds MmV4dF9hbmdsZVx8U2hhZGVyVmFyc1wpLmgiLyNpbmNsdWRlIDxBTkdMRVwvXDEuaD4vCiAnIC1p ICIiICRpCisgICAgICAgIGVjaG8gUG9zdHByb2Nlc3NlZCBBTkdMRSBoZWFkZXIgJGkKKyAgICBm aQogZG9uZQorCit0b3VjaCAkb3V0cHV0X2Rpci9hbmdsZS50aW1lc3RhbXAK