-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
EWS run on previous version of this PR (hash 23fed7c) |
There was a problem hiding this 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.
Tools/wpe/meson-wrapper
Outdated
@@ -0,0 +1,14 @@ | |||
#! /bin/sh |
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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
.
There was a problem hiding this comment.
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>)
Tools/wpe/meson-wrapper
Outdated
shift | ||
|
||
if [ "$reconfigure_mode" = flag ] || [ -r "$1/build.ninja" ] ; then | ||
set -- setup --reconfigure "$@" |
There was a problem hiding this comment.
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.
Tools/wpe/meson-wrapper
Outdated
if [ "$reconfigure_mode" = flag ] || [ -r "$1/build.ninja" ] ; then | ||
set -- setup --reconfigure "$@" | ||
else | ||
set -- setup "$@" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ditto.
23fed7c
to
0b43cc1
Compare
EWS run on current version of this PR (hash 0b43cc1) |
β¦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
0b43cc1
to
b653500
Compare
Committed 278747@main (b653500): https://commits.webkit.org/278747@main Reviewed commits have been landed. Closing PR #28470 and removing active labels. |
b653500
0b43cc1