Fix meson.build after moving source

Author: hongquan

.github/workflows/build.yml

@@ -59,6 +59,7 @@ jobs:
       - name: Build (Python ${{ matrix.python }})
         run: |
           set -x
-          uv build -C build-dir=_build
+          uv build
+          uv sync --no-editable
           cd _build
           uv run --no-editable --group docs -m sphinx -b html -W -v ../docs html

docs/conf.py

@@ -12,6 +12,8 @@
 # serve to show the default.
 
 import sys, os
+print(sys.path)
+import systemd
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

meson.build

@@ -32,7 +32,7 @@ common_c_args = [
         '-DLIBSYSTEMD_VERSION=' + libsystemd_dep.version(),
 ]
 
-subdir('src/systemd')
+subdir('src')
 
 run_target(
         'update-constants',

pyproject.toml

@@ -39,11 +39,24 @@ Documentation = "https://www.freedesktop.org/software/systemd/python-systemd/"
 [dependency-groups]
 test = ["pytest", "pytest-cov"]
 docs = ["sphinx"]
+build = [
+    "meson>=1.8.2",
+]
 
 [build-system]
 requires = ["meson-python", "ninja", "meson"]
 build-backend = "mesonpy"
 
+[tool.uv]
+package = true
+
+[tool.uv.config-settings]
+build-dir = "_build"
+
+[tool.uv.build-backend]
+module-name = "systemd"
+module-root = "src"
+
 [tool.coverage.run]
 source = ["systemd"]
 omit = ["systemd/test/*"]

src/meson.build

@@ -0,0 +1 @@
+subdir('systemd')

src/systemd/meson.build

@@ -5,6 +5,7 @@ python.extension_module(
         dependencies: [libsystemd_dep],
         c_args: common_c_args,
         install: true,
+        subdir: 'systemd',
 )
 
 # Build _reader extension module
@@ -14,6 +15,7 @@ python.extension_module(
         dependencies: [libsystemd_dep],
         c_args: common_c_args,
         install: true,
+        subdir: 'systemd',
 )
 
 # Build _daemon extension module
@@ -23,6 +25,7 @@ python.extension_module(
         dependencies: [libsystemd_dep],
         c_args: common_c_args,
         install: true,
+        subdir: 'systemd',
 )
 
 # Build id128 extension module
@@ -32,6 +35,7 @@ python.extension_module(
         dependencies: [libsystemd_dep],
         c_args: common_c_args,
         install: true,
+        subdir: 'systemd',
 )
 
 # Build login extension module
@@ -41,20 +45,17 @@ python.extension_module(
         dependencies: [libsystemd_dep],
         c_args: common_c_args,
         install: true,
+        subdir: 'systemd',
 )
 
 # Install Python modules (matching py_modules in setup.py)
-python.install_sources(
-        '__init__.py',
-        'journal.py',
-        'daemon.py',
-)
+python.install_sources('__init__.py', 'journal.py', 'daemon.py', subdir: 'systemd')
 
 # Install test modules
 python.install_sources(
         'test/test_daemon.py',
         'test/test_journal.py',
         'test/test_login.py',
         'test/test_id128.py',
-        subdir: 'test',
+        subdir: 'systemd/test',
 )

update-constants.py

@@ -1,3 +1,5 @@
+#/usr/bin/env python3
+
 """
 Read definitions from /usr/include/systemd/sd-messages.h and systemd/id128-defines.h files, convert to ones in systemd/id128-constants.h
 """