Merge pull request #145 from robbielyman/zig-0.14

feat(build): update to latest Zig

Author: robbielyman

.gitignore

@@ -7,7 +7,7 @@ __pycache__/
 .lock-waf*
 .cache/
 config.log
-zig-cache/
+.zig-cache/
 zig-out/
 lua/core/.DS_Store
 lua/.DS_Store

README.md

@@ -46,8 +46,8 @@ brew install freetype2 harfbuzz ncurses
 
 alternatively to install with homebrew, do
 ```bash
-brew tap ryleelyman/seamstress
-brew install seamstress
+brew tap robbielyman/seamstress
+brew install seamstress@1
 ```
 
 on linux, additional requirements include `alsa`.
@@ -65,8 +65,9 @@ and will not work as expected if you move only the binary to a different folder.
 ## building from source
 
 
-building seamstress from source requires version 0.11.0 of [zig](https://github.com/ziglang/zig).
+building seamstress from source requires the latest stable version of [zig](https://github.com/ziglang/zig).
 the easiest way to get zig is to download a binary from [here](https://ziglang.org/download/) and add it to your PATH.
+(be sure that you do not choose a download from the "master" section.)
 seamstress follows releases of zig.
 to build seamstress, install the dependencies listed above (as well as `pkg-config`) and invoke
 

build.zig

@@ -34,14 +34,14 @@ pub fn build(b: *std.Build) void {
     exe.linkSystemLibrary("SDL2");
     exe.linkSystemLibrary("SDL2_image");
     exe.linkSystemLibrary("SDL2_ttf");
-    const zig_lua = b.dependency("Lua", .{
+    const lua_wrapper = b.dependency("lua_wrapper", .{
         .target = target,
         .optimize = optimize,
     });
-    exe.root_module.addImport("ziglua", zig_lua.module("ziglua"));
-    exe.linkSystemLibrary("lua");
+    exe.root_module.addImport("lua_wrapper", lua_wrapper.module("lua_wrapper"));
+    // exe.linkSystemLibrary("lua");
 
-    const zig_link = b.dependency("link", .{
+    const zig_link = b.dependency("abl_link", .{
         .target = target,
         .optimize = optimize,
     });
@@ -51,9 +51,9 @@ pub fn build(b: *std.Build) void {
     switch (target.result.os.tag) {
         .macos => {
             exe.addLibraryPath(.{ .cwd_relative = "/opt/homebrew/opt/readline/lib" });
-            exe.addLibraryPath(.{ .cwd_relative = "/usr/local/opt/readline/lib" });
+            // exe.addLibraryPath(.{ .cwd_relative = "/usr/local/opt/readline/lib" });
             exe.addSystemIncludePath(.{ .cwd_relative = "/opt/homebrew/opt/readline/include" });
-            exe.addSystemIncludePath(.{ .cwd_relative = "/usr/local/opt/readline/include" });
+            // exe.addSystemIncludePath(.{ .cwd_relative = "/usr/local/opt/readline/include" });
         },
         else => {},
     }

build.zig.zon

@@ -6,16 +6,17 @@
         "build.zig",
         "build.zig.zon",
     },
-    .name = "seamstress",
-    .version = "1.4.5",
+    .name = .seamstress,
+    .fingerprint = 0xddf04d098cc31c65,
+    .version = "1.4.7",
     .dependencies = .{
-        .Lua = .{
-            .url = "git+https://github.com/natecraddock/ziglua#d853aa9450ae568a39ea02d7082e85bafc33f735",
-            .hash = "1220affeb3fe37ef09411b5a213b5fdf9bb6568e9913bade204694648983a8b2776d",
+        .abl_link = .{
+            .url = "git+https://github.com/robbielyman/zig-abl_link#c4fb74acb59662910833fd5cdca40f1c4bd8be0c",
+            .hash = "abl_link-3.1.1-kE5CL1FYAAAEILPom95ZVqlks0UezAKHuS2PuorYsCUF",
         },
-        .link = .{
-            .url = "git+https://github.com/ryleelyman/zig-abl_link#bca725468f88ef073cabc6da03696ceaa0af19c7",
-            .hash = "12205b92ab3c432ed67f84896ad0c4f89e1a3c3934bc9a34c16e98952eee717761ac",
+        .lua_wrapper = .{
+            .url = "git+https://github.com/natecraddock/ziglua#7bfb3c2b87220cdc89ef01cc99a200dad7a28e50",
+            .hash = "lua_wrapper-0.1.0-OyMC27fOBAAU3E2ueB-EWGSgsuCFQZL83pT0nQJ1ufOI",
         },
     },
 }

src/clock.zig

@@ -340,21 +340,11 @@ fn reschedule_sync_events() void {
 }
 
 pub fn stop() void {
-    const event = .{
-        .Clock_Transport = .{
-            .transport = .Stop,
-        },
-    };
-    events.post(event);
+    events.post(.{ .Clock_Transport = .{ .transport = .Stop } });
 }
 
 pub fn start() void {
-    const event = .{
-        .Clock_Transport = .{
-            .transport = .Start,
-        },
-    };
-    events.post(event);
+    events.post(.{ .Clock_Transport = .{ .transport = .Start } });
 }
 
 pub fn reset(beat: f64) void {

src/input.zig

@@ -89,11 +89,7 @@ fn inner() !void {
             continue;
         }
         _ = c.add_history(c_line);
-        const event = .{ .Exec_Code_Line = .{
-            .line = line,
-            .allocator = allocator,
-        } };
-        events.post(event);
+        events.post(.{ .Exec_Code_Line = .{ .line = line, .allocator = allocator } });
     }
     events.post(.{ .Quit = {} });
 }
@@ -124,13 +120,7 @@ fn bare_input_run() !void {
             quit = true;
             continue;
         }
-        const event = .{
-            .Exec_Code_Line = .{
-                .line = line,
-                .allocator = allocator,
-            },
-        };
-        events.post(event);
+        events.post(.{ .Exec_Code_Line = .{ .line = line, .allocator = allocator } });
     }
     events.post(.{ .Quit = {} });
 }

src/main.zig

@@ -13,7 +13,7 @@ const socket = @import("socket.zig");
 const watcher = @import("watcher.zig");
 const create = @import("create.zig");
 
-const VERSION = .{ .major = 1, .minor = 4, .patch = 6 };
+const VERSION: std.SemanticVersion = .{ .major = 1, .minor = 4, .patch = 7 };
 
 pub const std_options: std.Options = .{
     .log_level = .info,
@@ -29,7 +29,7 @@ pub fn main() !void {
     var go_again = true;
     timer = try std.time.Timer.start();
 
-    var loc_buf = [_]u8{0} ** std.fs.MAX_PATH_BYTES;
+    var loc_buf = [_]u8{0} ** std.fs.max_path_bytes;
     const location = try std.fs.selfExeDirPath(&loc_buf);
 
     const option = try args.parse(location);
@@ -94,7 +94,7 @@ pub fn main() !void {
         const height = try std.fmt.parseUnsigned(u16, args.height, 10);
         const assets_path = try std.fs.path.join(allocator, &.{ location, "..", "share", "seamstress", "resources" });
         defer allocator.free(assets_path);
-        var assets_buf = [_]u8{0} ** std.fs.MAX_PATH_BYTES;
+        var assets_buf = [_]u8{0} ** std.fs.max_path_bytes;
         const assets = try std.fs.realpath(assets_path, &assets_buf);
         try screen.init(width, height, assets);
         defer screen.deinit();
@@ -122,7 +122,7 @@ fn print_version() !void {
     var bw = std.io.bufferedWriter(stdout_file);
     const stdout = bw.writer();
     try stdout.print("SEAMSTRESS\n", .{});
-    try stdout.print("seamstress version: {d}.{d}.{d}\n", VERSION);
+    try stdout.print("seamstress version: {d}.{d}.{d}\n", .{ VERSION.major, VERSION.minor, VERSION.patch });
     try bw.flush();
 }
 

src/metros.zig

@@ -37,8 +37,7 @@ const Metro = struct {
         self.thread = null;
     }
     fn bang(self: *Metro) void {
-        const event = .{ .Metro = .{ .id = self.id, .stage = self.stage } };
-        events.post(event);
+        events.post(.{ .Metro = .{ .id = self.id, .stage = self.stage } });
     }
     fn init(self: *Metro, delta: u64, count: i64) !void {
         self.delta = delta;

src/midi.zig

@@ -160,7 +160,8 @@ fn add_devices() !void {
         input: bool,
         output: bool,
     };
-    var is_active: [32]Is_Active = .{.{ .input = false, .output = false }} ** 32;
+    const initial: Is_Active = .{ .input = false, .output = false };
+    var is_active: [32]Is_Active = .{initial} ** 32;
     const in_count = c.rtmidi_get_port_count(midi_in_counter);
     for (0..in_count) |i| {
         var len: c_int = 256;

src/monome.zig

@@ -138,12 +138,7 @@ pub fn add(name: []const u8, dev_type: []const u8, port: i32) void {
         if (std.mem.eql(u8, n, name)) {
             if (device.connected == true) return;
             device.connected = true;
-            const event = .{
-                .Monome_Add = .{
-                    .dev = device,
-                },
-            };
-            events.post(event);
+            events.post(.{ .Monome_Add = .{ .dev = device } });
             device.set_port();
             return;
         }
@@ -159,10 +154,7 @@ pub fn add(name: []const u8, dev_type: []const u8, port: i32) void {
             device.m_type = .Arc;
             device.quads = 4;
             device.connected = true;
-            const event = .{
-                .Monome_Add = .{ .dev = device },
-            };
-            events.post(event);
+            events.post(.{ .Monome_Add = .{ .dev = device } });
             device.set_port();
         } else {
             device.m_type = .Grid;
@@ -179,12 +171,7 @@ pub fn remove(name: []const u8) void {
         const n = device.name orelse continue;
         if (std.mem.eql(u8, n, name)) {
             device.connected = false;
-            const event = .{
-                .Monome_Remove = .{
-                    .id = device.id,
-                },
-            };
-            events.post(event);
+            events.post(.{ .Monome_Remove = .{ .id = device.id } });
             return;
         }
     }
@@ -270,10 +257,7 @@ fn handle_size(
     device.quads = @intCast(@divExact(argv[0].*.i * argv[1].*.i, 64));
     if (!device.connected) {
         device.connected = true;
-        const event = .{
-            .Monome_Add = .{ .dev = device },
-        };
-        events.post(event);
+        events.post(.{ .Monome_Add = .{ .dev = device } });
     }
     return 0;
 }
@@ -291,15 +275,7 @@ fn handle_grid_key(
     _ = types;
     _ = path;
     const device: *Monome = @ptrCast(@alignCast(user_data orelse return 1));
-    const event = .{
-        .Grid_Key = .{
-            .id = device.id,
-            .x = argv[0].*.i,
-            .y = argv[1].*.i,
-            .state = argv[2].*.i,
-        },
-    };
-    events.post(event);
+    events.post(.{ .Grid_Key = .{ .id = device.id, .x = argv[0].*.i, .y = argv[1].*.i, .state = argv[2].*.i } });
     return 0;
 }
 
@@ -316,14 +292,7 @@ fn handle_arc_key(
     _ = types;
     _ = path;
     const device: *Monome = @ptrCast(@alignCast(user_data orelse return 1));
-    const event = .{
-        .Arc_Key = .{
-            .id = device.id,
-            .ring = argv[0].*.i,
-            .state = argv[1].*.i,
-        },
-    };
-    events.post(event);
+    events.post(.{ .Arc_Key = .{ .id = device.id, .ring = argv[0].*.i, .state = argv[1].*.i } });
     return 0;
 }
 
@@ -340,14 +309,7 @@ fn handle_delta(
     _ = types;
     _ = path;
     const device: *Monome = @ptrCast(@alignCast(user_data orelse return 1));
-    const event = .{
-        .Arc_Encoder = .{
-            .id = device.id,
-            .ring = argv[0].*.i,
-            .delta = argv[1].*.i,
-        },
-    };
-    events.post(event);
+    events.post(.{ .Arc_Encoder = .{ .id = device.id, .ring = argv[0].*.i, .delta = argv[1].*.i } });
     return 0;
 }
 
@@ -364,15 +326,12 @@ fn handle_tilt(
     _ = types;
     _ = path;
     const device: *Monome = @ptrCast(@alignCast(user_data orelse return 1));
-    const event = .{
-        .Grid_Tilt = .{
-            .id = device.id,
-            .sensor = argv[0].*.i,
-            .x = argv[1].*.i,
-            .y = argv[2].*.i,
-            .z = argv[3].*.i,
-        },
-    };
-    events.post(event);
+    events.post(.{ .Grid_Tilt = .{
+        .id = device.id,
+        .sensor = argv[0].*.i,
+        .x = argv[1].*.i,
+        .y = argv[2].*.i,
+        .z = argv[3].*.i,
+    } });
     return 0;
 }