authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-10-06 14:48:01-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-10-06 14:48:01-04:00
log86171afb9b7d7f1c1d5444f894e273ca40e87147
tree01a07f8b88c5fa4b5da12ad89e966cbf8d2f1e4e
parent571123465b2e030b7b9cf42732ed30f77192fbcd
signaturelock-open Commit is signed but in an unrecognized format.

generated docs: docs/ instead of doc/

This appears to be more of a standard directory name. See #21

2 files changed, 4 insertions(+), 4 deletions(-)

src/codegen.cpp+3-3
...@@ -10355,15 +10355,15 @@ void codegen_build_and_link(CodeGen *g) {...@@ -10355,15 +10355,15 @@ void codegen_build_and_link(CodeGen *g) {
10355 }10355 }
10356 }10356 }
10357 if (g->enable_doc_generation) {10357 if (g->enable_doc_generation) {
10358 Buf *doc_dir_path = buf_sprintf("%s" OS_SEP "doc", buf_ptr(g->output_dir));10358 Buf *doc_dir_path = buf_sprintf("%s" OS_SEP "docs", buf_ptr(g->output_dir));
10359 if ((err = os_make_path(doc_dir_path))) {10359 if ((err = os_make_path(doc_dir_path))) {
10360 fprintf(stderr, "Unable to create directory %s: %s\n", buf_ptr(doc_dir_path), err_str(err));10360 fprintf(stderr, "Unable to create directory %s: %s\n", buf_ptr(doc_dir_path), err_str(err));
10361 exit(1);10361 exit(1);
10362 }10362 }
10363 Buf *index_html_src_path = buf_sprintf("%s" OS_SEP "special" OS_SEP "doc" OS_SEP "index.html",10363 Buf *index_html_src_path = buf_sprintf("%s" OS_SEP "special" OS_SEP "docs" OS_SEP "index.html",
10364 buf_ptr(g->zig_std_dir));10364 buf_ptr(g->zig_std_dir));
10365 Buf *index_html_dest_path = buf_sprintf("%s" OS_SEP "index.html", buf_ptr(doc_dir_path));10365 Buf *index_html_dest_path = buf_sprintf("%s" OS_SEP "index.html", buf_ptr(doc_dir_path));
10366 Buf *main_js_src_path = buf_sprintf("%s" OS_SEP "special" OS_SEP "doc" OS_SEP "main.js",10366 Buf *main_js_src_path = buf_sprintf("%s" OS_SEP "special" OS_SEP "docs" OS_SEP "main.js",
10367 buf_ptr(g->zig_std_dir));10367 buf_ptr(g->zig_std_dir));
10368 Buf *main_js_dest_path = buf_sprintf("%s" OS_SEP "main.js", buf_ptr(doc_dir_path));10368 Buf *main_js_dest_path = buf_sprintf("%s" OS_SEP "main.js", buf_ptr(doc_dir_path));
1036910369
src/main.cpp+1-1
...@@ -65,7 +65,7 @@ static int print_full_usage(const char *arg0, FILE *file, int return_code) {...@@ -65,7 +65,7 @@ static int print_full_usage(const char *arg0, FILE *file, int return_code) {
65 " -ftime-report print timing diagnostics\n"65 " -ftime-report print timing diagnostics\n"
66 " -fstack-report print stack size diagnostics\n"66 " -fstack-report print stack size diagnostics\n"
67 " -fdump-analysis write analysis.json file with type information\n"67 " -fdump-analysis write analysis.json file with type information\n"
68 " -fgenerate-docs create a doc/ dir with html documentation\n"68 " -fgenerate-docs create a docs/ dir with html documentation\n"
69 " --libc [file] Provide a file which specifies libc paths\n"69 " --libc [file] Provide a file which specifies libc paths\n"
70 " --name [name] override output name\n"70 " --name [name] override output name\n"
71 " --output-dir [dir] override output directory (defaults to cwd)\n"71 " --output-dir [dir] override output directory (defaults to cwd)\n"