Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WPE] COG configuration files are not regenerated when certain params are changed #28085

Conversation

@pgorszkowski-igalia pgorszkowski-igalia self-assigned this May 3, 2024
@pgorszkowski-igalia pgorszkowski-igalia added the New Bugs Unclassified bugs are placed in this component until the correct component can be determined. label May 3, 2024
@pgorszkowski-igalia
Copy link
Contributor Author

It does not cause rebuilding of the whole COG each time, only if any of the input parameters have changed.

@dpino
Copy link
Contributor

dpino commented May 3, 2024

This patch also fixes Cog compilation after running:

Tools/Script/clean-webkit --derived-sources-only

The option --derived-sources-only deletes all DerivedSources and ninja files in WebKitBuild, including WebKitBuild/WPE/Release/Tools/cog-prefix/src/cog-build/build.ninja. Since this file is not regenerated, currently Cog compilation fails after running the code above.

The EWS GTK and WPE build bots are now executing an additional step, clean-derived-sources, before the compile-webkit step:

https://ews-build.webkit.org/#/builders/5/builds/53417

In the case of WPE, we were forced to switch the EWS WPE Build workers to MiniBrowser because WebKitBuild/WPE/Release/Tools/cog-prefix/src/cog-build/build.ninja is not regenerated if it was removed.

@dpino
Copy link
Contributor

dpino commented May 6, 2024

LGTM, although I'm not a reviewer.

I think the most suitable person to review this patch is @aperezdc.

Copy link
Contributor

@aperezdc aperezdc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was under the impression that --reconfigure would always cause a rebuild, but I'm happy it doesn't (to do that one would need both --reconfigure --wipe).

LGTM!

@pgorszkowski-igalia pgorszkowski-igalia added the merge-queue Applied to send a pull request to merge-queue label May 6, 2024
… are changed

https://bugs.webkit.org/show_bug.cgi?id=273673

Reviewed by Adrian Perez de Castro.

It fixes problem with regeneration and rebuilding the COG when certain parameters are changed
(e.g.: ENABLE_WPE_1_1_API (ON/OFF))

* Tools/PlatformWPE.cmake:

Canonical link: https://commits.webkit.org/278398@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/WPE-COG-configuration-files-are-not-regenerated-when-certain-params-are-changed branch from 360d395 to cb597b1 Compare May 6, 2024 08:46
@webkit-commit-queue
Copy link
Collaborator

Committed 278398@main (cb597b1): https://commits.webkit.org/278398@main

Reviewed commits have been landed. Closing PR #28085 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit cb597b1 into WebKit:main May 6, 2024
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label May 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
New Bugs Unclassified bugs are placed in this component until the correct component can be determined.
Projects
None yet
5 participants