clanup build.zig

Author: ianic

build.zig

@@ -1,36 +1,17 @@
 const std = @import("std");
-const zlib = @import("zlib/zlib.zig");
-const Pkg = std.build.Pkg;
-
-pub const pkgs = struct {
-    pub const zlib = Pkg{
-        .name = "zlib",
-        .source = std.build.FileSource.relative("zlib/src/main.zig"),
-    };
-
-    pub const websocket = Pkg{
-        .name = "websocket",
-        .source = .{ .path = "src/main.zig" },
-        .dependencies = &[_]Pkg{
-            pkgs.zlib,
-        },
-    };
-};
+const ws = @import("websocket.zig");
 
 pub fn build(b: *std.build.Builder) void {
     // Standard release options allow the person running `zig build` to select
     // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall.
     const mode = b.standardReleaseOptions();
     const target = b.standardTargetOptions(.{});
 
-    const zlib_lib = zlib.create(b, target, mode);
-
-    const lib = b.addStaticLibrary("websocket", "src/main.zig");
-    lib.setBuildMode(mode);
-    b.installArtifact(lib);
+    const lib = ws.create(b, target, mode);
+    lib.step.install();
 
     const main_tests = b.addTest("src/main.zig");
-    zlib_lib.link(main_tests, .{ .import_name = "zlib" });
+    lib.link(main_tests);
     main_tests.setBuildMode(mode);
 
     const test_step = b.step("test", "Run library tests");
@@ -40,14 +21,11 @@ pub fn build(b: *std.build.Builder) void {
     inline for (.{
         "autobahn_client",
     }) |example_name| {
-        const example = b.addExecutable(example_name, "examples/" ++ example_name ++ ".zig");
-
-        zlib_lib.link(example, .{ .import_name = "zlib" });
-        example.addPackage(pkgs.websocket);
-
-        example.setBuildMode(mode);
-        example.setTarget(target);
-        example.install();
-        example_step.dependOn(&example.step);
+        const exe = b.addExecutable(example_name, "examples/" ++ example_name ++ ".zig");
+        lib.link(exe);
+        exe.setBuildMode(mode);
+        exe.setTarget(target);
+        exe.install();
+        example_step.dependOn(&exe.step);
     }
 }

websocket.zig

@@ -0,0 +1,39 @@
+const std = @import("std");
+const zlib = @import("zlib/zlib.zig");
+const Pkg = std.build.Pkg;
+
+fn root() []const u8 {
+    return std.fs.path.dirname(@src().file) orelse ".";
+}
+
+const root_path = root() ++ "/";
+const package_path = root_path ++ "src/main.zig";
+
+pub const Library = struct {
+    step: *std.build.LibExeObjStep,
+    zlib: zlib.Library,
+
+    pub fn link(self: Library, other: *std.build.LibExeObjStep) void {
+        other.linkLibrary(self.step);
+        self.zlib.link(other, .{ .import_name = "zlib" });
+        other.addPackage(Pkg{
+            .name = "websocket",
+            .source = .{ .path = root_path ++ "src/main.zig" },
+            .dependencies = &[_]Pkg{
+                Pkg{
+                    .name = "zlib",
+                    .source = .{ .path = root_path ++ "zlib/src/main.zig" },
+                },
+            },
+        });
+    }
+};
+
+pub fn create(b: *std.build.Builder, target: std.zig.CrossTarget, mode: std.builtin.Mode) Library {
+    var ret = b.addStaticLibrary("websocket", package_path);
+    ret.setTarget(target);
+    ret.setBuildMode(mode);
+    const zl = zlib.create(b, target, mode);
+    zl.link(ret, .{ .import_name = "zlib" });
+    return Library{ .step = ret, .zlib = zl };
+}

zlib/src/main.zig

@@ -279,7 +279,7 @@ pub fn Decompressor(comptime ReaderType: type) type {
         }
 
         pub fn read(self: *Self, buf: []u8) ReaderError!usize {
-            std.debug.print("pos: {d} buf.len {d}\n", .{ self.pos, buf.len });
+            //std.debug.print("pos: {d} buf.len {d}\n", .{ self.pos, buf.len });
             self.pos += try self.inner.readAll(self.tmp[self.pos..]);
 
             self.stream.next_in = &self.tmp;