Merge pull request #32 from pyozig/dev

fix: Windows build support and package mode improvements

Author: dzonerzy

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to PyOZ will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.11.2] - 2026-02-10
+
+### Fixed
+- **Windows build support** - Fixed 77 `lld-link: undefined symbol` errors when building PyOZ projects on Windows. The generated `build.zig` template now accepts `-Dpython-lib-dir` and `-Dpython-lib-name` options, and `pyoz build` passes them automatically on Windows to link against `python3.lib` (stable ABI). Windows requires all symbols resolved at link time, unlike Linux/macOS which resolve Python symbols at runtime.
+- **Windows output path** - Fixed `FileNotFound` error during wheel creation on Windows. Zig places DLLs (`.pyd`) in `zig-out/bin/` on Windows, not `zig-out/lib/`. The builder, test runner, and benchmark runner now use the correct output directory per platform.
+- **Package mode test/bench imports** - In package layout (module name starts with `_`), the generated test and benchmark scripts now also `import ravn` (the package name) in addition to `import _ravn`, so users can write `assert ravn.add(2, 3) == 5` in their tests. The test/bench runners also detect package mode, copy the `.pyd`/`.so` into the package directory, and add the project root to `PYTHONPATH`.
+- **ASCII tree output for `pyoz init`** - Replaced UTF-8 box-drawing characters with ASCII in the project structure output, fixing garbled display on Windows PowerShell.
+
 ## [0.11.1] - 2026-02-10
 
 ### Added

build.zig.zon

@@ -1,6 +1,6 @@
 .{
     .name = .PyOZ,
-    .version = "0.11.1",
+    .version = "0.11.2",
     .fingerprint = 0x4d3668413e69d99e,
     .dependencies = .{},
     .paths = .{

pypi/build.zig.zon

@@ -1,6 +1,6 @@
 .{
     .name = .pyoz,
-    .version = "0.11.1",
+    .version = "0.11.2",
     .fingerprint = 0x43eec3150282fd1f,
     .dependencies = .{
         .PyOZ = .{

pypi/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyoz"
-version = "0.11.1"
+version = "0.11.2"
 description = "Python extension modules in Zig, made easy"
 readme = "README.md"
 license = "MIT"

pypi/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = pyoz
-version = 0.11.1
+version = 0.11.2
 
 [options]
 packages = pyoz

src/cli/builder.zig

@@ -163,7 +163,7 @@ pub fn buildModule(allocator: std.mem.Allocator, release: bool) !BuildResult {
         // Determine optimization level:
         // - If --release flag is passed, always use ReleaseFast
         // - Otherwise, use the optimize setting from pyproject.toml (empty = debug)
-        var argv_buf: [4][]const u8 = undefined;
+        var argv_buf: [6][]const u8 = undefined;
         var argv_len: usize = 2;
         argv_buf[0] = "zig";
         argv_buf[1] = "build";
@@ -183,6 +183,22 @@ pub fn buildModule(allocator: std.mem.Allocator, release: bool) !BuildResult {
             argv_len += 1;
         }
 
+        // On Windows, pass Python library info so zig build can link against python3.lib
+        // (Windows linker requires all symbols resolved at link time, unlike Unix)
+        var lib_dir_arg: ?[]const u8 = null;
+        defer if (lib_dir_arg) |a| allocator.free(a);
+        if (builtin.os.tag == .windows) {
+            if (python.lib_dir) |lib_dir| {
+                lib_dir_arg = std.fmt.allocPrint(allocator, "-Dpython-lib-dir={s}", .{lib_dir}) catch null;
+                if (lib_dir_arg) |arg| {
+                    argv_buf[argv_len] = arg;
+                    argv_len += 1;
+                }
+            }
+            argv_buf[argv_len] = "-Dpython-lib-name=python3";
+            argv_len += 1;
+        }
+
         const argv: []const []const u8 = argv_buf[0..argv_len];
 
         var child = std.process.Child.init(argv, allocator);
@@ -196,7 +212,9 @@ pub fn buildModule(allocator: std.mem.Allocator, release: bool) !BuildResult {
         }
 
         const module_name = try std.fmt.allocPrint(allocator, "{s}{s}", .{ config.getModuleName(), ext });
-        const module_path = try std.fmt.allocPrint(allocator, "zig-out/lib/{s}", .{module_name});
+        // On Windows, Zig places DLLs (.pyd) in zig-out/bin/, import libs in zig-out/lib/
+        const out_dir = if (builtin.os.tag == .windows) "zig-out/bin" else "zig-out/lib";
+        const module_path = try std.fmt.allocPrint(allocator, "{s}/{s}", .{ out_dir, module_name });
 
         return BuildResult{
             .module_path = module_path,

src/cli/commands.zig

@@ -207,10 +207,39 @@ pub fn runTests(allocator: std.mem.Allocator, args: []const []const u8) !void {
         return;
     }
 
+    // Load project config to detect package mode
+    var config = project.toml.loadPyProject(allocator) catch |err| {
+        if (err == error.PyProjectNotFound) {
+            std.debug.print("Error: pyproject.toml not found. Run 'pyoz init' first.\n", .{});
+        }
+        return err;
+    };
+    defer config.deinit(allocator);
+
+    // Detect package mode: module name starts with '_' and a py-package matches project name
+    const is_package_mode = blk: {
+        const mod_name = config.getModuleName();
+        if (mod_name.len > 0 and mod_name[0] == '_') {
+            for (config.py_packages.items) |pkg| {
+                if (std.mem.eql(u8, pkg, config.name)) break :blk true;
+            }
+        }
+        break :blk false;
+    };
+
     // Build the module
     var build_result = try builder.buildModule(allocator, release);
     defer build_result.deinit(allocator);
 
+    // In package mode, copy .pyd/.so into the package directory so `import ravn` works
+    if (is_package_mode) {
+        const pkg_module_path = try std.fmt.allocPrint(allocator, "{s}/{s}", .{ config.name, build_result.module_name });
+        defer allocator.free(pkg_module_path);
+        std.fs.cwd().copyFile(build_result.module_path, std.fs.cwd(), pkg_module_path, .{}) catch |err| {
+            std.debug.print("Warning: Could not copy module into package directory: {s}\n", .{@errorName(err)});
+        };
+    }
+
     // Extract tests from the compiled module
     const test_content = symreader.extractTests(allocator, build_result.module_path) catch |err| {
         std.debug.print("Error: Could not extract tests: {}\n", .{err});
@@ -230,7 +259,7 @@ pub fn runTests(allocator: std.mem.Allocator, args: []const []const u8) !void {
     defer allocator.free(test_content.?);
 
     // Write test file next to the built module
-    const test_file = "zig-out/lib/__pyoz_test.py";
+    const test_file = if (builtin.os.tag == .windows) "zig-out/bin/__pyoz_test.py" else "zig-out/lib/__pyoz_test.py";
     {
         const cwd = std.fs.cwd();
         const f = cwd.createFile(test_file, .{}) catch |err| {
@@ -266,10 +295,18 @@ pub fn runTests(allocator: std.mem.Allocator, args: []const []const u8) !void {
     const existing_pp = std.process.getEnvVarOwned(allocator, "PYTHONPATH") catch "";
     defer if (existing_pp.len > 0) allocator.free(existing_pp);
 
-    const new_pp = if (existing_pp.len > 0)
-        try std.fmt.allocPrint(allocator, "zig-out/lib{s}{s}", .{ path_sep, existing_pp })
+    // On Windows, Zig places DLLs (.pyd) in zig-out/bin/, so use the correct directory
+    const out_dir = if (builtin.os.tag == .windows) "zig-out/bin" else "zig-out/lib";
+    // In package mode, also add project root so `import ravn` finds ravn/__init__.py
+    const new_pp = if (is_package_mode)
+        if (existing_pp.len > 0)
+            try std.fmt.allocPrint(allocator, ".{s}{s}{s}{s}", .{ path_sep, out_dir, path_sep, existing_pp })
+        else
+            try std.fmt.allocPrint(allocator, ".{s}{s}", .{ path_sep, out_dir })
+    else if (existing_pp.len > 0)
+        try std.fmt.allocPrint(allocator, "{s}{s}{s}", .{ out_dir, path_sep, existing_pp })
     else
-        try allocator.dupe(u8, "zig-out/lib");
+        try allocator.dupe(u8, out_dir);
     defer allocator.free(new_pp);
 
     // Build argv
@@ -330,10 +367,39 @@ pub fn runBench(allocator: std.mem.Allocator, args: []const []const u8) !void {
         return;
     }
 
+    // Load project config to detect package mode
+    var config = project.toml.loadPyProject(allocator) catch |err| {
+        if (err == error.PyProjectNotFound) {
+            std.debug.print("Error: pyproject.toml not found. Run 'pyoz init' first.\n", .{});
+        }
+        return err;
+    };
+    defer config.deinit(allocator);
+
+    // Detect package mode
+    const is_package_mode = blk: {
+        const mod_name = config.getModuleName();
+        if (mod_name.len > 0 and mod_name[0] == '_') {
+            for (config.py_packages.items) |pkg| {
+                if (std.mem.eql(u8, pkg, config.name)) break :blk true;
+            }
+        }
+        break :blk false;
+    };
+
     // Always build in release mode for benchmarks
     var build_result = try builder.buildModule(allocator, true);
     defer build_result.deinit(allocator);
 
+    // In package mode, copy .pyd/.so into the package directory so `import ravn` works
+    if (is_package_mode) {
+        const pkg_module_path = try std.fmt.allocPrint(allocator, "{s}/{s}", .{ config.name, build_result.module_name });
+        defer allocator.free(pkg_module_path);
+        std.fs.cwd().copyFile(build_result.module_path, std.fs.cwd(), pkg_module_path, .{}) catch |err| {
+            std.debug.print("Warning: Could not copy module into package directory: {s}\n", .{@errorName(err)});
+        };
+    }
+
     // Extract benchmarks from the compiled module
     const bench_content = symreader.extractBenchmarks(allocator, build_result.module_path) catch |err| {
         std.debug.print("Error: Could not extract benchmarks: {}\n", .{err});
@@ -353,7 +419,7 @@ pub fn runBench(allocator: std.mem.Allocator, args: []const []const u8) !void {
     defer allocator.free(bench_content.?);
 
     // Write benchmark file next to the built module
-    const bench_file = "zig-out/lib/__pyoz_bench.py";
+    const bench_file = if (builtin.os.tag == .windows) "zig-out/bin/__pyoz_bench.py" else "zig-out/lib/__pyoz_bench.py";
     {
         const cwd = std.fs.cwd();
         const f = cwd.createFile(bench_file, .{}) catch |err| {
@@ -388,10 +454,18 @@ pub fn runBench(allocator: std.mem.Allocator, args: []const []const u8) !void {
     const existing_pp = std.process.getEnvVarOwned(allocator, "PYTHONPATH") catch "";
     defer if (existing_pp.len > 0) allocator.free(existing_pp);
 
-    const new_pp = if (existing_pp.len > 0)
-        try std.fmt.allocPrint(allocator, "zig-out/lib{s}{s}", .{ path_sep, existing_pp })
+    // On Windows, Zig places DLLs (.pyd) in zig-out/bin/, so use the correct directory
+    const bench_out_dir = if (builtin.os.tag == .windows) "zig-out/bin" else "zig-out/lib";
+    // In package mode, also add project root so `import ravn` finds ravn/__init__.py
+    const new_pp = if (is_package_mode)
+        if (existing_pp.len > 0)
+            try std.fmt.allocPrint(allocator, ".{s}{s}{s}{s}", .{ path_sep, bench_out_dir, path_sep, existing_pp })
+        else
+            try std.fmt.allocPrint(allocator, ".{s}{s}", .{ path_sep, bench_out_dir })
+    else if (existing_pp.len > 0)
+        try std.fmt.allocPrint(allocator, "{s}{s}{s}", .{ bench_out_dir, path_sep, existing_pp })
     else
-        try allocator.dupe(u8, "zig-out/lib");
+        try allocator.dupe(u8, bench_out_dir);
     defer allocator.free(new_pp);
 
     var env_map = std.process.getEnvMap(allocator) catch |err| {

src/cli/project.zig

@@ -110,15 +110,15 @@ pub fn create(allocator: std.mem.Allocator, name_opt: ?[]const u8, in_current_di
             \\
             \\Project structure:
             \\  {s}/
-            \\  ├── pyproject.toml    # Project configuration
-            \\  ├── build.zig         # Zig build script
-            \\  ├── build.zig.zon     # Zig dependencies
-            \\  ├── README.md
-            \\  ├── .gitignore
-            \\  ├── src/
-            \\  │   └── lib.zig       # Your Zig extension code
-            \\  └── {s}/
-            \\      └── __init__.py   # Python package entry point
+            \\  +-- pyproject.toml    # Project configuration
+            \\  +-- build.zig         # Zig build script
+            \\  +-- build.zig.zon     # Zig dependencies
+            \\  +-- README.md
+            \\  +-- .gitignore
+            \\  +-- src/
+            \\  |   +-- lib.zig       # Your Zig extension code
+            \\  +-- {s}/
+            \\      +-- __init__.py   # Python package entry point
             \\
             \\Next steps:
             \\
@@ -130,13 +130,13 @@ pub fn create(allocator: std.mem.Allocator, name_opt: ?[]const u8, in_current_di
             \\
             \\Project structure:
             \\  {s}/
-            \\  ├── pyproject.toml    # Project configuration
-            \\  ├── build.zig         # Zig build script
-            \\  ├── build.zig.zon     # Zig dependencies
-            \\  ├── README.md
-            \\  ├── .gitignore
-            \\  └── src/
-            \\      └── lib.zig       # Your module code
+            \\  +-- pyproject.toml    # Project configuration
+            \\  +-- build.zig         # Zig build script
+            \\  +-- build.zig.zon     # Zig dependencies
+            \\  +-- README.md
+            \\  +-- .gitignore
+            \\  +-- src/
+            \\      +-- lib.zig       # Your module code
             \\
             \\Next steps:
             \\
@@ -571,6 +571,16 @@ const build_zig_template =
     \\    // Link libc (required for Python C API)
     \\    lib.linkLibC();
     \\
+    \\    // On Windows, link against the Python stable ABI library (python3.lib).
+    \\    // These options are passed automatically by `pyoz build`.
+    \\    // For manual `zig build` on Windows, pass: -Dpython-lib-dir=<path> -Dpython-lib-name=python3
+    \\    if (b.option([]const u8, "python-lib-dir", "Python library directory")) |lib_dir| {
+    \\        lib.addLibraryPath(.{ .cwd_relative = lib_dir });
+    \\    }
+    \\    if (b.option([]const u8, "python-lib-name", "Python library name")) |lib_name| {
+    \\        lib.linkSystemLibrary(lib_name);
+    \\    }
+    \\
     \\    // Determine extension based on target OS (.pyd for Windows, .so otherwise)
     \\    const ext = if (builtin.os.tag == .windows) ".pyd" else ".so";
     \\
@@ -628,6 +638,16 @@ const build_zig_package_template =
     \\    // Link libc (required for Python C API)
     \\    lib.linkLibC();
     \\
+    \\    // On Windows, link against the Python stable ABI library (python3.lib).
+    \\    // These options are passed automatically by `pyoz build`.
+    \\    // For manual `zig build` on Windows, pass: -Dpython-lib-dir=<path> -Dpython-lib-name=python3
+    \\    if (b.option([]const u8, "python-lib-dir", "Python library directory")) |lib_dir| {
+    \\        lib.addLibraryPath(.{ .cwd_relative = lib_dir });
+    \\    }
+    \\    if (b.option([]const u8, "python-lib-name", "Python library name")) |lib_name| {
+    \\        lib.linkSystemLibrary(lib_name);
+    \\    }
+    \\
     \\    // Determine extension based on target OS (.pyd for Windows, .so otherwise)
     \\    const ext = if (builtin.os.tag == .windows) ".pyd" else ".so";
     \\

src/lib/root.zig

@@ -663,9 +663,17 @@ fn generateTestContent(comptime config: anytype) []const u8 {
             break :blk config.name[0..len];
         };
 
+        // In package mode (module name starts with '_'), also import the package name
+        // so users can write `assert ravn.add(2, 3) == 5` instead of `assert _ravn.add(2, 3) == 5`
+        const pkg_import: []const u8 = if (mod_name.len > 1 and mod_name[0] == '_')
+            "import " ++ mod_name[1..] ++ "\n"
+        else
+            "";
+
         var result: []const u8 =
             "import unittest\n" ++
             "import " ++ mod_name ++ "\n" ++
+            pkg_import ++
             "\n" ++
             "\n" ++
             "class Test" ++ capitalizeFirst(mod_name) ++ "(unittest.TestCase):\n";
@@ -706,9 +714,15 @@ fn generateBenchContent(comptime config: anytype) []const u8 {
             break :blk config.name[0..len];
         };
 
+        const bench_pkg_import: []const u8 = if (mod_name.len > 1 and mod_name[0] == '_')
+            "import " ++ mod_name[1..] ++ "\n"
+        else
+            "";
+
         var result: []const u8 =
             "import timeit\n" ++
             "import " ++ mod_name ++ "\n" ++
+            bench_pkg_import ++
             "\n" ++
             "\n" ++
             "def run_benchmarks():\n" ++

src/version.zig

@@ -3,7 +3,7 @@
 
 pub const major: u8 = 0;
 pub const minor: u8 = 11;
-pub const patch: u8 = 1;
+pub const patch: u8 = 2;
 
 /// Pre-release identifier (e.g., "alpha", "beta", "rc1", or null for release)
 pub const pre_release: ?[]const u8 = null;