idkkkkk

diff --git a/build.zig b/build.zig
index 6f0bd08df5b7ff71616a9e63b9b893ebc17fb9a2..cf8bb7b198c2878454699daa5f0ed3661b60cfb1 100644 (file)
--- a/build.zig
+++ b/build.zig
@@ -1,90 +1,41 @@
 const std = @import("std");
 
-// Although this function looks imperative, note that its job is to
-// declaratively construct a build graph that will be executed by an external
-// runner.
 pub fn build(b: *std.Build) void {
-    // Standard target options allows the person running `zig build` to choose
-    // what target to build for. Here we do not override the defaults, which
-    // means any target is allowed, and the default is native. Other options
-    // for restricting supported target set are available.
     const target = b.standardTargetOptions(.{});
 
-    // Standard optimization options allow the person running `zig build` to select
-    // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do not
-    // set a preferred release mode, allowing the user to decide how to optimize.
     const optimize = b.standardOptimizeOption(.{});
 
-    const exe = b.addExecutable(.{
-        .name = "lmdb",
-        // In this case the main source file is merely a path, however, in more
-        // complicated build scripts, this could be a generated file.
-        .root_source_file = .{ .cwd_relative = "src/main.zig" },
+    const mod = b.addModule("lmdb", .{
+        .root_source_file = .{ .src_path = .{ .owner = b, .sub_path = "src/lmdb.zig" } },
+        // .root_source_file = .{ .cwd_relative = "src/lmdb.zig" },
         .target = target,
         .optimize = optimize,
     });
 
-    exe.addIncludePath(.{ .cwd_relative = "./lmdb/libraries/liblmdb" });
+    mod.addIncludePath(.{ .cwd_relative = "./lmdb/libraries/liblmdb" });
 
-    exe.addCSourceFiles(.{ .files = &.{
+    mod.addCSourceFiles(.{ .files = &.{
         "./lmdb/libraries/liblmdb/midl.c",
         "./lmdb/libraries/liblmdb/mdb.c",
     } });
 
-    exe.linkLibC();
-
-    // This declares intent for the executable to be installed into the
-    // standard location when the user invokes the "install" step (the default
-    // step when running `zig build`).
-    b.installArtifact(exe);
-
-    // This *creates* a Run step in the build graph, to be executed when another
-    // step is evaluated that depends on it. The next line below will establish
-    // such a dependency.
-    const run_cmd = b.addRunArtifact(exe);
-
-    // By making the run step depend on the install step, it will be run from the
-    // installation directory rather than directly from within the cache directory.
-    // This is not necessary, however, if the application depends on other installed
-    // files, this ensures they will be present and in the expected location.
-    run_cmd.step.dependOn(b.getInstallStep());
-
-    // This allows the user to pass arguments to the application in the build
-    // command itself, like this: `zig build run -- arg1 arg2 etc`
-    if (b.args) |args| {
-        run_cmd.addArgs(args);
-    }
-
-    // This creates a build step. It will be visible in the `zig build --help` menu,
-    // and can be selected like this: `zig build run`
-    // This will evaluate the `run` step rather than the default, which is "install".
-    const run_step = b.step("run", "Run the app");
-    run_step.dependOn(&run_cmd.step);
-
-    // Creates a step for unit testing. This only builds the test executable
-    // but does not run it.
     const unit_tests = b.addTest(.{
-        .root_source_file = .{ .cwd_relative = "src/main.zig" },
+        .root_source_file = .{ .cwd_relative = "src/lmdb.zig" },
         .target = target,
         .optimize = optimize,
     });
 
     unit_tests.addIncludePath(.{ .cwd_relative = "./lmdb/libraries/liblmdb" });
-
     unit_tests.addCSourceFiles(.{ .files = &.{
         "./lmdb/libraries/liblmdb/midl.c",
         "./lmdb/libraries/liblmdb/mdb.c",
     } });
-
     unit_tests.linkLibC();
 
     const test_bin = b.addInstallBinFile(unit_tests.getEmittedBin(), "./lmdb_test");
 
     const run_unit_tests = b.addRunArtifact(unit_tests);
 
-    // Similar to creating the run step earlier, this exposes a `test` step to
-    // the `zig build --help` menu, providing a way for the user to request
-    // running the unit tests.
     const test_step = b.step("test", "Run unit tests");
     test_step.dependOn(&run_unit_tests.step);
     test_step.dependOn(&unit_tests.step);

diff --git a/build.zig.zon b/build.zig.zon
new file mode 100644 (file)
index 0000000..7c223de
--- /dev/null
+++ b/build.zig.zon
@@ -0,0 +1,9 @@
+.{
+    .name = "lmdb",
+    .version = "0.0.0",
+    .paths = .{
+        "src/lmdb.zig",
+        "build.zig",
+        "build.zig.zon",
+    },
+}

diff --git a/src/lmdb.zig b/src/lmdb.zig
index 8cc91f4cac3628f69162b157db6baabb6a416c6e..3802ec60e39741912d761c8e4b081c7a05e97b26 100644 (file)
--- a/src/lmdb.zig
+++ b/src/lmdb.zig
@@ -59,8 +59,10 @@ pub fn Cursor(comptime K: type, comptime V: type) type {
             var val: lmdb.MDB_val = undefined;
             return switch (lmdb.mdb_cursor_get(self.ptr, &key, &val, @intFromEnum(flags))) {
                 0 => {
-                    k.* = @as(*align(1) K, @ptrCast(key.mv_data)).*;
-                    return @as(?*align(1) V, @ptrCast(val.mv_data)).?.*;
+                    k.* = std.mem.bytesToValue(K, key.mv_data.?);
+                    return std.mem.bytesToValue(V, val.mv_data.?);
+                    //k.* = @as(*align(1) K, @ptrCast(key.mv_data)).*;
+                    //return @as(?*align(1) V, @ptrCast(val.mv_data)).?.*;
                 },
                 lmdb.MDB_NOTFOUND => null,
                 else => |err| {
@@ -136,7 +138,10 @@ pub fn Dbi(comptime K: type, comptime V: type) type {
             };
             var val: lmdb.MDB_val = undefined;
             return switch (lmdb.mdb_get(self.txn.ptr, self.ptr, &key, &val)) {
-                0 => @as(?*align(1) V, @ptrCast(val.mv_data)).?.*,
+                0 => {
+                    return std.mem.bytesToValue(V, val.mv_data.?);
+                    //@as(?*align(1) V, @ptrCast(val.mv_data)).?.*
+                },
                 else => |err| {
                     std.debug.print("get err: {}\n", .{err});
                     return null;