authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-03-09 01:00:45-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-03-09 01:00:45-05:00
log94e52dba85e4b81f5c4f2576c91df039604d06fb
tree1f2dc6ff88128caa53d15518f8c4fddac5b27556
parent5046aa9403e98fec7a744f35faa9d17925c9079d
signaturelock-open Commit is signed but in an unrecognized format.

fix docgen and fix unnecessarily adding .root suffix to objects

2 files changed, 19 insertions(+), 21 deletions(-)

doc/docgen.zig+14-12
...@@ -1011,8 +1011,10 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var...@@ -1011,8 +1011,10 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
1011 zig_exe,1011 zig_exe,
1012 "build-exe",1012 "build-exe",
1013 tmp_source_file_name,1013 tmp_source_file_name,
1014 "--output",1014 "--output-dir",
1015 tmp_bin_file_name,1015 tmp_dir_name,
1016 "--name",
1017 code.name,
1016 });1018 });
1017 try out.print("<pre><code class=\"shell\">$ zig build-exe {}.zig", code.name);1019 try out.print("<pre><code class=\"shell\">$ zig build-exe {}.zig", code.name);
1018 switch (code.mode) {1020 switch (code.mode) {
...@@ -1085,8 +1087,8 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var...@@ -1085,8 +1087,8 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
1085 zig_exe,1087 zig_exe,
1086 "test",1088 "test",
1087 tmp_source_file_name,1089 tmp_source_file_name,
1088 "--output",1090 "--output-dir",
1089 test_out_path,1091 tmp_dir_name,
1090 });1092 });
1091 try out.print("<pre><code class=\"shell\">$ zig test {}.zig", code.name);1093 try out.print("<pre><code class=\"shell\">$ zig test {}.zig", code.name);
1092 switch (code.mode) {1094 switch (code.mode) {
...@@ -1122,8 +1124,8 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var...@@ -1122,8 +1124,8 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
1122 "--color",1124 "--color",
1123 "on",1125 "on",
1124 tmp_source_file_name,1126 tmp_source_file_name,
1125 "--output",1127 "--output-dir",
1126 test_out_path,1128 tmp_dir_name,
1127 });1129 });
1128 try out.print("<pre><code class=\"shell\">$ zig test {}.zig", code.name);1130 try out.print("<pre><code class=\"shell\">$ zig test {}.zig", code.name);
1129 switch (code.mode) {1131 switch (code.mode) {
...@@ -1179,8 +1181,8 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var...@@ -1179,8 +1181,8 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
1179 zig_exe,1181 zig_exe,
1180 "test",1182 "test",
1181 tmp_source_file_name,1183 tmp_source_file_name,
1182 "--output",1184 "--output-dir",
1183 test_out_path,1185 tmp_dir_name,
1184 });1186 });
1185 switch (code.mode) {1187 switch (code.mode) {
1186 builtin.Mode.Debug => {},1188 builtin.Mode.Debug => {},
...@@ -1239,10 +1241,10 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var...@@ -1239,10 +1241,10 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
1239 tmp_source_file_name,1241 tmp_source_file_name,
1240 "--color",1242 "--color",
1241 "on",1243 "on",
1242 "--output",1244 "--name",
1243 tmp_obj_file_name,1245 code.name,
1244 "--output-h",1246 "--output-dir",
1245 output_h_file_name,1247 tmp_dir_name,
1246 });1248 });
12471249
1248 if (!code.is_inline) {1250 if (!code.is_inline) {
src/codegen.cpp+5-9
...@@ -9120,18 +9120,14 @@ static void resolve_out_paths(CodeGen *g) {...@@ -9120,18 +9120,14 @@ static void resolve_out_paths(CodeGen *g) {
9120 buf_init_from_buf(&g->output_file_path, g->link_objects.at(0));9120 buf_init_from_buf(&g->output_file_path, g->link_objects.at(0));
9121 return;9121 return;
9122 }9122 }
9123 if (!need_llvm_module(g) || (g->enable_cache && g->link_objects.length == 0)) {9123 if (need_llvm_module(g) && g->link_objects.length != 0 && !g->enable_cache &&
9124 // Either we're not creating an object file from our LLVM Module,9124 buf_eql_buf(o_basename, out_basename))
9125 // or we have caching enabled and do not need to link objects together.9125 {
9126 // In both cases, the output file path and object file path basename can match.
9127 buf_append_str(o_basename, target_o_file_ext(g->zig_target));
9128 buf_append_str(out_basename, target_o_file_ext(g->zig_target));
9129 } else {
9130 // make it not collide with main output object9126 // make it not collide with main output object
9131 buf_append_str(o_basename, ".root");9127 buf_append_str(o_basename, ".root");
9132 buf_append_str(o_basename, target_o_file_ext(g->zig_target));
9133 buf_append_str(out_basename, target_o_file_ext(g->zig_target));
9134 }9128 }
9129 buf_append_str(o_basename, target_o_file_ext(g->zig_target));
9130 buf_append_str(out_basename, target_o_file_ext(g->zig_target));
9135 break;9131 break;
9136 case OutTypeExe:9132 case OutTypeExe:
9137 buf_append_str(o_basename, target_o_file_ext(g->zig_target));9133 buf_append_str(o_basename, target_o_file_ext(g->zig_target));