[+] improve meson wrapper

1. provide properly custom pkg_config_path
    folders for meson;
  1.1. check that pyproject mode
    correctly discovers library built
    and installed by meson mode;
This commit is contained in:
Siarhei Siniak 2025-08-05 16:56:52 +03:00
parent 41d90d5dcf
commit 9d2d48f6ed
4 changed files with 27 additions and 10 deletions

@ -5,7 +5,7 @@ project(
).stdout().strip('\n'),
# 'online.fxreader.uv',
# ['c', 'cpp'],
version: '0.1.5.21',
version: '0.1.5.23',
# default_options: [
# 'cpp_std=c++23',
# # 'prefer_static=true',

@ -281,17 +281,27 @@ class CLI(abc.ABC):
]
)
@property
# @property
def pkg_config_path(
self,
) -> set[pathlib.Path]:
return {
pathlib.Path(o)
for o in glob.glob(
str(self.dist_settings.env_path / 'lib' / 'python*' / '**' / 'pkgconfig'),
recursive=True,
)
}
project: Optional[str] = None,
) -> list[pathlib.Path]:
res: list[pathlib.Path] = []
if project:
res.append(self.projects[project].dest_dir / 'lib' / 'pkgconfig')
res.extend(
[
pathlib.Path(o)
for o in glob.glob(
str(self.dist_settings.env_path / 'lib' / 'python*' / '**' / 'pkgconfig'),
recursive=True,
)
]
)
return res
def deploy_wheel(
self,
@ -701,6 +711,7 @@ class CLI(abc.ABC):
'setup',
str(project.source_dir),
str(project.build_dir / mode),
'--pkg-config-path={}'.format(json.dumps([str(o) for o in self.pkg_config_path(project_name)])),
'-Dmodes=["{}"]'.format(mode),
*extra_args,
# '-Dpkgconfig.relocatable=true',

BIN
releases/whl/online_fxreader_pr34-0.1.5.22-py3-none-any.whl (Stored with Git LFS) Normal file

Binary file not shown.

BIN
releases/whl/online_fxreader_pr34-0.1.5.23-py3-none-any.whl (Stored with Git LFS) Normal file

Binary file not shown.