Put the znk tool into a different directory

3 files changed, 24 insertions, 17 deletions

diff --git a/README.md b/README.md
index 815b8f4..b4b81a2 100644
--- a/README.md
+++ b/README.md
@@ -11,9 +11,10 @@ Contains a tool called `znk` which is a clone of the [`nk` tool](https://github.
 
 Zig master works at the time of writing.
 
-Use `zig build` to build (the library and the `znk` tool).
+Use `zig build` to build the library.
+Use `zig build znk` to build the `znk` tool.
 
-The `znk` tool can be run by using `zig build run`.
+The `znk` tool can be run by using `zig build znk-run`.
 
 Tests for the library can be run by using `zig build test`.
 Tests for the `znk` tool can be run by using `zig build znk-test`.
diff --git a/build.zig b/build.zig
index 436cdf9..18f0b6f 100644
--- a/build.zig
+++ b/build.zig
@@ -22,28 +22,34 @@ pub fn build(b: *std.build.Builder) !void {
     lib_tests.setBuildMode(mode);
     lib_tests.addBuildOption([:0]const u8, "version", try b.allocator.dupeZ(u8, version));
 
-    var znk_tests = b.addTest("src/znk.zig");
-    znk_tests.setBuildMode(mode);
-    znk_tests.addBuildOption([:0]const u8, "version", try b.allocator.dupeZ(u8, version));
-
     const test_step = b.step("test", "Run library tests");
     test_step.dependOn(&lib_tests.step);
 
+    var znk_tests = b.addTest("tool/znk.zig");
+    znk_tests.setBuildMode(mode);
+    znk_tests.addPackagePath("nkeys", "src/nkeys.zig");
+    znk_tests.addBuildOption([:0]const u8, "version", try b.allocator.dupeZ(u8, version));
+
     const znk_test_step = b.step("znk-test", "Run znk tests");
     znk_test_step.dependOn(&znk_tests.step);
 
-    const exe = b.addExecutable("znk", "src/znk.zig");
-    exe.setTarget(target);
-    exe.setBuildMode(mode);
-    exe.addBuildOption([:0]const u8, "version", try b.allocator.dupeZ(u8, version));
-    exe.install();
+    const znk = b.addExecutable("znk", "tool/znk.zig");
+    znk.setTarget(target);
+    znk.setBuildMode(mode);
+    znk.addPackagePath("nkeys", "src/nkeys.zig");
+    znk.addBuildOption([:0]const u8, "version", try b.allocator.dupeZ(u8, version));
+
+    const znk_install = b.addInstallArtifact(znk);
+
+    const znk_step = b.step("znk", "Build only znk");
+    znk_step.dependOn(&znk_install.step);
 
-    const run_cmd = exe.run();
-    run_cmd.step.dependOn(b.getInstallStep());
+    const znk_run_cmd = znk.run();
+    znk_run_cmd.step.dependOn(&znk_install.step);
     if (b.args) |args| {
-        run_cmd.addArgs(args);
+        znk_run_cmd.addArgs(args);
     }
 
-    const run_step = b.step("run", "Run znk");
-    run_step.dependOn(&run_cmd.step);
+    const znk_run_step = b.step("znk-run", "Run znk");
+    znk_run_step.dependOn(&znk_run_cmd.step);
 }
diff --git a/src/znk.zig b/tool/znk.zig
index 8be7713..6097a09 100644
--- a/src/znk.zig
+++ b/tool/znk.zig
@@ -6,7 +6,7 @@ const builtin = std.builtin;
 const fs = std.fs;
 const io = std.io;
 const mem = std.mem;
-const nkeys = @import("nkeys.zig");
+const nkeys = @import("nkeys");
 const process = std.process;
 const testing = std.testing;