authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-14 00:46:40-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-14 00:46:40-04:00
logfaa3c40b542f7e6f4d98e8ca542bb47dd603e358
treec84c4e20bdf98a0ed12f98d69ea3e0384a1e7e39
parent66d7370facc63648eb85fb7f1b94753ab0823ff3
signature Commit is signed but in an unrecognized format.

fix docgen, which relied on stdout being path to binary

1 files changed, 18 insertions(+), 2 deletions(-)

doc/docgen.zig+18-2
......@@ -1096,6 +1096,9 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
10961096 try build_args.append("-lc");
10971097 try out.print(" -lc", .{});
10981098 }
1099 const target = try std.zig.CrossTarget.parse(.{
1100 .arch_os_abi = code.target_str orelse "native",
1101 });
10991102 if (code.target_str) |triple| {
11001103 try build_args.appendSlice(&[_][]const u8{ "-target", triple });
11011104 if (!code.is_inline) {
......@@ -1150,7 +1153,15 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
11501153 }
11511154 }
11521155
1153 const path_to_exe = mem.trim(u8, exec_result.stdout, " \r\n");
1156 const path_to_exe_dir = mem.trim(u8, exec_result.stdout, " \r\n");
1157 const path_to_exe_basename = try std.fmt.allocPrint(allocator, "{}{}", .{
1158 code.name,
1159 target.exeFileExt(),
1160 });
1161 const path_to_exe = try fs.path.join(allocator, &[_][]const u8{
1162 path_to_exe_dir,
1163 path_to_exe_basename,
1164 });
11541165 const run_args = &[_][]const u8{path_to_exe};
11551166
11561167 var exited_with_signal = false;
......@@ -1486,7 +1497,12 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
14861497}
14871498
14881499fn exec(allocator: *mem.Allocator, env_map: *std.BufMap, args: []const []const u8) !ChildProcess.ExecResult {
1489 const result = try ChildProcess.exec(allocator, args, null, env_map, max_doc_file_size);
1500 const result = try ChildProcess.exec2(.{
1501 .allocator = allocator,
1502 .argv = args,
1503 .env_map = env_map,
1504 .max_output_bytes = max_doc_file_size,
1505 });
14901506 switch (result.term) {
14911507 .Exited => |exit_code| {
14921508 if (exit_code != 0) {