Bug 199212 – Script which adjusts include paths in ANGLE's copied headers breaks incremental builds

• Status: RESOLVED
• Resolution: FIXED
• Component: ANGLE

[Kenneth Russell]

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.

[Kenneth Russell]

Created attachment 372886 [details]
Patch

[EWS Watchlist]

Note that there are important steps to take when updating ANGLE. See http://trac.webkit.org/wiki/UpdatingANGLE

[Kenneth Russell]

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.

[Darin Adler]

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.

[Dean Jackson]

Committed r246825: <https://trac.webkit.org/changeset/246825>

[Ryan Haddad]

Reverted r246825 for reason:

Breaks internal builds.

Committed r246832: <https://trac.webkit.org/changeset/246832>

[Ryan Haddad]

(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.

[Kenneth Russell]

(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.

[Dean Jackson]

\<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.

[Dean Jackson]

Ken, I'll make the edit and re-land. Don't worry about submitting a new patch.

[Dean Jackson]

Landed again in r246842

[Kenneth Russell]

Thank you Dean for fixing up this patch and relanding it!

[Radar WebKit Bug Importer]

<rdar://problem/52218406>