authorgravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2021-02-20 18:51:48 -08:00
committergravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2021-02-20 18:51:48 -08:00
log6b05885c0f4c10e3a6fed3c62fe3c264e0b1e30c
treee287792f2fdde1c911fcb3c0b4dc9a8a50139418
parent345ff6f14e0cf40ddcf2fb6ec9634d868f55acb5

util- add missing yaml references

3 files changed, 4 insertions(+), 1 deletions(-)

src/util/dep.zig+2
...@@ -3,6 +3,7 @@ const gpa = std.heap.c_allocator;...@@ -3,6 +3,7 @@ const gpa = std.heap.c_allocator;
3const builtin = @import("builtin");3const builtin = @import("builtin");
44
5const u = @import("index.zig");5const u = @import("index.zig");
6const yaml = @import("./yaml.zig");
67
7//8//
8//9//
...@@ -22,6 +23,7 @@ pub const Dep = struct {...@@ -22,6 +23,7 @@ pub const Dep = struct {
22 c_source_files: [][]const u8,23 c_source_files: [][]const u8,
23 only_os: [][]const u8,24 only_os: [][]const u8,
24 except_os: [][]const u8,25 except_os: [][]const u8,
26 yaml: yaml.Mapping,
2527
26 pub fn clean_path(self: Dep) ![]const u8 {28 pub fn clean_path(self: Dep) ![]const u8 {
27 var p = self.path;29 var p = self.path;
src/util/modfile.zig+1
...@@ -63,6 +63,7 @@ pub const ModFile = struct {...@@ -63,6 +63,7 @@ pub const ModFile = struct {
63 .c_source_files = try item.mapping.get_string_array(alloc, "c_source_files"),63 .c_source_files = try item.mapping.get_string_array(alloc, "c_source_files"),
64 .only_os = try u.list_remove(try u.split(item.mapping.get_string("only_os"), ","), ""),64 .only_os = try u.list_remove(try u.split(item.mapping.get_string("only_os"), ","), ""),
65 .except_os = try u.list_remove(try u.split(item.mapping.get_string("except_os"), ","), ""),65 .except_os = try u.list_remove(try u.split(item.mapping.get_string("except_os"), ","), ""),
66 .yaml = item.mapping,
66 });67 });
67 }68 }
68 }69 }
src/util/module.zig+1-1
...@@ -36,7 +36,7 @@ pub const Module = struct {...@@ -36,7 +36,7 @@ pub const Module = struct {
36 .clean_path = try dep.clean_path(),36 .clean_path = try dep.clean_path(),
37 .only_os = dep.only_os,37 .only_os = dep.only_os,
38 .except_os = dep.except_os,38 .except_os = dep.except_os,
39 .yaml = null,39 .yaml = dep.yaml,
40 };40 };
41 }41 }
4242