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

Regression(278398@main): COG does not build for the first time with meson before 1.1.0 #28470

Conversation

pgorszkowski-igalia
Copy link
Contributor

@pgorszkowski-igalia pgorszkowski-igalia commented May 13, 2024

@pgorszkowski-igalia pgorszkowski-igalia self-assigned this May 13, 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 13, 2024
Copy link
Contributor

@dpino dpino left a comment

Choose a reason for hiding this comment

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

LGTM, after fixing nits.

@@ -0,0 +1,14 @@
#! /bin/sh
Copy link
Contributor

Choose a reason for hiding this comment

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

Better to use /usr/bin/env sh since not all Linux distros have sh located at /bin/sh (i.e: NixOS).

reconfigure_mode=$1
shift

if [ "$reconfigure_mode" = flag ] || [ -r "$1/build.ninja" ] ; then
Copy link
Contributor

Choose a reason for hiding this comment

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

I think in this statement variable $1 can be replaced for $reconfigure_mode.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

reconfigure_mode holds what was in $1, after 'shift' $1 has actually the second parameter which was passed to meson-wrapper (<BINARY_DIR>)

shift

if [ "$reconfigure_mode" = flag ] || [ -r "$1/build.ninja" ] ; then
set -- setup --reconfigure "$@"
Copy link
Contributor

Choose a reason for hiding this comment

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

I think there's a tab here. I think all other bash scripts use 4-space indentation.

if [ "$reconfigure_mode" = flag ] || [ -r "$1/build.ninja" ] ; then
set -- setup --reconfigure "$@"
else
set -- setup "$@"
Copy link
Contributor

Choose a reason for hiding this comment

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

Ditto.

@pgorszkowski-igalia pgorszkowski-igalia force-pushed the eng/Regression278398main-COG-does-not-build-for-the-first-time-with-meson-before-1-1-0 branch from 23fed7c to 0b43cc1 Compare May 13, 2024 13:08
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label May 13, 2024
@pgorszkowski-igalia pgorszkowski-igalia added merge-queue Applied to send a pull request to merge-queue and removed merging-blocked Applied to prevent a change from being merged labels May 14, 2024
…eson before 1.1.0

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

Reviewed by Adrian Perez de Castro.

With this change "--reconfigure" option is added to meson(COG) only if meson version is
greater than 1.1.0 or if build.ninja exists (which means that COG was previously configured).

* Tools/PlatformWPE.cmake:
* Tools/wpe/meson-wrapper: Added.

Canonical link: https://commits.webkit.org/278747@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/Regression278398main-COG-does-not-build-for-the-first-time-with-meson-before-1-1-0 branch from 0b43cc1 to b653500 Compare May 14, 2024 10:00
@webkit-commit-queue
Copy link
Collaborator

Committed 278747@main (b653500): https://commits.webkit.org/278747@main

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

@webkit-commit-queue webkit-commit-queue merged commit b653500 into WebKit:main May 14, 2024
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label May 14, 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
6 participants