zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

examples: ensure zmath submodule is cloned during zig build

Browse source 
Fixes the issue people are running into at e.g.:

* https://old.reddit.com/r/Zig/comments/u622dq/mach_engine_webgpu_examples_showcase/i564w4s/
* https://twitter.com/slimsag/status/1515925666230784000?s=20&t=M2KXFUcLZT0-mJAcMy6sPw

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2022-04-17 23:00:12 -07:00
parent 3fb59a1e34
commit e9671f388c
1 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

23
build.zig
View file

@ -24,6 +24,9 @@ pub fn build(b: *std.build.Builder) void {
const test_step = b.step("test", "Run library tests"); const test_step = b.step("test", "Run library tests");
test_step.dependOn(&main_tests.step); test_step.dependOn(&main_tests.step);
// TODO(build-system): https://github.com/hexops/mach/issues/229#issuecomment-1100958939
ensureDependencySubmodule(b.allocator, "examples/libs/zmath") catch unreachable;
inline for ([_]ExampleDefinition{ inline for ([_]ExampleDefinition{
.{ .name = "triangle" }, .{ .name = "triangle" },
.{ .name = "boids" }, .{ .name = "boids" },
@ -60,7 +63,13 @@ const ExampleDefinition = struct {
}; };
const Packages = struct { const Packages = struct {
const zmath = @import("examples/libs/zmath/build.zig").pkg; const zmath = zmath_pkg;
};
// Declared here because submodule may not be cloned at the time build.zig runs.
const zmath_pkg = std.build.Pkg{
.name = "zmath",
.path = .{ .path = "examples/libs/zmath/src/zmath.zig" },
}; };
pub const pkg = std.build.Pkg{ pub const pkg = std.build.Pkg{
@ -93,3 +102,15 @@ pub fn link(b: *std.build.Builder, step: *std.build.LibExeObjStep, options: Opti
fn thisDir() []const u8 { fn thisDir() []const u8 {
return std.fs.path.dirname(@src().file) orelse "."; return std.fs.path.dirname(@src().file) orelse ".";
} }
fn ensureDependencySubmodule(allocator: std.mem.Allocator, path: []const u8) !void {
if (std.process.getEnvVarOwned(allocator, "NO_ENSURE_SUBMODULES")) |no_ensure_submodules| {
if (std.mem.eql(u8, no_ensure_submodules, "true")) return;
} else |_| {}
const child = try std.ChildProcess.init(&.{ "git", "submodule", "update", "--init", path }, allocator);
child.cwd = thisDir();
child.stderr = std.io.getStdErr();
child.stdout = std.io.getStdOut();
_ = try child.spawnAndWait();
}