Merge pull request #18 from ravenexp/dll-tool-type

Refactor and add `zig dlltool` support

Author: messense

.github/workflows/rust.yml

@@ -22,11 +22,33 @@ jobs:
     - uses: actions/checkout@v3
     - name: Install the MinGW and LLVM toolchains
       if: matrix.os == 'ubuntu-latest'
-      run: sudo apt-get install -y mingw-w64 llvm
+      run: sudo apt-get install -y gcc-mingw-w64 llvm
     - name: Build
       run: cargo build --verbose
     - name: Run tests
-      run: cargo test --verbose
+      run: cargo test --verbose -- --test-threads=1
+  zigbuild:
+    name: Test zig dlltool
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: goto-bus-stop/setup-zig@v1
+      with:
+        version: 0.9.1
+    - name: Run tests with zig
+      run: ZIG_COMMAND=zig cargo test --verbose
+  zigwheel:
+    name: Test python -m ziglang dlltool
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v2
+      with:
+        python-version: "3.10"
+    - name: Install ziglang package
+      run: pip install ziglang
+    - name: Run tests with python -m ziglang
+      run: ZIG_COMMAND="python -m ziglang" cargo test --verbose
   fmt:
     name: Check code formatting
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
+## Unreleased
+
+### Features
+
+- Add `zig dlltool` support in [#18](https://github.com/pyo3/python3-dll-a/pull/18)
+
+### Fixes
+
+- Improve error message when `dlltool` is not found in [#17](https://github.com/pyo3/python3-dll-a/pull/17)
+
 ## [0.2.2] - 2022-05-10
 
 ### Features

README.md

@@ -5,16 +5,18 @@ Generates import libraries for the Python DLL
 (either `python3.dll` or `python3y.dll`)
 for MinGW-w64 and MSVC (cross-)compile targets.
 
-See <https://docs.python.org/3/c-api/stable.html> for the Stable ABI details.
-
 This crate **does not require** Python 3 distribution files
 to be present on the (cross-)compile host system.
 
-**Note:** MSVC cross-compile targets require LLVM binutils
-to be available on the host system.
+**Note:** MSVC cross-compile targets require either LLVM binutils
+or Zig to be available on the host system.
 More specifically, `python3-dll-a` requires `llvm-dlltool` executable
 to be present in `PATH` when targeting `*-pc-windows-msvc` from Linux.
 
+Alternatively, `ZIG_COMMAND` environment variable may be set to e.g. "zig"
+or "python -m ziglang", then `zig dlltool` will be used in place
+of `llvm-dlltool` (or MinGW binutils).
+
 PyO3 integration
 ----------------
 
@@ -42,7 +44,7 @@ from the crate build script.
 
 The examples below assume using an older version of PyO3.
 
-### Example `build.rs` script
+### Example `build.rs` script for an `abi3` PyO3 extension
 
 The following cargo build script can be used to cross-compile Stable ABI
 PyO3 extension modules for Windows (64/32-bit x86 or 64-bit ARM)
@@ -73,6 +75,14 @@ pointed by the `PYO3_CROSS_LIB_DIR` environment variable.
 PYO3_CROSS_LIB_DIR=target/python3-dll cargo build --target x86_64-pc-windows-gnu
 ```
 
+Generating version-specific `python3y.dll` import libraries
+-----------------------------------------------------------
+
+As an advanced feature, `python3-dll-a` can generate Python version
+specific import libraries such as `python39.lib`.
+
+See the `ImportLibraryGenerator` builder API description for details.
+
 Maintenance
 -----------