move logic to helpers

Author: JRMurr

build.zig

@@ -21,6 +21,7 @@ pub fn build(b: *std.Build) !void {
     });
 
     const config_header = getConfigHeader(b, t);
+    // b.addInstallHeaderFile(source: LazyPath, dest_rel_path: []const u8)
 
     // zig build of python
     const libpython = try buildLibPython(b, target, optimize, config_header);
@@ -66,6 +67,17 @@ pub fn build(b: *std.Build) !void {
         run_step.dependOn(&run_cmd.step);
         examples_step.dependOn(&exe.step);
     }
+
+    const translate_step = b.step("translate", "Translates the c files");
+
+    const config_translate = translateFile(b, b.path("Include/cpython/initconfig.h"), target, optimize, config_header);
+    const translate_install = b.addInstallDirectory(.{
+        .source_dir = config_translate.getOutput(),
+        .install_dir = .{ .custom = "translate" },
+        .install_subdir = "headers",
+    });
+
+    translate_step.dependOn(&translate_install.step);
 }
 
 fn getModule(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.builtin.Mode) *std.Build.Module {
@@ -103,6 +115,29 @@ fn addIncludes(
     step.addConfigHeader(config_header);
 }
 
+fn translateFile(
+    b: *std.Build,
+    file: std.Build.LazyPath,
+    target: std.Build.ResolvedTarget,
+    optimize: std.builtin.OptimizeMode,
+    config_header: *std.Build.Step.ConfigHeader,
+) *Step.TranslateC {
+    const step = b.addTranslateC(.{
+        .root_source_file = file,
+        .target = target,
+        .optimize = optimize,
+    });
+
+    step.step.dependOn(&config_header.step);
+
+    step.addIncludeDir(b.path("Include/internal").getPath(b));
+    step.addIncludeDir(b.path(".").getPath(b));
+    step.addIncludeDir(b.path("Include").getPath(b));
+    // step.addIncludeDir(config_header.output_file.getPath());
+
+    return step;
+}
+
 fn buildCpython(
     b: *std.Build,
     target: std.Build.ResolvedTarget,

examples/simple_string.zig

@@ -1,73 +1,10 @@
 const std = @import("std");
 const py = @import("python");
 
-pub fn utf8ToUtf32Z(
-    in: []const u8,
-    allocator: std.mem.Allocator,
-) ![:0]const u32 {
-    var buffer = std.ArrayList(u32).init(allocator);
-    for (in) |char| {
-        try buffer.append(char);
-    }
-    return buffer.toOwnedSliceSentinel(0);
-}
-
-fn init_from_config(config: *py.types.PyConfig) !void {
-    const status = py.externs.Py_InitializeFromConfig(config);
-
-    // std.debug.print("END STATUS: {}\n", .{&status});
-
-    if (py.externs.PyStatus_Exception(status)) {
-        return error.Expection;
-        // py.externs.Py_ExitStatusException(status);
-    }
-}
-
-// https://github.com/Rexicon226/osmium/blob/e83ac667e006cf3a233c1868f76e57b155ba1739/src/frontend/Python.zig#L72
-pub fn Initialize(
-    allocator: std.mem.Allocator,
-) !void {
-    // _ = allocator;
-    var config: py.types.PyConfig = undefined;
-    py.externs.PyConfig_InitIsolatedConfig(&config);
-    defer py.externs.PyConfig_Clear(&config);
-
-    var status = py.externs.PyConfig_SetBytesString(
-        &config,
-        &config.program_name,
-        "./test",
-    );
-
-    if (py.externs.PyStatus_Exception(status)) {
-        py.externs.Py_ExitStatusException(status);
-    }
-
-    const utf32_path = try utf8ToUtf32Z(
-        py.constants.LIB_PATH,
-        allocator,
-    );
-
-    // need to set the search path to the python "Lib" folder
-    // https://docs.python.org/3/c-api/init_config.html#python-path-configuration
-    config.module_search_paths_set = 1;
-    status = py.externs.PyWideStringList_Append(
-        &config.module_search_paths,
-        utf32_path.ptr,
-    );
-
-    if (py.externs.PyStatus_Exception(status)) {
-        py.externs.Py_ExitStatusException(status);
-    }
-
-    try init_from_config(&config);
-
-    py.externs.PyConfig_Clear(&config);
-}
-
 pub fn main() !void {
     var gpa = std.heap.GeneralPurposeAllocator(.{}){};
     const allocator = gpa.allocator();
-    try Initialize(allocator);
+    try py.helpers.Initialize(allocator);
     defer py.externs.Py_Finalize();
 
     py.externs.PyRun_SimpleString(

src/helpers.zig

@@ -1,32 +1,56 @@
 const externs = @import("externs.zig");
+const types = @import("types.zig");
 const constants = @import("constants.zig");
 
-pub fn Sys_SetPath(path: [:0]const u16) void {
-    externs.PySys_SetPath(path.ptr);
+const std = @import("std");
+
+pub fn utf8ToUtf32Z(
+    in: []const u8,
+    allocator: std.mem.Allocator,
+) ![:0]const u32 {
+    var buffer = std.ArrayList(u32).init(allocator);
+    for (in) |char| {
+        try buffer.append(char);
+    }
+    return buffer.toOwnedSliceSentinel(0);
 }
 
-pub fn SetProgramName(name: [:0]const u8) void {
-    externs.Py_SetProgramName(name.ptr);
-}
-
-pub fn CompileString(source: [:0]const u8, filename: [:0]const u8) ?*anyopaque {
-    return externs.Py_CompileString(source.ptr, filename.ptr, constants.Py_file_input);
-}
-
-pub fn Marshal_WriteObjectToString(code: ?*anyopaque) ?*anyopaque {
-    return externs.PyMarshal_WriteObjectToString(code, constants.Py_MARSHAL_VERSION);
-}
-
-pub fn Bytes_Size(code: ?*anyopaque) usize {
-    return externs.PyBytes_Size(code);
-}
-
-pub fn Bytes_AsString(code: ?*anyopaque) ?[*:0]u8 {
-    return externs.PyBytes_AsString(code);
-}
-
-pub fn PrintError() void {
-    externs.PyErr_Print();
-
-    // TODO: fetch and normalize here
+pub fn Initialize(
+    allocator: std.mem.Allocator,
+) !void {
+    var config: types.PyConfig = undefined;
+    externs.PyConfig_InitIsolatedConfig(&config);
+    defer externs.PyConfig_Clear(&config);
+
+    var status = externs.PyConfig_SetBytesString(
+        &config,
+        &config.program_name,
+        "./test",
+    );
+
+    if (externs.PyStatus_Exception(status)) {
+        externs.Py_ExitStatusException(status);
+    }
+
+    const utf32_path = try utf8ToUtf32Z(
+        constants.LIB_PATH,
+        allocator,
+    );
+
+    // need to set the search path to the python "Lib" folder
+    // https://docs.python.org/3/c-api/init_config.html#python-path-configuration
+    config.module_search_paths_set = 1;
+    status = externs.PyWideStringList_Append(
+        &config.module_search_paths,
+        utf32_path.ptr,
+    );
+
+    if (externs.PyStatus_Exception(status)) {
+        externs.Py_ExitStatusException(status);
+    }
+
+    status = externs.Py_InitializeFromConfig(&config);
+    if (externs.PyStatus_Exception(status)) {
+        externs.Py_ExitStatusException(status);
+    }
 }