Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 23deb26c39372d21db46026a123405a285816750
https://github.com/WebKit/WebKit/commit/23deb26c39372d21db46026a123405a285816750
Author: Carlos Alberto Lopez Perez <[email protected]>
Date: 2026-03-19 (Thu, 19 Mar 2026)
Changed paths:
M Tools/Scripts/clean-webkit
M Tools/Scripts/run-gtk-tests
M Tools/Scripts/run-wpe-tests
M Tools/Scripts/update-webkitgtk-libs
M Tools/Scripts/update-webkitwpe-libs
M Tools/Scripts/webkitdirs.pm
M Tools/Scripts/webkitpy/port/base.py
M Tools/Scripts/webkitpy/port/base_unittest.py
M Tools/Scripts/webkitpy/port/linux_container_sdk_utils.py
M Tools/Scripts/webkitpy/port/port_testcase.py
M Tools/Scripts/webkitpy/w3c/wpt_runner.py
M Tools/flatpak/flatpakutils.py
M Tools/glib/api_test_runner.py
M Tools/jhbuild/jhbuildutils.py
Log Message:
-----------
[WPE][GTK] Ensure that jhbuild or flatpak is only used if set explicitly via
WEBKIT_JHBUILD=1 or WEBKIT_FLATPAK=1
https://bugs.webkit.org/show_bug.cgi?id=310187
Reviewed by Philippe Normand.
The current status of some scripts like the ones for updating the third-party
libs,
were to default to using flatpak unless this was executed inside wkdev-sdk.
That is wrong, it will confuse new users.
This patch changes the logic so the tools behave like this:
- if WEBKIT_JHBUILD=1 in environment then try to use jhbuild
- if WEBKIT_FLATPAK=1 in environment then try to use flatpak
- if WEBKIT_CONTAINER_SDK is not in the environment, then print a warning
telling to download and use wkdev-sdk.
Using jhbuild or flatpak is something opt-in for advanced use cases, is not
something that should be used by default.
The checks on the environment variable WEBKIT_BUILD_USE_SYSTEM_LIBRARIES are
also removed, because wkdev-sdk now defines WEBKIT_CONTAINER_SDK=1 which is
more appropiate.
I intend to send another patch to wkdev-sdk to stop setting in the environment
WEBKIT_BUILD_USE_SYSTEM_LIBRARIES=1 after this lands.
* Tools/Scripts/clean-webkit:
(removeDerivedSources):
(getKeepDirs):
(main):
(usesFlatpak): Deleted.
* Tools/Scripts/run-gtk-tests:
* Tools/Scripts/run-wpe-tests:
* Tools/Scripts/update-webkitgtk-libs:
* Tools/Scripts/update-webkitwpe-libs:
* Tools/Scripts/webkitdirs.pm:
(maybeUseContainerSDKRootDir):
(wrapperPrefixIfNeeded):
(shouldUseFlatpak):
(shouldRemoveCMakeCache):
(updateGtkOrWpeLibs):
* Tools/Scripts/webkitpy/port/base.py:
(Port._should_use_jhbuild):
* Tools/Scripts/webkitpy/port/base_unittest.py:
(PortTest.test_jhbuild_wrapper):
* Tools/Scripts/webkitpy/port/linux_container_sdk_utils.py:
(maybe_use_container_sdk_root_dir):
* Tools/Scripts/webkitpy/port/port_testcase.py:
(PortTestCase.test_diff_image):
* Tools/Scripts/webkitpy/w3c/wpt_runner.py:
(main):
* Tools/flatpak/flatpakutils.py:
(should_use_flatpak):
(run_in_sandbox_if_available):
* Tools/glib/api_test_runner.py:
(check_environment):
* Tools/jhbuild/jhbuildutils.py:
(should_use_jhbuild):
(enter_jhbuild_environment_if_available):
Canonical link: https://commits.webkit.org/309557@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
