Compare commits

...

2 Commits

Author SHA1 Message Date
41d90d5dcf [+] improve mode usage
1. update ninja command;
  2. add .whl for .20, .21 versions;
2025-08-04 10:06:40 +03:00
f87de4d9bf [+] improve meson:setup
1. allow to pass mode;
2025-08-04 09:53:31 +03:00
4 changed files with 21 additions and 7 deletions

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

@ -484,9 +484,13 @@ class CLI(abc.ABC):
project_name: str,
argv: Optional[list[str]] = None,
env: Optional[dict[str, str]] = None,
mode: Optional[Literal['meson', 'pyproject']] = None,
) -> None:
project = self.projects[project_name]
if mode is None:
mode = 'meson'
if argv is None:
argv = []
@ -499,7 +503,7 @@ class CLI(abc.ABC):
[
shutil_which('ninja', True),
'-C',
str(project.build_dir / 'meson'),
str(project.build_dir / mode),
*argv,
],
env=dict(list(os.environ.items())) | env,
@ -648,11 +652,15 @@ class CLI(abc.ABC):
force: bool,
argv: Optional[list[str]] = None,
env: Optional[dict[str, str]] = None,
mode: Optional[Literal['meson', 'pyproject']] = None,
# third_party_roots: Optional[list[pathlib.Path]] = None,
) -> None:
from . import cli_bootstrap
from .os import shutil_rmtree
if mode is None:
mode = 'meson'
project = self.projects[project_name]
if argv is None:
@ -668,9 +676,9 @@ class CLI(abc.ABC):
logger.info(dict(env=env))
if force:
if (project.build_dir / 'meson').exists():
logger.info(dict(action='removing build dir', path=project.build_dir / 'meson'))
shutil.rmtree(project.build_dir / 'meson')
if (project.build_dir / mode).exists():
logger.info(dict(action='removing build dir', path=project.build_dir / mode))
shutil.rmtree(project.build_dir / mode)
extra_args: list[str] = []
@ -692,8 +700,8 @@ class CLI(abc.ABC):
'mesonbuild.mesonmain',
'setup',
str(project.source_dir),
str(project.build_dir / 'meson'),
'-Dmodes=["meson"]',
str(project.build_dir / mode),
'-Dmodes=["{}"]'.format(mode),
*extra_args,
# '-Dpkgconfig.relocatable=true',
'-Dprefix=/',

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

Binary file not shown.

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

Binary file not shown.