hatch-cpp 0.1.6__py3-none-any.whl → 0.1.7__py3-none-any.whl

hatch_cpp/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.1.6"
+__version__ = "0.1.7"
 
 from .hooks import hatch_register_build_hook
 from .plugin import HatchCppBuildHook

hatch_cpp/plugin.py

@@ -1,10 +1,11 @@
 from __future__ import annotations
 
-import logging
-import os
-import platform as sysplatform
-import sys
-import typing as t
+from logging import getLogger
+from os import getenv
+from pathlib import Path
+from platform import machine as platform_machine
+from sys import platform as sys_platform, version_info
+from typing import Any
 
 from hatchling.builders.hooks.plugin.interface import BuildHookInterface
 
@@ -18,13 +19,14 @@ class HatchCppBuildHook(BuildHookInterface[HatchCppBuildConfig]):
     """The hatch-cpp build hook."""
 
     PLUGIN_NAME = "hatch-cpp"
-    _logger = logging.getLogger(__name__)
+    _logger = getLogger(__name__)
 
-    def initialize(self, version: str, build_data: dict[str, t.Any]) -> None:
+    def initialize(self, version: str, build_data: dict[str, Any]) -> None:
         """Initialize the plugin."""
         # Log some basic information
+        project_name = self.metadata.config["project"]["name"]
         self._logger.info("Initializing hatch-cpp plugin version %s", version)
-        self._logger.info("Running hatch-cpp")
+        self._logger.info(f"Running hatch-cpp: {project_name}")
 
         # Only run if creating wheel
         # TODO: Add support for specify sdist-plan
@@ -34,7 +36,7 @@ class HatchCppBuildHook(BuildHookInterface[HatchCppBuildConfig]):
 
         # Skip if SKIP_HATCH_CPP is set
         # TODO: Support CLI once https://github.com/pypa/hatch/pull/1743
-        if os.getenv("SKIP_HATCH_CPP"):
+        if getenv("SKIP_HATCH_CPP"):
             self._logger.info("Skipping the build hook since SKIP_HATCH_CPP was set")
             return
 
@@ -42,17 +44,13 @@ class HatchCppBuildHook(BuildHookInterface[HatchCppBuildConfig]):
         build_config_class = import_string(self.config["build-config-class"]) if "build-config-class" in self.config else HatchCppBuildConfig
 
         # Instantiate build config
-        config = build_config_class(**self.config)
-
-        # Grab libraries and platform
-        libraries = config.libraries
-        platform = config.platform
+        config = build_config_class(name=project_name, **self.config)
 
         # Get build plan class or use default
         build_plan_class = import_string(self.config["build-plan-class"]) if "build-plan-class" in self.config else HatchCppBuildPlan
 
         # Instantiate builder
-        build_plan = build_plan_class(libraries=libraries, platform=platform)
+        build_plan = build_plan_class(**config.model_dump())
 
         # Generate commands
         build_plan.generate()
@@ -68,24 +66,48 @@ class HatchCppBuildHook(BuildHookInterface[HatchCppBuildConfig]):
         # Perform any cleanup actions
         build_plan.cleanup()
 
-        # force include libraries
-        for library in libraries:
-            name = library.get_qualified_name(build_plan.platform.platform)
-            build_data["force_include"][name] = name
+        if build_plan.libraries:
+            # force include libraries
+            for library in build_plan.libraries:
+                name = library.get_qualified_name(build_plan.platform.platform)
+                build_data["force_include"][name] = name
 
-        if libraries:
             build_data["pure_python"] = False
-            machine = sysplatform.machine()
-            version_major = sys.version_info.major
-            version_minor = sys.version_info.minor
-            # TODO abi3
-            if "darwin" in sys.platform:
+            machine = platform_machine()
+            version_major = version_info.major
+            version_minor = version_info.minor
+            if "darwin" in sys_platform:
                 os_name = "macosx_11_0"
-            elif "linux" in sys.platform:
+            elif "linux" in sys_platform:
                 os_name = "linux"
             else:
                 os_name = "win"
-            if all([lib.py_limited_api for lib in libraries]):
+            if all([lib.py_limited_api for lib in build_plan.libraries]):
                 build_data["tag"] = f"cp{version_major}{version_minor}-abi3-{os_name}_{machine}"
             else:
                 build_data["tag"] = f"cp{version_major}{version_minor}-cp{version_major}{version_minor}-{os_name}_{machine}"
+        else:
+            build_data["pure_python"] = False
+            machine = platform_machine()
+            version_major = version_info.major
+            version_minor = version_info.minor
+            # TODO abi3
+            if "darwin" in sys_platform:
+                os_name = "macosx_11_0"
+            elif "linux" in sys_platform:
+                os_name = "linux"
+            else:
+                os_name = "win"
+            build_data["tag"] = f"cp{version_major}{version_minor}-cp{version_major}{version_minor}-{os_name}_{machine}"
+
+            # force include libraries
+            for path in Path(".").rglob("*"):
+                if path.is_dir():
+                    continue
+                if str(path).startswith(str(build_plan.cmake.build)) or str(path).startswith("dist"):
+                    continue
+                if path.suffix in (".pyd", ".dll", ".so", ".dylib"):
+                    build_data["force_include"][str(path)] = str(path)
+
+        for path in build_data["force_include"]:
+            self._logger.warning(f"Force include: {path}")

hatch_cpp/structs.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
-from os import environ, system
+from os import environ, system as system_call
 from pathlib import Path
 from re import match
 from shutil import which
-from sys import executable, platform as sys_platform
+from sys import executable, platform as sys_platform, version_info
 from sysconfig import get_path
-from typing import Any, List, Literal, Optional
+from typing import Any, Dict, List, Literal, Optional
 
 from pydantic import AliasChoices, BaseModel, Field, field_validator, model_validator
 
@@ -20,7 +20,7 @@ __all__ = (
 BuildType = Literal["debug", "release"]
 CompilerToolchain = Literal["gcc", "clang", "msvc"]
 Language = Literal["c", "c++"]
-Binding = Literal["cpython", "pybind11", "nanobind"]
+Binding = Literal["cpython", "pybind11", "nanobind", "generic"]
 Platform = Literal["linux", "darwin", "win32"]
 PlatformDefaults = {
     "linux": {"CC": "gcc", "CXX": "g++", "LD": "ld"},
@@ -65,9 +65,9 @@ class HatchCppLibrary(BaseModel, validate_assignment=True):
 
     def get_qualified_name(self, platform):
         if platform == "win32":
-            suffix = "dll" if self.binding == "none" else "pyd"
+            suffix = "dll" if self.binding == "generic" else "pyd"
         elif platform == "darwin":
-            suffix = "dylib" if self.binding == "none" else "so"
+            suffix = "dylib" if self.binding == "generic" else "so"
         else:
             suffix = "so"
         if self.py_limited_api and platform != "win32":
@@ -78,6 +78,8 @@ class HatchCppLibrary(BaseModel, validate_assignment=True):
     def check_binding_and_py_limited_api(self):
         if self.binding == "pybind11" and self.py_limited_api:
             raise ValueError("pybind11 does not support Py_LIMITED_API")
+        if self.binding == "generic" and self.py_limited_api:
+            raise ValueError("Generic binding can not support Py_LIMITED_API")
         return self
 
 
@@ -119,7 +121,8 @@ class HatchCppPlatform(BaseModel):
         flags = ""
 
         # Python.h
-        library.include_dirs.append(get_path("include"))
+        if library.binding != "generic":
+            library.include_dirs.append(get_path("include"))
 
         if library.binding == "pybind11":
             import pybind11
@@ -217,36 +220,100 @@ class HatchCppPlatform(BaseModel):
         return flags
 
 
-class HatchCppBuildPlan(BaseModel):
-    build_type: BuildType = "release"
+class HatchCppCmakeConfiguration(BaseModel):
+    root: Path
+    build: Path = Field(default_factory=lambda: Path("build"))
+    install: Optional[Path] = Field(default=None)
+
+    cmake_arg_prefix: Optional[str] = Field(default=None)
+    cmake_args: Dict[str, str] = Field(default_factory=dict)
+    cmake_env_args: Dict[Platform, Dict[str, str]] = Field(default_factory=dict)
+
+    include_flags: Optional[Dict[str, Any]] = Field(default=None)
+
+
+class HatchCppBuildConfig(BaseModel):
+    """Build config values for Hatch C++ Builder."""
+
+    verbose: Optional[bool] = Field(default=False)
+    name: Optional[str] = Field(default=None)
     libraries: List[HatchCppLibrary] = Field(default_factory=list)
-    platform: HatchCppPlatform = Field(default_factory=HatchCppPlatform.default)
+    cmake: Optional[HatchCppCmakeConfiguration] = Field(default=None)
+    platform: Optional[HatchCppPlatform] = Field(default_factory=HatchCppPlatform.default)
+
+    @model_validator(mode="after")
+    def check_toolchain_matches_args(self):
+        if self.cmake and self.libraries:
+            raise ValueError("Must not provide libraries when using cmake toolchain.")
+        return self
+
+
+class HatchCppBuildPlan(HatchCppBuildConfig):
+    build_type: BuildType = "release"
     commands: List[str] = Field(default_factory=list)
 
     def generate(self):
         self.commands = []
-        for library in self.libraries:
-            compile_flags = self.platform.get_compile_flags(library, self.build_type)
-            link_flags = self.platform.get_link_flags(library, self.build_type)
-            self.commands.append(
-                f"{self.platform.cc if library.language == 'c' else self.platform.cxx} {' '.join(library.sources)} {compile_flags} {link_flags}"
-            )
+        if self.libraries:
+            for library in self.libraries:
+                compile_flags = self.platform.get_compile_flags(library, self.build_type)
+                link_flags = self.platform.get_link_flags(library, self.build_type)
+                self.commands.append(
+                    f"{self.platform.cc if library.language == 'c' else self.platform.cxx} {' '.join(library.sources)} {compile_flags} {link_flags}"
+                )
+        elif self.cmake:
+            # Derive prefix
+            if self.cmake.cmake_arg_prefix is None:
+                self.cmake.cmake_arg_prefix = f"{self.name.replace('.', '_').replace('-', '_').upper()}_"
+
+            # Append base command
+            self.commands.append(f"cmake {Path(self.cmake.root).parent} -DCMAKE_BUILD_TYPE={self.build_type} -B {self.cmake.build}")
+
+            # Setup install path
+            if self.cmake.install:
+                self.commands[-1] += f" -DCMAKE_INSTALL_PREFIX={self.cmake.install}"
+            else:
+                self.commands[-1] += f" -DCMAKE_INSTALL_PREFIX={Path(self.cmake.root).parent}"
+
+            # TODO: CMAKE_CXX_COMPILER
+            if self.platform.platform == "win32":
+                # TODO: prefix?
+                self.commands[-1] += f' -G "{environ.get("GENERATOR", "Visual Studio 17 2022")}"'
+
+            # Put in CMake flags
+            args = self.cmake.cmake_args.copy()
+            for platform, env_args in self.cmake.cmake_env_args.items():
+                if platform == self.platform.platform:
+                    for key, value in env_args.items():
+                        args[key] = value
+            for key, value in args.items():
+                self.commands[-1] += f" -D{self.cmake.cmake_arg_prefix}{key.upper()}={value}"
+
+            # Include customs
+            if self.cmake.include_flags:
+                if self.cmake.include_flags.get("python_version", False):
+                    self.commands[-1] += f" -D{self.cmake.cmake_arg_prefix}PYTHON_VERSION={version_info.major}.{version_info.minor}"
+                if self.cmake.include_flags.get("manylinux", False) and self.platform.platform == "linux":
+                    self.commands[-1] += f" -D{self.cmake.cmake_arg_prefix}MANYLINUX=ON"
+
+            # Include mac deployment target
+            if self.platform.platform == "darwin":
+                self.commands[-1] += f" -DCMAKE_OSX_DEPLOYMENT_TARGET={environ.get('OSX_DEPLOYMENT_TARGET', '11')}"
+
+            # Append build command
+            self.commands.append(f"cmake --build {self.cmake.build} --config {self.build_type}")
+
+            # Append install command
+            self.commands.append(f"cmake --install {self.cmake.build} --config {self.build_type}")
+
         return self.commands
 
     def execute(self):
         for command in self.commands:
-            system(command)
+            system_call(command)
         return self.commands
 
     def cleanup(self):
         if self.platform.platform == "win32":
             for temp_obj in Path(".").glob("*.obj"):
                 temp_obj.unlink()
-
-
-class HatchCppBuildConfig(BaseModel):
-    """Build config values for Hatch C++ Builder."""
-
-    verbose: Optional[bool] = Field(default=False)
-    libraries: List[HatchCppLibrary] = Field(default_factory=list)
-    platform: Optional[HatchCppPlatform] = Field(default_factory=HatchCppPlatform.default)

hatch_cpp/tests/test_project_cmake/CMakeLists.txt

@@ -0,0 +1,92 @@
+cmake_minimum_required(VERSION 3.20.0)
+project(hatch-cpp-test-project-basic VERSION "0.1.0")
+set(CMAKE_CXX_STANDARD 20)
+include(CheckCCompilerFlag)
+include(CheckLinkerFlag)
+
+if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+    set(WIN32 ON)
+    set(MACOS OFF)
+    set(LINUX OFF)
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    set(WIN32 OFF)
+    set(MACOS ON)
+    set(LINUX OFF)
+else()
+    set(WIN32 OFF)
+    set(MACOS OFF)
+    set(LINUX ON)
+endif()
+
+option(CMAKE_BUILD_TYPE "Release/Debug build" RELEASE)
+option(HATCH_CPP_TEST_PROJECT_BASIC_BUILD_TESTS "Build tests" OFF)
+option(HATCH_CPP_TEST_PROJECT_BASIC_MANYLINUX "Build for python's manylinux setup" OFF)
+
+string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
+
+set(BUILD_SHARED_LIBS TRUE)
+set(CMAKE_MACOSX_RPATH TRUE)
+set(CMAKE_SKIP_RPATH FALSE)
+set(CMAKE_SKIP_BUILD_RPATH FALSE)
+set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+set(CMAKE_INSTALL_NAME_DIR "@rpath")
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+string(REGEX REPLACE "[ ]*-O[^ ]+[ ]*" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+string(REGEX REPLACE "[ ]*-Wl,-O2 -Wl,[^ ]+[ ]*" " " CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
+string(REGEX REPLACE "[ ]*-Wl,-O2 -Wl,[^ ]+[ ]*" " " CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
+
+
+if(MACOS)
+    set(CMAKE_THREAD_LIBS_INIT "-lpthread")
+    set(CMAKE_HAVE_THREADS_LIBRARY 1)
+    set(CMAKE_USE_WIN32_THREADS_INIT 0)
+    set(CMAKE_USE_PTHREADS_INIT 1)
+    set(THREADS_PREFER_PTHREAD_FLAG ON)
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup")
+endif()
+
+
+if(MACOS)
+    set(CMAKE_INSTALL_RPATH "@loader_path/")
+elseif(LINUX)
+    set(CMAKE_INSTALL_RPATH "\$ORIGIN")
+endif()
+
+if(WIN32)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /MP /bigobj")
+    foreach(warning 4244 4251 4267 4275 4290 4786 4305 4996)
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd${warning}")
+    endforeach(warning)
+else()
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
+    -g \
+    -Wall \
+    -Werror \
+    -Wno-deprecated-declarations \
+    -Wno-deprecated \
+    ")
+endif()
+
+
+find_package(Python ${CSP_PYTHON_VERSION} EXACT REQUIRED COMPONENTS Interpreter Development.Module)
+link_directories(${Python_LIBRARY_DIRS})
+include_directories(${Python_INCLUDE_DIRS})
+
+set(CMAKE_SHARED_LIBRARY_PREFIX "")
+if(NOT WIN32)
+    set(CMAKE_SHARED_LIBRARY_SUFFIX .so)
+else()
+    set(CMAKE_SHARED_LIBRARY_SUFFIX .pyd)
+endif()
+
+include_directories("${CMAKE_SOURCE_DIR}/cpp")
+
+add_library(extension SHARED cpp/project/basic.cpp)
+set_target_properties(extension PROPERTIES PUBLIC_HEADER cpp/project/basic.hpp)
+install(TARGETS extension
+        PUBLIC_HEADER DESTINATION project/include/project
+        RUNTIME DESTINATION project/
+        LIBRARY DESTINATION project/
+       )

hatch_cpp/tests/test_project_cmake/Makefile

@@ -0,0 +1,140 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.31
+
+# Default target executed when no arguments are given to make.
+default_target: all
+.PHONY : default_target
+
+# Allow only one "make -f Makefile2" at a time, but pass parallelism.
+.NOTPARALLEL:
+
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canonical targets will work.
+.SUFFIXES:
+
+# Disable VCS-based implicit rules.
+% : %,v
+
+# Disable VCS-based implicit rules.
+% : RCS/%
+
+# Disable VCS-based implicit rules.
+% : RCS/%,v
+
+# Disable VCS-based implicit rules.
+% : SCCS/s.%
+
+# Disable VCS-based implicit rules.
+% : s.%
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+# Command-line flag to silence nested $(MAKE).
+$(VERBOSE)MAKESILENT = -s
+
+#Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+# A target that is always out of date.
+cmake_force:
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /opt/homebrew/bin/cmake
+
+# The command to remove a file.
+RM = /opt/homebrew/bin/cmake -E rm -f
+
+# Escaping for special characters.
+EQUALS = =
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /Users/timkpaine/Developer/projects/templates/hatch-cpp/hatch_cpp/tests/test_project_cmake
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /Users/timkpaine/Developer/projects/templates/hatch-cpp/hatch_cpp/tests/test_project_cmake
+
+#=============================================================================
+# Targets provided globally by CMake.
+
+# Special rule for the target edit_cache
+edit_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running CMake cache editor..."
+	/opt/homebrew/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : edit_cache
+
+# Special rule for the target edit_cache
+edit_cache/fast: edit_cache
+.PHONY : edit_cache/fast
+
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running CMake to regenerate build system..."
+	/opt/homebrew/bin/cmake --regenerate-during-build -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
+
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
+
+# The main all target
+all: cmake_check_build_system
+	$(CMAKE_COMMAND) -E cmake_progress_start /Users/timkpaine/Developer/projects/templates/hatch-cpp/hatch_cpp/tests/test_project_cmake/CMakeFiles /Users/timkpaine/Developer/projects/templates/hatch-cpp/hatch_cpp/tests/test_project_cmake//CMakeFiles/progress.marks
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 all
+	$(CMAKE_COMMAND) -E cmake_progress_start /Users/timkpaine/Developer/projects/templates/hatch-cpp/hatch_cpp/tests/test_project_cmake/CMakeFiles 0
+.PHONY : all
+
+# The main clean target
+clean:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 clean
+.PHONY : clean
+
+# The main clean target
+clean/fast: clean
+.PHONY : clean/fast
+
+# Prepare targets for installation.
+preinstall: all
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 preinstall
+.PHONY : preinstall
+
+# Prepare targets for installation.
+preinstall/fast:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 preinstall
+.PHONY : preinstall/fast
+
+# clear depends
+depend:
+	$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+.PHONY : depend
+
+# Help Target
+help:
+	@echo "The following are some of the valid targets for this Makefile:"
+	@echo "... all (the default if no target is provided)"
+	@echo "... clean"
+	@echo "... depend"
+	@echo "... edit_cache"
+	@echo "... rebuild_cache"
+.PHONY : help
+
+
+
+#=============================================================================
+# Special targets to cleanup operation of make.
+
+# Special rule to run CMake to check the build system integrity.
+# No rule that depends on this can have commands that come from listfiles
+# because they might be regenerated.
+cmake_check_build_system:
+	$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+.PHONY : cmake_check_build_system
+

hatch_cpp/tests/test_project_cmake/cpp/project/basic.cpp

@@ -0,0 +1,5 @@
+#include "project/basic.hpp"
+
+PyObject* hello(PyObject*, PyObject*) {
+    return PyUnicode_FromString("A string");
+}

hatch_cpp/tests/test_project_cmake/cpp/project/basic.hpp

@@ -0,0 +1,17 @@
+#pragma once
+#include "Python.h"
+
+PyObject* hello(PyObject*, PyObject*);
+
+static PyMethodDef extension_methods[] = {
+  {"hello", (PyCFunction)hello, METH_NOARGS},
+  {nullptr, nullptr, 0, nullptr}
+};
+
+static PyModuleDef extension_module = {
+  PyModuleDef_HEAD_INIT, "extension", "extension", -1, extension_methods};
+
+PyMODINIT_FUNC PyInit_extension(void) {
+  Py_Initialize();
+  return PyModule_Create(&extension_module);
+}

hatch_cpp/tests/test_project_cmake/pyproject.toml

@@ -0,0 +1,39 @@
+[build-system]
+requires = ["hatchling>=1.20"]
+build-backend = "hatchling.build"
+
+[project]
+name = "hatch-cpp-test-project-basic"
+description = "Basic test project for hatch-cpp"
+version = "0.1.0"
+requires-python = ">=3.9"
+dependencies = [
+    "hatchling>=1.20",
+    "hatch-cpp",
+]
+
+[tool.hatch.build]
+artifacts = [
+    "project/*.dll",
+    "project/*.dylib",
+    "project/*.so",
+]
+
+[tool.hatch.build.sources]
+src = "/"
+
+[tool.hatch.build.targets.sdist]
+packages = ["project"]
+
+[tool.hatch.build.targets.wheel]
+packages = ["project"]
+
+[tool.hatch.build.hooks.hatch-cpp]
+verbose = true
+
+[tool.hatch.build.hooks.hatch-cpp.cmake]
+root = "CMakeLists.txt"
+cmake_args = {"BUILD_TESTS" = "OFF"}
+include_flags = {"python_version" = true}
+[tool.hatch.build.hooks.hatch-cpp.cmake.cmake_env_args]
+linux = {"MANYLINUX" = "ON"}

hatch_cpp/tests/test_projects.py

@@ -9,7 +9,15 @@ import pytest
 
 class TestProject:
     @pytest.mark.parametrize(
-        "project", ["test_project_basic", "test_project_override_classes", "test_project_pybind", "test_project_nanobind", "test_project_limited_api"]
+        "project",
+        [
+            "test_project_basic",
+            "test_project_override_classes",
+            "test_project_pybind",
+            "test_project_nanobind",
+            "test_project_limited_api",
+            "test_project_cmake",
+        ],
     )
     def test_basic(self, project):
         # cleanup

hatch_cpp/tests/test_structs.py

@@ -1,7 +1,11 @@
+from pathlib import Path
+from sys import version_info
+
 import pytest
 from pydantic import ValidationError
+from toml import loads
 
-from hatch_cpp.structs import HatchCppLibrary, HatchCppPlatform
+from hatch_cpp.structs import HatchCppBuildConfig, HatchCppBuildPlan, HatchCppLibrary, HatchCppPlatform
 
 
 class TestStructs:
@@ -24,3 +28,21 @@ class TestStructs:
 
         with pytest.raises(ValidationError):
             library.binding = "pybind11"
+
+    def test_cmake_args(self):
+        txt = (Path(__file__).parent / "test_project_cmake" / "pyproject.toml").read_text()
+        toml = loads(txt)
+        hatch_build_config = HatchCppBuildConfig(name=toml["project"]["name"], **toml["tool"]["hatch"]["build"]["hooks"]["hatch-cpp"])
+        hatch_build_plan = HatchCppBuildPlan(**hatch_build_config.model_dump())
+        hatch_build_plan.generate()
+
+        assert hatch_build_plan.commands[0].startswith("cmake .")
+        assert hatch_build_plan.commands[1].startswith("cmake --build build")
+        assert hatch_build_plan.commands[2].startswith("cmake --install build")
+
+        assert "-DCMAKE_BUILD_TYPE=release" in hatch_build_plan.commands[0]
+        assert "-B build" in hatch_build_plan.commands[0]
+        assert "-DHATCH_CPP_TEST_PROJECT_BASIC_BUILD_TESTS=OFF" in hatch_build_plan.commands[0]
+        assert f"-DHATCH_CPP_TEST_PROJECT_BASIC_PYTHON_VERSION=3.{version_info.minor}" in hatch_build_plan.commands[0]
+        if hatch_build_plan.platform.platform == "darwin":
+            assert "-DCMAKE_OSX_DEPLOYMENT_TARGET=11" in hatch_build_plan.commands[0]

hatch_cpp/utils.py

@@ -10,123 +10,3 @@ _import_string_adapter = TypeAdapter(ImportString)
 @lru_cache(maxsize=None)
 def import_string(input_string: str):
     return _import_string_adapter.validate_python(input_string)
-
-
-# import multiprocessing
-# import os
-# import os.path
-# import platform
-# import subprocess
-# import sys
-# from shutil import which
-# from skbuild import setup
-
-# CSP_USE_VCPKG = os.environ.get("CSP_USE_VCPKG", "1").lower() in ("1", "on")
-# # Allow arg to override default / env
-# if "--csp-no-vcpkg" in sys.argv:
-#     CSP_USE_VCPKG = False
-#     sys.argv.remove("--csp-no-vcpkg")
-
-# # CMake Options
-# CMAKE_OPTIONS = (
-#     ("CSP_BUILD_NO_CXX_ABI", "0"),
-#     ("CSP_BUILD_TESTS", "1"),
-#     ("CSP_MANYLINUX", "0"),
-#     ("CSP_BUILD_KAFKA_ADAPTER", "1"),
-#     ("CSP_BUILD_PARQUET_ADAPTER", "1"),
-#     ("CSP_BUILD_WS_CLIENT_ADAPTER", "1"),
-#     # NOTE:
-#     # - omit vcpkg, need to test for presence
-#     # - omit ccache, need to test for presence
-#     # - omit coverage/gprof, not implemented
-# )
-
-# if sys.platform == "linux":
-#     VCPKG_TRIPLET = "x64-linux"
-# elif sys.platform == "win32":
-#     VCPKG_TRIPLET = "x64-windows-static-md"
-# else:
-#     VCPKG_TRIPLET = None
-
-# # This will be used for e.g. the sdist
-# if CSP_USE_VCPKG:
-#     if not os.path.exists("vcpkg"):
-#         subprocess.call(["git", "clone", "https://github.com/Microsoft/vcpkg.git"])
-#     if not os.path.exists("vcpkg/ports"):
-#         subprocess.call(["git", "submodule", "update", "--init", "--recursive"])
-#     if not os.path.exists("vcpkg/buildtrees"):
-#         subprocess.call(["git", "pull"], cwd="vcpkg")
-#         args = ["install"]
-#         if VCPKG_TRIPLET is not None:
-#             args.append(f"--triplet={VCPKG_TRIPLET}")
-
-#         if os.name == "nt":
-#             subprocess.call(["bootstrap-vcpkg.bat"], cwd="vcpkg", shell=True)
-#             subprocess.call(["vcpkg.bat"] + args, cwd="vcpkg", shell=True)
-#         else:
-#             subprocess.call(["./bootstrap-vcpkg.sh"], cwd="vcpkg")
-#             subprocess.call(["./vcpkg"] + args, cwd="vcpkg")
-
-
-# python_version = f"{sys.version_info.major}.{sys.version_info.minor}"
-# cmake_args = [f"-DCSP_PYTHON_VERSION={python_version}"]
-# vcpkg_toolchain_file = os.path.abspath(
-#     os.environ.get(
-#         "CSP_VCPKG_PATH",
-#         os.path.join("vcpkg/scripts/buildsystems/vcpkg.cmake"),
-#     )
-# )
-
-# if CSP_USE_VCPKG and os.path.exists(vcpkg_toolchain_file):
-#     cmake_args.extend(
-#         [
-#             "-DCMAKE_TOOLCHAIN_FILE={}".format(vcpkg_toolchain_file),
-#             "-DCSP_USE_VCPKG=ON",
-#         ]
-#     )
-
-#     if VCPKG_TRIPLET is not None:
-#         cmake_args.append(f"-DVCPKG_TARGET_TRIPLET={VCPKG_TRIPLET}")
-# else:
-#     cmake_args.append("-DCSP_USE_VCPKG=OFF")
-
-# if "CXX" in os.environ:
-#     cmake_args.append(f"-DCMAKE_CXX_COMPILER={os.environ['CXX']}")
-
-# if "DEBUG" in os.environ:
-#     cmake_args.append("-DCMAKE_BUILD_TYPE=Debug")
-
-# if platform.system() == "Windows":
-#     import distutils.msvccompiler as dm
-
-#     # https://wiki.python.org/moin/WindowsCompilers#Microsoft_Visual_C.2B-.2B-_14.0_with_Visual_Studio_2015_.28x86.2C_x64.2C_ARM.29
-#     msvc = {
-#         "12": "Visual Studio 12 2013",
-#         "14": "Visual Studio 14 2015",
-#         "14.0": "Visual Studio 14 2015",
-#         "14.1": "Visual Studio 15 2017",
-#         "14.2": "Visual Studio 16 2019",
-#         "14.3": "Visual Studio 17 2022",
-#     }.get(str(dm.get_build_version()), "Visual Studio 15 2017")
-#     cmake_args.extend(
-#         [
-#             "-G",
-#             os.environ.get("CSP_GENERATOR", msvc),
-#         ]
-#     )
-
-# for cmake_option, default in CMAKE_OPTIONS:
-#     if os.environ.get(cmake_option, default).lower() in ("1", "on"):
-#         cmake_args.append(f"-D{cmake_option}=ON")
-#     else:
-#         cmake_args.append(f"-D{cmake_option}=OFF")
-
-# if "CMAKE_BUILD_PARALLEL_LEVEL" not in os.environ:
-#     os.environ["CMAKE_BUILD_PARALLEL_LEVEL"] = str(multiprocessing.cpu_count())
-
-# if platform.system() == "Darwin":
-#     os.environ["MACOSX_DEPLOYMENT_TARGET"] = os.environ.get("OSX_DEPLOYMENT_TARGET", "10.15")
-#     cmake_args.append(f'-DCMAKE_OSX_DEPLOYMENT_TARGET={os.environ.get("OSX_DEPLOYMENT_TARGET", "10.15")}')
-
-# if which("ccache") and os.environ.get("CSP_USE_CCACHE", "") != "0":
-#     cmake_args.append("-DCSP_USE_CCACHE=On")

{hatch_cpp-0.1.6.dist-info → hatch_cpp-0.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hatch-cpp
-Version: 0.1.6
+Version: 0.1.7
 Summary: Hatch plugin for C++ builds
 Project-URL: Repository, https://github.com/python-project-templates/hatch-cpp
 Project-URL: Homepage, https://github.com/python-project-templates/hatch-cpp
@@ -30,6 +30,7 @@ Requires-Dist: pybind11; extra == 'develop'
 Requires-Dist: pytest; extra == 'develop'
 Requires-Dist: pytest-cov; extra == 'develop'
 Requires-Dist: ruff<0.9,>=0.3; extra == 'develop'
+Requires-Dist: toml; extra == 'develop'
 Requires-Dist: twine; extra == 'develop'
 Requires-Dist: wheel; extra == 'develop'
 Description-Content-Type: text/markdown

{hatch_cpp-0.1.6.dist-info → hatch_cpp-0.1.7.dist-info}/RECORD

@@ -1,14 +1,20 @@
-hatch_cpp/__init__.py,sha256=GpnnPr3BgwAuiIJ5m9xconjyECZPRPhuZQ9Q7HzWR0o,129
+hatch_cpp/__init__.py,sha256=iL_H3Zhh1jKzI3DB7IrRjibqnsFh0QPAQL1ERHAR7hI,129
 hatch_cpp/hooks.py,sha256=SQkF5WJIgzw-8rvlTzuQvBqdP6K3fHgnh6CZOZFag50,203
-hatch_cpp/plugin.py,sha256=iEDP6U7T_3G3m2ONCoYcMD3XNLq6ob_s_dn7AbtwnZ8,3238
-hatch_cpp/structs.py,sha256=o_XtXWVs0Zv0IARLY8R3NEbNqT2sAHQf7GNMIFggrKg,10681
-hatch_cpp/utils.py,sha256=topOiT6biVzisNAEKHvYzU-JdA56B3LA61jbU9fjAEQ,4444
-hatch_cpp/tests/test_projects.py,sha256=zE0XOPOuaQPfdvjgZRTPnsZ5gzK2shFPqKaPXkb5oSc,1509
-hatch_cpp/tests/test_structs.py,sha256=Qv2uBHwxf0edR8FIOnA2gj-AJgdsiDKt4vyK8HChAHg,851
+hatch_cpp/plugin.py,sha256=AV5hcVcPPIOsalKKiGSXHcHrLlZ7mKIVc-g5_waK9fk,4403
+hatch_cpp/structs.py,sha256=LDaAjzpAl4G7IysMIz6zUV1H5GcVBL2BAxA7DXjtxQw,13895
+hatch_cpp/utils.py,sha256=lxd3U3aMYsTS6DYMc1y17MR16LzgRzv92f_xh87LSg8,297
+hatch_cpp/tests/test_projects.py,sha256=vmJ218C_jP5nsen2gwjPtob0AoH4J_jNS5nOckHamvw,1623
+hatch_cpp/tests/test_structs.py,sha256=5y_xi2Hsg5NwG34hWuQoycJZEOMRI384RjPjIY4skw4,2090
 hatch_cpp/tests/test_project_basic/pyproject.toml,sha256=eqM1UVpNmJWDfsuO18ZG_VOV9I4tAWgsM5Dhf49X8Nc,694
 hatch_cpp/tests/test_project_basic/cpp/project/basic.cpp,sha256=gQ2nmdLqIdgaqxSKvkN_vbp6Iv_pAoVIHETXPRnALb0,117
 hatch_cpp/tests/test_project_basic/cpp/project/basic.hpp,sha256=SO5GhPj8k3RzWrfH37lFSDc8w1Vf3yqTUhxmr1hnoko,422
 hatch_cpp/tests/test_project_basic/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+hatch_cpp/tests/test_project_cmake/CMakeLists.txt,sha256=J6ijT9x9uSuisNEVIdFVgc_AstU9hbmIUbwvdjn_4GU,2795
+hatch_cpp/tests/test_project_cmake/Makefile,sha256=Vfr65pvnktWTUeuvpMWqIxDR-7V9MT4PQAyj-WHG_pI,4357
+hatch_cpp/tests/test_project_cmake/pyproject.toml,sha256=pu9RWhm_FY7KlcdOg2nmp-obnStnPJ04jW-bxei704w,814
+hatch_cpp/tests/test_project_cmake/cpp/project/basic.cpp,sha256=gQ2nmdLqIdgaqxSKvkN_vbp6Iv_pAoVIHETXPRnALb0,117
+hatch_cpp/tests/test_project_cmake/cpp/project/basic.hpp,sha256=SO5GhPj8k3RzWrfH37lFSDc8w1Vf3yqTUhxmr1hnoko,422
+hatch_cpp/tests/test_project_cmake/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hatch_cpp/tests/test_project_limited_api/pyproject.toml,sha256=k_2y7YpZP5I-KPvKOZLmnHqoKXVE2oVM8fjxtRKoTo0,726
 hatch_cpp/tests/test_project_limited_api/cpp/project/basic.cpp,sha256=gQ2nmdLqIdgaqxSKvkN_vbp6Iv_pAoVIHETXPRnALb0,117
 hatch_cpp/tests/test_project_limited_api/cpp/project/basic.hpp,sha256=SO5GhPj8k3RzWrfH37lFSDc8w1Vf3yqTUhxmr1hnoko,422
@@ -27,8 +33,8 @@ hatch_cpp/tests/test_project_pybind/cpp/project/basic.hpp,sha256=LZSfCfhLY_91MBO
 hatch_cpp/tests/test_project_pybind/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hatch_cpp/toolchains/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hatch_cpp/toolchains/cmake.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hatch_cpp-0.1.6.dist-info/METADATA,sha256=xxJ65xK090LytyqWJP48Gy4rQLOGJNIprM5UC2e8_gA,3003
-hatch_cpp-0.1.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hatch_cpp-0.1.6.dist-info/entry_points.txt,sha256=RgXfjpD4iwomJQK5n7FnPkXzb5fOnF5v3DI5hbkgVcw,30
-hatch_cpp-0.1.6.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-hatch_cpp-0.1.6.dist-info/RECORD,,
+hatch_cpp-0.1.7.dist-info/METADATA,sha256=z95QlwYagluSoKGVxGm9sdjCcVF_y93MCmxSc3yvnZ0,3043
+hatch_cpp-0.1.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hatch_cpp-0.1.7.dist-info/entry_points.txt,sha256=RgXfjpD4iwomJQK5n7FnPkXzb5fOnF5v3DI5hbkgVcw,30
+hatch_cpp-0.1.7.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+hatch_cpp-0.1.7.dist-info/RECORD,,