Commit dd8c1da963b18a8d778c10cfa6d785e7f00df51e | zigmod

author	Meghan Denny <hello@nektro.net> 2021-04-09 01:42:00 -07:00
committer	Meghan Denny <hello@nektro.net> 2021-04-09 01:42:00 -07:00
log	dd8c1da963b18a8d778c10cfa6d785e7f00df51e
tree	28dd04f166217dc10c09189893d0606e3824682b
parent	772f3943a0a4e60e7f1108f96a0356f1a201a164
signature	Commit is signed but in an unrecognized format.

cmd/fetch- hide root module from deps.zig output

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

src/cmd/fetch.zig+12-3

...	...	@@ -70,6 +70,9 @@ pub fn execute(args: [][]u8) !void {
70	70	if (std.mem.eql(u8, mod.id, "root")) {
71	71	continue;
72	72	}
	73	if (mod.main.len == 0) {
	74	continue;
	75	}
73	76	try duped.append(mod);
74	77	}
75	78	try print_pkg_data_to(w, duped, &std.ArrayList(u.Module).init(gpa));
...	...	@@ -102,6 +105,9 @@ pub fn execute(args: [][]u8) !void {
102	105
103	106	fn print_ids(w: fs.File.Writer, list: []u.Module) !void {
104	107	for (list) \|mod\| {
	108	if (std.mem.eql(u8, mod.id, "root")) {
	109	continue;
	110	}
105	111	if (mod.is_sys_lib) {
106	112	continue;
107	113	}
...	...	@@ -111,6 +117,9 @@ fn print_ids(w: fs.File.Writer, list: []u.Module) !void {
111	117
112	118	fn print_paths(w: fs.File.Writer, list: []u.Module) !void {
113	119	for (list) \|mod\| {
	120	if (std.mem.eql(u8, mod.id, "root")) {
	121	continue;
	122	}
114	123	if (mod.is_sys_lib) {
115	124	continue;
116	125	}
...	...	@@ -156,7 +165,7 @@ fn print_incl_dirs_to(w: fs.File.Writer, list: []u.Module) !void {
156	165	}
157	166	for (mod.c_include_dirs) \|it\| {
158	167	if (i > 0) {
159		try w.print(" cache ++ _paths[{}] ++ \"{}\",\n", .{i, std.zig.fmtEscapes(it)});
	168	try w.print(" cache ++ _paths[{}] ++ \"{}\",\n", .{i-1, std.zig.fmtEscapes(it)});
160	169	} else {
161	170	try w.print(" \"{}\",\n", .{std.zig.fmtEscapes(it)});
162	171	}
...	...	@@ -171,9 +180,9 @@ fn print_csrc_dirs_to(w: fs.File.Writer, list: []u.Module) !void {
171	180	}
172	181	for (mod.c_source_files) \|it\| {
173	182	if (i > 0) {
174		try w.print(" {s}_ids[{}], cache ++ _paths[{}] ++ \"{s}\"{s},\n", .{"[_][]const u8{", i, i, it, "}"});
	183	try w.print(" {s}_ids[{}], cache ++ _paths[{}] ++ \"{s}\"{s},\n", .{"[_][]const u8{", i-1, i-1, it, "}"});
175	184	} else {
176		try w.print(" {s}_ids[{}], \".{}/{s}\"{s},\n", .{"[_][]const u8{", i, std.zig.fmtEscapes(mod.clean_path), it, "}"});
	185	try w.print(" {s}_ids[{}], \".{}/{s}\"{s},\n", .{"[_][]const u8{", i-1, std.zig.fmtEscapes(mod.clean_path), it, "}"});
177	186	}
178	187	}
179	188	}