python/meson.build

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

python/online/fxreader/pr34/commands_typed/cli.py

@@ -484,13 +484,9 @@ 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 = []
 
@@ -503,7 +499,7 @@ class CLI(abc.ABC):
 			[
 				shutil_which('ninja', True),
 				'-C',
-				str(project.build_dir / mode),
+				str(project.build_dir / 'meson'),
 				*argv,
 			],
 			env=dict(list(os.environ.items())) | env,
@@ -652,15 +648,11 @@ 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:
@@ -676,9 +668,9 @@ class CLI(abc.ABC):
 		logger.info(dict(env=env))
 
 		if force:
-			if (project.build_dir / mode).exists():
-				logger.info(dict(action='removing build dir', path=project.build_dir / mode))
-				shutil.rmtree(project.build_dir / mode)
+			if (project.build_dir / 'meson').exists():
+				logger.info(dict(action='removing build dir', path=project.build_dir / 'meson'))
+				shutil.rmtree(project.build_dir / 'meson')
 
 		extra_args: list[str] = []
 
@@ -700,8 +692,8 @@ class CLI(abc.ABC):
 			'mesonbuild.mesonmain',
 			'setup',
 			str(project.source_dir),
-			str(project.build_dir / mode),
-			'-Dmodes=["{}"]'.format(mode),
+			str(project.build_dir / 'meson'),
+			'-Dmodes=["meson"]',
 			*extra_args,
 			# '-Dpkgconfig.relocatable=true',
 			'-Dprefix=/',