CLI Configuration

Behemyth · Behemyth · commit 6c3d8b37148a · 2026-02-12T12:26:34.000-08:00
diff --git a/cppython/console/entry.py b/cppython/console/entry.py
@@ -209,46 +209,61 @@ def publish(
 @app.command()
 def build(
     context: typer.Context,
+    configuration: Annotated[
+        str | None,
+        typer.Option(help='Named build configuration to use (e.g. CMake preset name, Meson build directory)'),
+    ] = None,
 ) -> None:
     """Build the project
 
     Assumes dependencies have been installed via `install`.
 
     Args:
         context: The CLI configuration object
+        configuration: Optional named configuration
     """
     project = get_enabled_project(context)
-    project.build()
+    project.build(configuration=configuration)
 
 
 @app.command()
 def test(
     context: typer.Context,
+    configuration: Annotated[
+        str | None,
+        typer.Option(help='Named build configuration to use (e.g. CMake preset name, Meson build directory)'),
+    ] = None,
 ) -> None:
     """Run project tests
 
     Assumes dependencies have been installed via `install`.
 
     Args:
         context: The CLI configuration object
+        configuration: Optional named configuration
     """
     project = get_enabled_project(context)
-    project.test()
+    project.test(configuration=configuration)
 
 
 @app.command()
 def bench(
     context: typer.Context,
+    configuration: Annotated[
+        str | None,
+        typer.Option(help='Named build configuration to use (e.g. CMake preset name, Meson build directory)'),
+    ] = None,
 ) -> None:
     """Run project benchmarks
 
     Assumes dependencies have been installed via `install`.
 
     Args:
         context: The CLI configuration object
+        configuration: Optional named configuration
     """
     project = get_enabled_project(context)
-    project.bench()
+    project.bench(configuration=configuration)
 
 
 @app.command()
@@ -258,6 +273,10 @@ def run(
         str,
         typer.Argument(help='The name of the build target/executable to run'),
     ],
+    configuration: Annotated[
+        str | None,
+        typer.Option(help='Named build configuration to use (e.g. CMake preset name, Meson build directory)'),
+    ] = None,
 ) -> None:
     """Run a built executable
 
@@ -266,6 +285,7 @@ def run(
     Args:
         context: The CLI configuration object
         target: The name of the build target to run
+        configuration: Optional named configuration
     """
     project = get_enabled_project(context)
-    project.run(target)
+    project.run(target, configuration=configuration)
diff --git a/cppython/core/plugin_schema/generator.py b/cppython/core/plugin_schema/generator.py
@@ -71,34 +71,41 @@ def features(directory: DirectoryPath) -> SupportedFeatures:
         raise NotImplementedError
 
     @abstractmethod
-    def build(self) -> None:
+    def build(self, configuration: str | None = None) -> None:
         """Builds the project using the generator's build system.
 
-        Executes the build step (e.g. cmake --build --preset).
+        Executes the build step. The interpretation of ``configuration`` is
+        generator-specific (e.g. CMake preset name, Meson build directory).
+
+        Args:
+            configuration: Optional named configuration override.
         """
         raise NotImplementedError
 
     @abstractmethod
-    def test(self) -> None:
+    def test(self, configuration: str | None = None) -> None:
         """Runs tests using the generator's build system.
 
-        Executes the test step (e.g. ctest --preset).
+        Args:
+            configuration: Optional named configuration override.
         """
         raise NotImplementedError
 
     @abstractmethod
-    def bench(self) -> None:
+    def bench(self, configuration: str | None = None) -> None:
         """Runs benchmarks using the generator's build system.
 
-        Executes benchmarks, typically via test presets with a label filter.
+        Args:
+            configuration: Optional named configuration override.
         """
         raise NotImplementedError
 
     @abstractmethod
-    def run(self, target: str) -> None:
+    def run(self, target: str, configuration: str | None = None) -> None:
         """Runs a built executable by target name.
 
         Args:
             target: The name of the build target/executable to run.
+            configuration: Optional named configuration override.
         """
         raise NotImplementedError
diff --git a/cppython/data.py b/cppython/data.py
@@ -104,22 +104,35 @@ async def download_provider_tools(self) -> None:
         self.logger.warning('Downloading the %s requirements to %s', self.plugins.provider.name(), path)
         await self.plugins.provider.download_tooling(path)
 
-    def build(self) -> None:
-        """Builds the project via the generator"""
-        self.plugins.generator.build()
+    def build(self, configuration: str | None = None) -> None:
+        """Builds the project via the generator
 
-    def test(self) -> None:
-        """Runs tests via the generator"""
-        self.plugins.generator.test()
+        Args:
+            configuration: Optional named configuration to use
+        """
+        self.plugins.generator.build(configuration=configuration)
+
+    def test(self, configuration: str | None = None) -> None:
+        """Runs tests via the generator
 
-    def bench(self) -> None:
-        """Runs benchmarks via the generator"""
-        self.plugins.generator.bench()
+        Args:
+            configuration: Optional named configuration to use
+        """
+        self.plugins.generator.test(configuration=configuration)
+
+    def bench(self, configuration: str | None = None) -> None:
+        """Runs benchmarks via the generator
+
+        Args:
+            configuration: Optional named configuration to use
+        """
+        self.plugins.generator.bench(configuration=configuration)
 
-    def run(self, target: str) -> None:
+    def run(self, target: str, configuration: str | None = None) -> None:
         """Runs a built executable via the generator
 
         Args:
             target: The name of the build target to run
+            configuration: Optional named configuration to use
         """
-        self.plugins.generator.run(target)
+        self.plugins.generator.run(target, configuration=configuration)
diff --git a/cppython/plugins/cmake/plugin.py b/cppython/plugins/cmake/plugin.py
@@ -108,25 +108,57 @@ def _ctest_command(self) -> str:
                 return str(ctest_exe)
         return 'ctest'
 
-    def build(self) -> None:
-        """Builds the project using cmake --build with the configured preset."""
-        release_preset = self.data.configuration_name + '-release'
-        cmd = [self._cmake_command(), '--build', '--preset', release_preset]
+    def _resolve_configuration(self, configuration: str | None) -> str:
+        """Resolves the effective CMake preset from CLI argument or default config.
+
+        Args:
+            configuration: The configuration value passed from the CLI, or None
+
+        Returns:
+            The resolved CMake preset name
+
+        Raises:
+            ValueError: If no configuration is available from either CLI or default-configuration config
+        """
+        effective = configuration or self.data.default_configuration
+        if effective is None:
+            raise ValueError(
+                'CMake generator requires a configuration. '
+                "Provide --configuration on the CLI or set 'default-configuration' in [tool.cppython.generators.cmake]."
+            )
+        return effective
+
+    def build(self, configuration: str | None = None) -> None:
+        """Builds the project using cmake --build with the resolved preset.
+
+        Args:
+            configuration: Optional CMake preset name. Overrides default-configuration from config.
+        """
+        preset = self._resolve_configuration(configuration)
+        cmd = [self._cmake_command(), '--build', '--preset', preset]
         subprocess.run(cmd, check=True, cwd=self.data.preset_file.parent)
 
-    def test(self) -> None:
-        """Runs tests using ctest with the configured preset."""
-        release_preset = self.data.configuration_name + '-release'
-        cmd = [self._ctest_command(), '--preset', release_preset]
+    def test(self, configuration: str | None = None) -> None:
+        """Runs tests using ctest with the resolved preset.
+
+        Args:
+            configuration: Optional CMake preset name. Overrides default-configuration from config.
+        """
+        preset = self._resolve_configuration(configuration)
+        cmd = [self._ctest_command(), '--preset', preset]
         subprocess.run(cmd, check=True, cwd=self.data.preset_file.parent)
 
-    def bench(self) -> None:
-        """Runs benchmarks using ctest with the configured benchmark preset."""
-        bench_preset = self.data.configuration_name + '-bench-release'
-        cmd = [self._ctest_command(), '--preset', bench_preset]
+    def bench(self, configuration: str | None = None) -> None:
+        """Runs benchmarks using ctest with the resolved preset.
+
+        Args:
+            configuration: Optional CMake preset name. Overrides default-configuration from config.
+        """
+        preset = self._resolve_configuration(configuration)
+        cmd = [self._ctest_command(), '--preset', preset]
         subprocess.run(cmd, check=True, cwd=self.data.preset_file.parent)
 
-    def run(self, target: str) -> None:
+    def run(self, target: str, configuration: str | None = None) -> None:
         """Runs a built executable by target name.
 
         Searches the build directory for the executable matching the target name.
diff --git a/cppython/plugins/cmake/resolution.py b/cppython/plugins/cmake/resolution.py
@@ -77,5 +77,8 @@ def resolve_cmake_data(data: dict[str, Any], core_data: CorePluginData) -> CMake
     cmake_binary = _resolve_cmake_binary(parsed_data.cmake_binary)
 
     return CMakeData(
-        preset_file=modified_preset_file, configuration_name=parsed_data.configuration_name, cmake_binary=cmake_binary
+        preset_file=modified_preset_file,
+        configuration_name=parsed_data.configuration_name,
+        cmake_binary=cmake_binary,
+        default_configuration=parsed_data.default_configuration,
     )
diff --git a/cppython/plugins/cmake/schema.py b/cppython/plugins/cmake/schema.py
@@ -140,6 +140,7 @@ class CMakeData(CPPythonModel):
     preset_file: Path
     configuration_name: str
     cmake_binary: Path | None
+    default_configuration: str | None = None
 
 
 class CMakeConfiguration(CPPythonModel):
@@ -167,3 +168,12 @@ class CMakeConfiguration(CPPythonModel):
             'Can be overridden via CMAKE_BINARY environment variable.'
         ),
     ] = None
+    default_configuration: Annotated[
+        str | None,
+        Field(
+            alias='default-configuration',
+            description='Default CMake preset name to use for build/test/bench commands. '
+            'When set, the --configuration CLI option is no longer required. '
+            'The CLI --configuration value takes precedence over this default.',
+        ),
+    ] = None
diff --git a/cppython/plugins/meson/plugin.py b/cppython/plugins/meson/plugin.py
@@ -127,34 +127,63 @@ def _ensure_setup(self) -> None:
 
         subprocess.run(cmd, check=True, cwd=source_dir)
 
-    def build(self) -> None:
-        """Builds the project using meson compile."""
+    def _effective_build_dir(self, configuration: str | None) -> Path:
+        """Returns the build directory, optionally overridden by a configuration name.
+
+        Args:
+            configuration: If provided, used as the build directory name instead of the
+                configured ``build_directory``.
+
+        Returns:
+            The absolute path to the build directory
+        """
+        directory = configuration if configuration else self.data.build_directory
+        return self.data.build_file.parent / directory
+
+    def build(self, configuration: str | None = None) -> None:
+        """Builds the project using meson compile.
+
+        Args:
+            configuration: Optional build directory name override.
+        """
         self._ensure_setup()
-        cmd = [self._meson_command(), 'compile', '-C', str(self._build_dir())]
+        build_dir = self._effective_build_dir(configuration)
+        cmd = [self._meson_command(), 'compile', '-C', str(build_dir)]
         subprocess.run(cmd, check=True, cwd=self.data.build_file.parent)
 
-    def test(self) -> None:
-        """Runs tests using meson test."""
-        cmd = [self._meson_command(), 'test', '-C', str(self._build_dir())]
+    def test(self, configuration: str | None = None) -> None:
+        """Runs tests using meson test.
+
+        Args:
+            configuration: Optional build directory name override.
+        """
+        build_dir = self._effective_build_dir(configuration)
+        cmd = [self._meson_command(), 'test', '-C', str(build_dir)]
         subprocess.run(cmd, check=True, cwd=self.data.build_file.parent)
 
-    def bench(self) -> None:
-        """Runs benchmarks using meson test --benchmark."""
-        cmd = [self._meson_command(), 'test', '--benchmark', '-C', str(self._build_dir())]
+    def bench(self, configuration: str | None = None) -> None:
+        """Runs benchmarks using meson test --benchmark.
+
+        Args:
+            configuration: Optional build directory name override.
+        """
+        build_dir = self._effective_build_dir(configuration)
+        cmd = [self._meson_command(), 'test', '--benchmark', '-C', str(build_dir)]
         subprocess.run(cmd, check=True, cwd=self.data.build_file.parent)
 
-    def run(self, target: str) -> None:
+    def run(self, target: str, configuration: str | None = None) -> None:
         """Runs a built executable by target name.
 
         Searches the build directory for the executable matching the target name.
 
         Args:
             target: The name of the build target/executable to run
+            configuration: Optional build directory name override.
 
         Raises:
             FileNotFoundError: If the target executable cannot be found
         """
-        build_dir = self._build_dir()
+        build_dir = self._effective_build_dir(configuration)
 
         # Search for the executable in the build directory
         candidates = list(build_dir.rglob(target)) + list(build_dir.rglob(f'{target}.exe'))
diff --git a/cppython/project.py b/cppython/project.py
diff --git a/cppython/schema.py b/cppython/schema.py
diff --git a/cppython/test/mock/generator.py b/cppython/test/mock/generator.py

Original file line number	Diff line number	Diff line change
`@@ -77,5 +77,8 @@ def resolve_cmake_data(data: dict[str, Any], core_data: CorePluginData) -> CMake`
`77`	`77`	`cmake_binary = _resolve_cmake_binary(parsed_data.cmake_binary)`
`78`	`78`
`79`	`79`	`return CMakeData(`
`80`		`- preset_file=modified_preset_file, configuration_name=parsed_data.configuration_name, cmake_binary=cmake_binary`
	`80`	`+ preset_file=modified_preset_file,`
	`81`	`+ configuration_name=parsed_data.configuration_name,`
	`82`	`+ cmake_binary=cmake_binary,`
	`83`	`+ default_configuration=parsed_data.default_configuration,`
`81`	`84`	`)`