hatch-cpp 0.1.0__tar.gz → 0.1.1__tar.gz

{hatch_cpp-0.1.0 → hatch_cpp-0.1.1}/.gitignore

@@ -4,7 +4,12 @@ __pycache__/
 *$py.class
 
 # C extensions
+*.a
 *.so
+*.obj
+*.dll
+*.exp
+*.lib
 
 # Distribution / packaging
 .Python

{hatch_cpp-0.1.0 → hatch_cpp-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hatch-cpp
-Version: 0.1.0
+Version: 0.1.1
 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

hatch_cpp-0.1.1/hatch_cpp/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.1"

{hatch_cpp-0.1.0 → hatch_cpp-0.1.1}/hatch_cpp/plugin.py

@@ -43,10 +43,14 @@ class HatchCppBuildHook(BuildHookInterface[HatchCppBuildConfig]):
         libraries = [HatchCppLibrary(**library_kwargs) for library_kwargs in library_kwargs]
         platform = HatchCppPlatform.default()
         if config.toolchain == "raw":
-            # g++ basic-project/basic.cpp -I. -I/opt/homebrew/opt/python@3.11/Frameworks/Python.framework/Versions/3.11/include/python3.11/  -undefined dynamic_lookup -fPIC -shared -o extension.so
             build_plan = HatchCppBuildPlan(libraries=libraries, platform=platform)
             build_plan.generate()
-            build_plan.execute(verbose=config.verbose)
+            if config.verbose:
+                for command in build_plan.commands:
+                    self._logger.info(command)
+            build_plan.execute()
+            build_plan.cleanup()
+
         # build_kwargs = config.build_kwargs
         # if version == "editable":
         #     build_kwargs = config.editable_build_kwargs or build_kwargs

{hatch_cpp-0.1.0 → hatch_cpp-0.1.1}/hatch_cpp/structs.py

@@ -2,7 +2,8 @@ from __future__ import annotations
 
 from dataclasses import dataclass, field
 from os import environ, system
-from sys import platform as sys_platform
+from pathlib import Path
+from sys import executable, platform as sys_platform
 from sysconfig import get_path
 from typing import Literal
 
@@ -80,7 +81,7 @@ class HatchCppPlatform(object):
             raise Exception(f"Unrecognized toolchain: {CC}, {CXX}")
         return HatchCppPlatform(cc=CC, cxx=CXX, platform=platform, toolchain=toolchain)
 
-    def get_flags(self, library: HatchCppLibrary) -> str:
+    def get_compile_flags(self, library: HatchCppLibrary) -> str:
         flags = ""
         if self.toolchain == "gcc":
             flags = f"-I{get_path('include')}"
@@ -109,21 +110,28 @@ class HatchCppPlatform(object):
         elif self.toolchain == "msvc":
             flags = f"/I{get_path('include')} "
             flags += " ".join(f"/I{d}" for d in library.include_dirs)
-            flags += " /LD"
             flags += " " + " ".join(library.extra_compile_args)
             flags += " " + " ".join(library.extra_link_args)
             flags += " " + " ".join(library.extra_objects)
-            flags += " " + " ".join(f"{lib}.lib" for lib in library.libraries)
-            flags += " " + " ".join(f"/LIBPATH:{lib}" for lib in library.library_dirs)
             flags += " " + " ".join(f"/D{macro}" for macro in library.define_macros)
             flags += " " + " ".join(f"/U{macro}" for macro in library.undef_macros)
-            flags += f" /Fo{library.name}.obj"
-            flags += f" /Fe{library.name}.pyd"
+            flags += " /EHsc /DWIN32 /LD"
+            flags += f" /Fo:{library.name}.obj"
+            flags += f" /Fe:{library.name}.pyd"
+            flags += " /link /DLL"
+            if (Path(executable).parent / "libs").exists():
+                flags += f" /LIBPATH:{str(Path(executable).parent / 'libs')}"
+            flags += " " + " ".join(f"{lib}.lib" for lib in library.libraries)
+            flags += " " + " ".join(f"/LIBPATH:{lib}" for lib in library.library_dirs)
         # clean
         while flags.count("  "):
             flags = flags.replace("  ", " ")
         return flags
 
+    def get_link_flags(self, library: HatchCppLibrary) -> str:
+        flags = ""
+        return flags
+
 
 @dataclass
 class HatchCppBuildPlan(object):
@@ -134,13 +142,18 @@ class HatchCppBuildPlan(object):
     def generate(self):
         self.commands = []
         for library in self.libraries:
-            flags = self.platform.get_flags(library)
+            flags = self.platform.get_compile_flags(library)
             self.commands.append(f"{self.platform.cc} {' '.join(library.sources)} {flags}")
         return self.commands
 
-    def execute(self, verbose: bool = True):
+    def execute(self):
         for command in self.commands:
-            if verbose:
-                print(f"Running command: {command}")
             system(command)
         return self.commands
+
+    def cleanup(self):
+        if self.platform.platform == "win32":
+            for library in self.libraries:
+                temp_obj = Path(f"{library.name}.obj")
+                if temp_obj.exists():
+                    temp_obj.unlink()

{hatch_cpp-0.1.0 → hatch_cpp-0.1.1}/hatch_cpp/tests/test_project_basic.py

@@ -1,7 +1,8 @@
 from os import listdir
+from pathlib import Path
 from shutil import rmtree
 from subprocess import check_output
-from sys import platform
+from sys import path, platform
 
 
 class TestProject:
@@ -20,3 +21,8 @@ class TestProject:
             assert "extension.pyd" in listdir("hatch_cpp/tests/test_project_basic/basic_project")
         else:
             assert "extension.so" in listdir("hatch_cpp/tests/test_project_basic/basic_project")
+        here = Path(__file__).parent / "test_project_basic"
+        path.insert(0, str(here))
+        import basic_project.extension
+
+        assert basic_project.extension.hello() == "A string"

{hatch_cpp-0.1.0 → hatch_cpp-0.1.1}/pyproject.toml

@@ -8,7 +8,7 @@ authors = [{name = "the hatch-cpp authors", email = "t.paine154@gmail.com"}]
 description = "Hatch plugin for C++ builds"
 readme = "README.md"
 license = { text = "Apache-2.0" }
-version = "0.1.0"
+version = "0.1.1"
 requires-python = ">=3.9"
 keywords = [
     "hatch",
@@ -59,7 +59,7 @@ Repository = "https://github.com/python-project-templates/hatch-cpp"
 Homepage = "https://github.com/python-project-templates/hatch-cpp"
 
 [tool.bumpversion]
-current_version = "0.1.0"
+current_version = "0.1.1"
 commit = true
 tag = false
 

hatch_cpp-0.1.0/hatch_cpp/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.0"