openclaw/deskflow
1
0
Fork 0
Code Issues Pull Requests Actions 17 Packages Projects Releases Wiki Activity

build: Require libei and libportal from the system on linux

Browse Source 
Removing remaining meson parts
This commit is contained in:
sithlord48
2024-10-21 16:39:15 -04:00
committed by Chris Rizzitello
parent 2136af68b5
commit 7b7ff81a9f
22 changed files with 17 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
scripts/install_deps.py
View File

@ -20,7 +20,6 @@ import lib.env as env
import lib.cmd_utils as cmd_utils
import lib.qt_utils as qt_utils
import lib.github as github
import lib.meson as meson
path_env_var = "PATH"
cmake_prefix_env_var = "CMAKE_PREFIX_PATH"
@ -80,29 +79,6 @@ def parse_args(is_ci):
action="store_true",
help="Do not install system dependencies (apt, dnf, etc)",
)
parser.add_argument(
"--skip-meson", action="store_true", help="Do not setup and compile with Meson"
)
parser.add_argument(
"--subprojects",
action="store_true",
help="Install dependencies for Meson subprojects (use with --meson-no-system)",
)
parser.add_argument(
"--meson-install",
action="store_true",
help="Install built Meson subprojects to system",
)
parser.add_argument(
"--meson-no-system",
nargs="+",
help="Specify which Meson subprojects to use instead of system dependencies",
)
parser.add_argument(
"--meson-static",
nargs="+",
help="Specify which Meson subprojects to build as static libraries",
)
if env.is_windows():
parser.add_argument(
@ -177,30 +153,6 @@ def install(args):
vcpkg.install(args.ci_env)
if not args.skip_meson:
if args.subprojects:
for subproject in args.meson_no_system or []:
deps = SubprojectDependencies(subproject)
deps.install()
run_meson(args.meson_install, args.meson_no_system, args.meson_static)
# It's a bit weird to use Meson just for installing deps, but it's a stopgap until
# we fully switch from CMake to Meson. For the meantime, Meson will install the deps
# so that CMake can find them easily. Once we switch to Meson, it might be possible for
# Meson handle the deps resolution, so that we won't need to install them on the system.
def run_meson(install, no_system_list, static_list):
meson.setup(no_system_list, static_list)
# Only compile and install on Linux for now, since we're only using Meson to fetch
# the deps on Windows and macOS.
if env.is_linux():
meson.compile()
if install:
meson.install()
class Dependencies:
@ -318,38 +270,5 @@ class Dependencies:
linux.run_command(command, check=True)
subprojects = self.config.get_os_subprojects()
if subprojects:
for subproject in subprojects:
deps = SubprojectDependencies(subproject)
deps.install()
class SubprojectDependencies:
def __init__(self, subproject):
from lib.config import Config
self.subproject = subproject
self.config = Config()
def install(self):
"""Installs dependencies for the current platform."""
print(f"Installing dependencies for sub-project: {self.subproject}")
if env.is_linux():
self.linux()
else:
raise RuntimeError(f"Unsupported platform: {os}")
def linux(self):
"""Installs dependencies on Linux."""
import lib.linux as linux
command = self.config.get_subproject_deps_command(self.subproject)
linux.run_command(command, check=True)
if __name__ == "__main__":
main()

84
scripts/lib/meson.py
View File

@ -1,84 +0,0 @@
# Deskflow -- mouse and keyboard sharing utility
# Copyright (C) 2024 Symless Ltd.
#
# This package is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# found in the file LICENSE that should have accompanied this file.
#
# This package is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import os, sys
import lib.cmd_utils as cmd_utils
import lib.env as env
build_dir = "build/meson"
def meson_venv_bin():
if not env.in_venv():
raise RuntimeError("Not in a virtual environment")
return os.path.join(os.path.dirname(sys.executable), "meson")
def setup(no_system_list, static_list):
cmd = [meson_venv_bin(), "setup", build_dir]
for subproject in no_system_list or []:
cmd.append(f"-Dsystem-{subproject}=false")
# This might be a bit rude, but Meson seems to cache a lot (like CMake),
# so wiping every time is the easiest way to ensure that the build is clean.
# Plus, the way we're using Meson (at the moment) is just for satisfying
# dependencies, so this script is run infrequently enough to not matter.
if os.path.exists(build_dir):
cmd.append("--wipe")
cmd_utils.run(cmd, print_cmd=True)
for subproject in static_list or []:
static_subproject(subproject)
def static_subproject(subproject):
if subproject == "libportal":
# HACK: This is a bit horrible. Ideally, Meson would take care of applying this patch,
# but it only seems to copy the .diff over and not apply the patch.
#
# Important: Static linking is not intended for package maintainers, only for beta testers.
# Static linking is also pretty horrible, but many distros will be slow to pick up 0.8.x
# which has input capture support. The sooner we can remove this patching code the better.
cmd_utils.run(
[
"patch",
"-d",
"subprojects/libportal",
"-p1",
"-i",
"static-lib.diff",
],
print_cmd=True,
check=False,
)
else:
raise RuntimeError(f"Unknown subproject: {subproject}")
def compile():
cmd_utils.run([meson_venv_bin(), "compile", "-C", build_dir], print_cmd=True)
def install():
cmd = [meson_venv_bin(), "install", "-C", build_dir]
has_sudo = cmd_utils.has_command("sudo")
if has_sudo:
cmd.insert(0, "sudo")
cmd_utils.run(cmd, print_cmd=True)