update

[ziglmdb] / build.zig

diff --git a/build.zig b/build.zig
index 6f0bd08df5b7ff71616a9e63b9b893ebc17fb9a2..79d8d8f06a6fcb18bd467aa70228a721e8830d1d 100644 (file)
--- a/build.zig
+++ b/build.zig
@@ -1,92 +1,59 @@
 const std = @import("std");
 
 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 {
 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(.{});
     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 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 lmdb = b.addModule("lmdb", .{
+        .root_source_file = b.path("src/lmdb.zig"),

         .target = target,
         .optimize = optimize,
     });
         .target = target,
         .optimize = optimize,
     });

-
-    exe.addIncludePath(.{ .cwd_relative = "./lmdb/libraries/liblmdb" });
-
-    exe.addCSourceFiles(.{ .files = &.{
-        "./lmdb/libraries/liblmdb/midl.c",
-        "./lmdb/libraries/liblmdb/mdb.c",
+    lmdb.addIncludePath(b.path("lmdb"));
+    lmdb.addCSourceFiles(.{ .files = &.{
+        "./lmdb/midl.c",
+        "./lmdb/mdb.c",

     } });
     } });

+    lmdb.link_libc = true;

 
 

-    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" },
+    const db = b.addModule("db", .{
+        .root_source_file = b.path("src/db.zig"),

         .target = target,
         .optimize = optimize,
     });
         .target = target,
         .optimize = optimize,
     });

+    db.addImport("lmdb", lmdb);

 
 

-    unit_tests.addIncludePath(.{ .cwd_relative = "./lmdb/libraries/liblmdb" });
-
-    unit_tests.addCSourceFiles(.{ .files = &.{
-        "./lmdb/libraries/liblmdb/midl.c",
-        "./lmdb/libraries/liblmdb/mdb.c",
+    const lmdb_tests = b.addTest(.{
+        .root_module = lmdb,
+    });
+    lmdb_tests.addIncludePath(b.path("lmdb"));
+    lmdb_tests.addCSourceFiles(.{ .files = &.{
+        "./lmdb/midl.c",
+        "./lmdb/mdb.c",

     } });
     } });

+    lmdb_tests.linkLibC();

 
 

-    unit_tests.linkLibC();
+    const db_tests = b.addTest(.{
+        .root_module = db,
+    });
+    db_tests.root_module.addImport("lmdb", lmdb);

 
 

-    const test_bin = b.addInstallBinFile(unit_tests.getEmittedBin(), "./lmdb_test");
+    const lmdb_test_bin = b.addInstallBinFile(lmdb_tests.getEmittedBin(), "./lmdb_test");
+    const db_test_bin = b.addInstallBinFile(db_tests.getEmittedBin(), "./db_test");

 
 

-    const run_unit_tests = b.addRunArtifact(unit_tests);
+    const run_lmdb_tests = b.addRunArtifact(lmdb_tests);
+    const run_db_tests = b.addRunArtifact(db_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");
     const test_step = b.step("test", "Run unit tests");

-    test_step.dependOn(&run_unit_tests.step);
-    test_step.dependOn(&unit_tests.step);
-    test_step.dependOn(&test_bin.step);
+    test_step.result_cached = false;
+    test_step.dependOn(&run_lmdb_tests.step);
+    test_step.dependOn(&lmdb_tests.step);
+    test_step.dependOn(&run_db_tests.step);
+    test_step.dependOn(&db_tests.step);
+    test_step.dependOn(&lmdb_test_bin.step);
+    test_step.dependOn(&db_test_bin.step);
+
+    const check = b.step("check", "Check if ziglmdb compiles");
+    check.dependOn(&lmdb_tests.step);
+    check.dependOn(&db_tests.step);

 }
 }