pyxcp 0.22.2__tar.gz → 0.22.4__tar.gz

{pyxcp-0.22.2 → pyxcp-0.22.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyxcp
-Version: 0.22.2
+Version: 0.22.4
 Summary: Universal Calibration Protocol for Python
 Home-page: https://github.com/christoph2/pyxcp
 License: LGPLv3

{pyxcp-0.22.2 → pyxcp-0.22.4}/build_ext.py

@@ -42,9 +42,9 @@ def alternate_libdir(pth: str):
 def get_py_config() -> dict:
     pynd = VARS["py_version_nodot"]  # Should always be present.
     include = sysconfig.get_path("include")  # Seems to be cross-platform.
-    library = f"python{pynd}.lib"
     if uname.system == "Windows":
         base = get_python_base()
+        library = f"python{pynd}.lib"
         libdir = Path(base) / "libs"
         if libdir.exists():
             available_libs = os.listdir(libdir)
@@ -55,9 +55,34 @@ def get_py_config() -> dict:
         else:
             libdir = alternate_libdir(include)
     else:
-        libdir = VARS["LIBDIR"]
-        library = VARS["LDLIBRARY"]
-
+        library = VARS["LIBRARY"]
+        DIR_VARS = ("LIBDIR", "BINLIBDEST", "DESTLIB", "LIBDEST", "MACHDESTLIB", "DESTSHARED", "LIBPL")
+        arch = None
+        if uname.system == "Linux":
+            arch = VARS.get("MULTIARCH", "")
+        found = False
+        for dir_var in DIR_VARS:
+            if found:
+                break
+            dir_name = VARS.get(dir_var)
+            if not dir_name:
+                continue
+            if uname.system == "Darwin":
+                full_path = [Path(dir_name) / library]
+            elif uname.system == "Linux":
+                full_path = [Path(dir_name) / arch / library, Path(dir_name) / library]
+            else:
+                print("PF?", uname.system)
+            for fp in full_path:
+                print("Trying '{fp}'")
+                if fp.exists():
+                    print(f"found Python library: '{fp}'")
+                    libdir = str(fp.parent)
+                    found = True
+                    break
+        if not found:
+            print("Could NOT locate Python library.")
+            return dict(exe=sys.executable, include=include, libdir="", library=library)
     return dict(exe=sys.executable, include=include, libdir=libdir, library=library)
 
 
@@ -79,9 +104,10 @@ def build_extension(debug: bool = False, use_temp_dir: bool = False) -> None:
     cmake_args = [
         f"-DPython3_EXECUTABLE={py_cfg['exe']}",
         f"-DPython3_INCLUDE_DIR={py_cfg['include']}",
-        f"-DPython3_LIBRARY={str(Path(py_cfg['libdir']) / Path(py_cfg['library']))}",
         f"-DCMAKE_BUILD_TYPE={cfg}",  # not used on MSVC, but no harm
     ]
+    if py_cfg["libdir"]:
+        cmake_args.append(f"-DPython3_LIBRARY={str(Path(py_cfg['libdir']) / Path(py_cfg['library']))}")
 
     build_args = ["--config Release", "--verbose"]
     # cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=1 /path/to/src

{pyxcp-0.22.2 → pyxcp-0.22.4}/pyproject.toml

@@ -36,7 +36,7 @@ dynamic = ["license", "readme", "authors", "requires-python", "description", "cl
 [tool.poetry]
 authors = ["Christoph Schueler <cpu.gems@googlemail.com>"]
 name = "pyxcp"
-version = "0.22.2"
+version = "0.22.4"
 readme = "README.md"
 description = "Universal Calibration Protocol for Python"
 keywords = ["automotive", "ecu", "xcp", "asam", "autosar"]

{pyxcp-0.22.2 → pyxcp-0.22.4}/pyxcp/__init__.py

@@ -17,4 +17,4 @@ tb_install(show_locals=True, max_frames=3)  # Install custom exception handler.
 
 # if you update this manually, do not forget to update
 # .bumpversion.cfg and pyproject.toml.
-__version__ = "0.22.2"
+__version__ = "0.22.4"