Skip to content

Commit 56a6da1

Browse files
committed
update: support for zig 0.14.0
1 parent bb28391 commit 56a6da1

File tree

3 files changed

+42
-91
lines changed

3 files changed

+42
-91
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
matrix:
1515
os: [ubuntu-latest]
16-
version: [0.11.0, 0.12.0, 0.12.1, 0.13.0, ""]
16+
version: [0.14.0, ""]
1717
fail-fast: false
1818
runs-on: ${{ matrix.os }}
1919
steps:

build.zig

Lines changed: 34 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,47 @@
11
const std = @import("std");
22
const builtin = @import("builtin");
33

4-
const min_zig_string = "0.11.0";
5-
6-
const current_zig = builtin.zig_version;
7-
8-
comptime {
9-
const min_zig = std.SemanticVersion.parse(min_zig_string) catch unreachable;
10-
if (current_zig.order(min_zig) == .lt) {
11-
const err_msg = std.fmt.comptimePrint(
12-
"Your Zig version v{} does not meet the minimum build requirement of v{}",
13-
.{ current_zig, min_zig },
14-
);
15-
@compileError(err_msg);
16-
}
17-
}
4+
const Build = std.Build;
5+
const Module = Build.Module;
6+
const OptimizeMode = std.builtin.OptimizeMode;
187

198
pub fn build(b: *std.Build) void {
20-
switch (current_zig.minor) {
21-
11 => version_11.build(b),
22-
12, 13, 14 => version_12.build(b),
23-
else => @compileError("unknown version!"),
24-
}
25-
}
26-
27-
const version_11 = struct {
28-
pub fn build(b: *std.Build) void {
29-
const target = b.standardTargetOptions(.{});
30-
const optimize = b.standardOptimizeOption(.{});
31-
32-
const msgpack = b.addModule("msgpack", .{
33-
.source_file = .{
34-
.path = "src/msgpack.zig",
35-
},
36-
});
37-
38-
const test_step = b.step("test", "Run unit tests");
9+
const target = b.standardTargetOptions(.{});
10+
const optimize = b.standardOptimizeOption(.{});
3911

40-
const msgpack_unit_tests = b.addTest(.{
41-
.root_source_file = .{
42-
.path = "src/test.zig",
43-
},
44-
.target = target,
45-
.optimize = optimize,
46-
});
12+
const msgpack = b.addModule("msgpack", .{
13+
.root_source_file = b.path(b.pathJoin(&.{ "src", "msgpack.zig" })),
14+
});
4715

48-
msgpack_unit_tests.addModule("msgpack", msgpack);
49-
const run_msgpack_tests = b.addRunArtifact(msgpack_unit_tests);
50-
test_step.dependOn(&run_msgpack_tests.step);
51-
}
52-
};
16+
generateDocs(b, optimize, target);
5317

54-
const version_12 = struct {
55-
const Build = std.Build;
56-
const Module = Build.Module;
57-
const OptimizeMode = std.builtin.OptimizeMode;
18+
const test_step = b.step("test", "Run unit tests");
5819

59-
pub fn build(b: *std.Build) void {
60-
const target = b.standardTargetOptions(.{});
61-
const optimize = b.standardOptimizeOption(.{});
62-
63-
const msgpack = b.addModule("msgpack", .{
64-
.root_source_file = b.path(b.pathJoin(&.{ "src", "msgpack.zig" })),
65-
});
66-
67-
generateDocs(b, optimize, target);
68-
69-
const test_step = b.step("test", "Run unit tests");
70-
71-
const msgpack_unit_tests = b.addTest(.{
72-
.root_source_file = b.path(b.pathJoin(&.{ "src", "test.zig" })),
73-
.target = target,
74-
.optimize = optimize,
75-
});
76-
msgpack_unit_tests.root_module.addImport("msgpack", msgpack);
77-
const run_msgpack_tests = b.addRunArtifact(msgpack_unit_tests);
78-
test_step.dependOn(&run_msgpack_tests.step);
79-
}
20+
const msgpack_unit_tests = b.addTest(.{
21+
.root_source_file = b.path(b.pathJoin(&.{ "src", "test.zig" })),
22+
.target = target,
23+
.optimize = optimize,
24+
});
25+
msgpack_unit_tests.root_module.addImport("msgpack", msgpack);
26+
const run_msgpack_tests = b.addRunArtifact(msgpack_unit_tests);
27+
test_step.dependOn(&run_msgpack_tests.step);
28+
}
8029

81-
fn generateDocs(b: *Build, optimize: OptimizeMode, target: Build.ResolvedTarget) void {
82-
const lib = b.addObject(.{
83-
.name = "zig-msgpack",
84-
.root_source_file = b.path(b.pathJoin(&.{ "src", "msgpack.zig" })),
85-
.target = target,
86-
.optimize = optimize,
87-
});
30+
fn generateDocs(b: *Build, optimize: OptimizeMode, target: Build.ResolvedTarget) void {
31+
const lib = b.addObject(.{
32+
.name = "zig-msgpack",
33+
.root_source_file = b.path(b.pathJoin(&.{ "src", "msgpack.zig" })),
34+
.target = target,
35+
.optimize = optimize,
36+
});
8837

89-
const docs_step = b.step("docs", "Emit docs");
38+
const docs_step = b.step("docs", "Emit docs");
9039

91-
const docs_install = b.addInstallDirectory(.{
92-
.source_dir = lib.getEmittedDocs(),
93-
.install_dir = .prefix,
94-
.install_subdir = "docs",
95-
});
40+
const docs_install = b.addInstallDirectory(.{
41+
.source_dir = lib.getEmittedDocs(),
42+
.install_dir = .prefix,
43+
.install_subdir = "docs",
44+
});
9645

97-
docs_step.dependOn(&docs_install.step);
98-
}
99-
};
46+
docs_step.dependOn(&docs_install.step);
47+
}

build.zig.zon

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
.{
2-
.name = "zig-msgpack",
3-
.version = "0.0.2",
4-
.minimum_zig_version = "0.11.0",
2+
.name = .zig_msgpack,
3+
.version = "0.0.7",
4+
.fingerprint = 0x14a3e10e78eefb7a,
5+
.minimum_zig_version = "0.14.0",
56
.dependencies = .{},
67
.paths = .{
7-
"",
8+
"build.zig",
9+
"build.zig.zon",
10+
"src",
811
},
912
}

0 commit comments

Comments
 (0)