Commit 4c6f1e614a204293732004ef844e8bb057bdc212 | zig

CMakeLists.txt+8-5

...	...	@@ -597,7 +597,6 @@ set(ZIG_STD_FILES
597	597	"sort.zig"
598	598	"special/bootstrap.zig"
599	599	"special/bootstrap_lib.zig"
600		"special/build_file_template.zig"
601	600	"special/build_runner.zig"
602	601	"special/builtin.zig"
603	602	"special/compiler_rt/aulldiv.zig"
...	...	@@ -615,22 +614,26 @@ set(ZIG_STD_FILES
615	614	"special/compiler_rt/fixunstfdi.zig"
616	615	"special/compiler_rt/fixunstfsi.zig"
617	616	"special/compiler_rt/fixunstfti.zig"
	617	"special/compiler_rt/floattidf.zig"
	618	"special/compiler_rt/floattisf.zig"
	619	"special/compiler_rt/floattitf.zig"
618	620	"special/compiler_rt/floatunditf.zig"
619	621	"special/compiler_rt/floatunsitf.zig"
620	622	"special/compiler_rt/floatuntidf.zig"
621	623	"special/compiler_rt/floatuntisf.zig"
622	624	"special/compiler_rt/floatuntitf.zig"
623		"special/compiler_rt/floattidf.zig"
624		"special/compiler_rt/floattisf.zig"
625		"special/compiler_rt/floattitf.zig"
626		"special/compiler_rt/muloti4.zig"
627	625	"special/compiler_rt/index.zig"
	626	"special/compiler_rt/muloti4.zig"
628	627	"special/compiler_rt/truncXfYf2.zig"
629	628	"special/compiler_rt/udivmod.zig"
630	629	"special/compiler_rt/udivmoddi4.zig"
631	630	"special/compiler_rt/udivmodti4.zig"
632	631	"special/compiler_rt/udivti3.zig"
633	632	"special/compiler_rt/umodti3.zig"
	633	"special/init-exe/build.zig"
	634	"special/init-exe/src/main.zig"
	635	"special/init-lib/build.zig"
	636	"special/init-lib/src/main.zig"
634	637	"special/panic.zig"
635	638	"special/test_runner.zig"
636	639	"unicode.zig"

build.zig+1

...	...	@@ -112,6 +112,7 @@ pub fn build(b: *Builder) !void {
112	112
113	113	test_step.dependOn(tests.addCompareOutputTests(b, test_filter, modes));
114	114	test_step.dependOn(tests.addBuildExampleTests(b, test_filter, modes));
	115	test_step.dependOn(tests.addCliTests(b, test_filter, modes));
115	116	test_step.dependOn(tests.addCompileErrorTests(b, test_filter, modes));
116	117	test_step.dependOn(tests.addAssembleAndLinkTests(b, test_filter, modes));
117	118	test_step.dependOn(tests.addRuntimeSafetyTests(b, test_filter, modes));

doc/langref.html.in+1-1

...	...	@@ -5877,7 +5877,7 @@ fn add(a: i32, b: i32) i32 {
5877	5877	{#header_open\|@OpaqueType#}
5878	5878	<pre>{#syntax#}@OpaqueType() type{#endsyntax#}</pre>
5879	5879	<p>
5880		Creates a new type with an unknown size and alignment.
	5880	Creates a new type with an unknown (but non-zero) size and alignment.
5881	5881	</p>
5882	5882	<p>
5883	5883	This is typically used for type safety when interacting with C code that does not expose struct details.

src/compiler.cpp+101

...	...	@@ -5,6 +5,9 @@
5	5	static Buf saved_compiler_id = BUF_INIT;
6	6	static Buf saved_app_data_dir = BUF_INIT;
7	7	static Buf saved_stage1_path = BUF_INIT;
	8	static Buf saved_lib_dir = BUF_INIT;
	9	static Buf saved_special_dir = BUF_INIT;
	10	static Buf saved_std_dir = BUF_INIT;
8	11
9	12	Buf *get_stage1_cache_path() {
10	13	if (saved_stage1_path.list.length != 0) {
...	...	@@ -64,3 +67,101 @@ Error get_compiler_id(Buf **result) {
64	67	return ErrorNone;
65	68	}
66	69
	70
	71	static bool test_zig_install_prefix(Buf test_path, Buf out_zig_lib_dir) {
	72	Buf lib_buf = BUF_INIT;
	73	buf_init_from_str(&lib_buf, "lib");
	74
	75	Buf zig_buf = BUF_INIT;
	76	buf_init_from_str(&zig_buf, "zig");
	77
	78	Buf std_buf = BUF_INIT;
	79	buf_init_from_str(&std_buf, "std");
	80
	81	Buf index_zig_buf = BUF_INIT;
	82	buf_init_from_str(&index_zig_buf, "index.zig");
	83
	84	Buf test_lib_dir = BUF_INIT;
	85	Buf test_zig_dir = BUF_INIT;
	86	Buf test_std_dir = BUF_INIT;
	87	Buf test_index_file = BUF_INIT;
	88
	89	os_path_join(test_path, &lib_buf, &test_lib_dir);
	90	os_path_join(&test_lib_dir, &zig_buf, &test_zig_dir);
	91	os_path_join(&test_zig_dir, &std_buf, &test_std_dir);
	92	os_path_join(&test_std_dir, &index_zig_buf, &test_index_file);
	93
	94	int err;
	95	bool exists;
	96	if ((err = os_file_exists(&test_index_file, &exists))) {
	97	exists = false;
	98	}
	99	if (exists) {
	100	buf_init_from_buf(out_zig_lib_dir, &test_zig_dir);
	101	return true;
	102	}
	103	return false;
	104	}
	105
	106	static int find_zig_lib_dir(Buf *out_path) {
	107	int err;
	108
	109	Buf self_exe_path = BUF_INIT;
	110	buf_resize(&self_exe_path, 0);
	111	if (!(err = os_self_exe_path(&self_exe_path))) {
	112	Buf *cur_path = &self_exe_path;
	113
	114	for (;;) {
	115	Buf *test_dir = buf_alloc();
	116	os_path_dirname(cur_path, test_dir);
	117
	118	if (buf_eql_buf(test_dir, cur_path)) {
	119	break;
	120	}
	121
	122	if (test_zig_install_prefix(test_dir, out_path)) {
	123	return 0;
	124	}
	125
	126	cur_path = test_dir;
	127	}
	128	}
	129
	130	return ErrorFileNotFound;
	131	}
	132
	133	Buf *get_zig_lib_dir(void) {
	134	if (saved_lib_dir.list.length != 0) {
	135	return &saved_lib_dir;
	136	}
	137	buf_resize(&saved_lib_dir, 0);
	138
	139	int err;
	140	if ((err = find_zig_lib_dir(&saved_lib_dir))) {
	141	fprintf(stderr, "Unable to find zig lib directory\n");
	142	exit(EXIT_FAILURE);
	143	}
	144	return &saved_lib_dir;
	145	}
	146
	147	Buf *get_zig_std_dir() {
	148	if (saved_std_dir.list.length != 0) {
	149	return &saved_std_dir;
	150	}
	151	buf_resize(&saved_std_dir, 0);
	152
	153	os_path_join(get_zig_lib_dir(), buf_create_from_str("std"), &saved_std_dir);
	154
	155	return &saved_std_dir;
	156	}
	157
	158	Buf *get_zig_special_dir() {
	159	if (saved_special_dir.list.length != 0) {
	160	return &saved_special_dir;
	161	}
	162	buf_resize(&saved_special_dir, 0);
	163
	164	os_path_join(get_zig_std_dir(), buf_sprintf("special"), &saved_special_dir);
	165
	166	return &saved_special_dir;
	167	}

src/compiler.hpp+4

...	...	@@ -14,4 +14,8 @@
14	14	Buf *get_stage1_cache_path();
15	15	Error get_compiler_id(Buf **result);
16	16
	17	Buf *get_zig_lib_dir();
	18	Buf *get_zig_special_dir();
	19	Buf *get_zig_std_dir();
	20
17	21	#endif

src/main.cpp+112-118

...	...	@@ -25,6 +25,8 @@ static int usage(const char *arg0) {
25	25	" build-obj [source] create object from source or assembly\n"
26	26	" builtin show the source code of that @import(\"builtin\")\n"
27	27	" id print the base64-encoded compiler id\n"
	28	" init-exe initialize a `zig build` application in the cwd\n"
	29	" init-lib initialize a `zig build` library in the cwd\n"
28	30	" run [source] create executable and run immediately\n"
29	31	" translate-c [source] convert c code to zig code\n"
30	32	" targets list available compilation targets\n"
...	...	@@ -34,7 +36,7 @@ static int usage(const char *arg0) {
34	36	"Compile Options:\n"
35	37	" --assembly [source] add assembly file to build\n"
36	38	" --cache-dir [path] override the cache directory\n"
37		" --cache [auto\|off\|on] build to the global cache and print output path to stdout\n"
	39	" --cache [auto\|off\|on] build in global cache, print out paths to stdout\n"
38	40	" --color [auto\|off\|on] enable or disable colored error messages\n"
39	41	" --emit [asm\|bin\|llvm-ir] emit a specific file format as compilation output\n"
40	42	" -ftime-report print timing diagnostics\n"
...	...	@@ -42,7 +44,7 @@ static int usage(const char *arg0) {
42	44	" --name [name] override output name\n"
43	45	" --output [file] override destination path\n"
44	46	" --output-h [file] override generated header file path\n"
45		" --pkg-begin [name] [path] make package available to import and push current pkg\n"
	47	" --pkg-begin [name] [path] make pkg available to import and push current pkg\n"
46	48	" --pkg-end pop current pkg\n"
47	49	" --release-fast build with optimizations on and safety off\n"
48	50	" --release-safe build with optimizations on and safety on\n"
...	...	@@ -52,17 +54,16 @@ static int usage(const char *arg0) {
52	54	" --target-arch [name] specify target architecture\n"
53	55	" --target-environ [name] specify target environment\n"
54	56	" --target-os [name] specify target operating system\n"
55		" --verbose-tokenize turn on compiler debug output for tokenization\n"
56		" --verbose-ast turn on compiler debug output for parsing into an AST\n"
57		" --verbose-link turn on compiler debug output for linking\n"
58		" --verbose-ir turn on compiler debug output for Zig IR\n"
59		" --verbose-llvm-ir turn on compiler debug output for LLVM IR\n"
60		" --verbose-cimport turn on compiler debug output for C imports\n"
	57	" --verbose-tokenize enable compiler debug output for tokenization\n"
	58	" --verbose-ast enable compiler debug output for AST parsing\n"
	59	" --verbose-link enable compiler debug output for linking\n"
	60	" --verbose-ir enable compiler debug output for Zig IR\n"
	61	" --verbose-llvm-ir enable compiler debug output for LLVM IR\n"
	62	" --verbose-cimport enable compiler debug output for C imports\n"
61	63	" -dirafter [dir] same as -isystem but do it last\n"
62	64	" -isystem [dir] add additional search path for other .h files\n"
63		" -mllvm [arg] additional arguments to forward to LLVM's option processing\n"
	65	" -mllvm [arg] forward an arg to LLVM's option processing\n"
64	66	"Link Options:\n"
65		" --ar-path [path] set the path to ar\n"
66	67	" --dynamic-linker [path] set the path to ld.so\n"
67	68	" --each-lib-rpath add rpath for each used dynamic library\n"
68	69	" --libc-lib-dir [path] directory where libc crt1.o resides\n"
...	...	@@ -142,78 +143,6 @@ static int print_target_list(FILE *f) {
142	143	return EXIT_SUCCESS;
143	144	}
144	145
145		static bool test_zig_install_prefix(Buf test_path, Buf out_zig_lib_dir) {
146		Buf lib_buf = BUF_INIT;
147		buf_init_from_str(&lib_buf, "lib");
148
149		Buf zig_buf = BUF_INIT;
150		buf_init_from_str(&zig_buf, "zig");
151
152		Buf std_buf = BUF_INIT;
153		buf_init_from_str(&std_buf, "std");
154
155		Buf index_zig_buf = BUF_INIT;
156		buf_init_from_str(&index_zig_buf, "index.zig");
157
158		Buf test_lib_dir = BUF_INIT;
159		Buf test_zig_dir = BUF_INIT;
160		Buf test_std_dir = BUF_INIT;
161		Buf test_index_file = BUF_INIT;
162
163		os_path_join(test_path, &lib_buf, &test_lib_dir);
164		os_path_join(&test_lib_dir, &zig_buf, &test_zig_dir);
165		os_path_join(&test_zig_dir, &std_buf, &test_std_dir);
166		os_path_join(&test_std_dir, &index_zig_buf, &test_index_file);
167
168		int err;
169		bool exists;
170		if ((err = os_file_exists(&test_index_file, &exists))) {
171		exists = false;
172		}
173		if (exists) {
174		buf_init_from_buf(out_zig_lib_dir, &test_zig_dir);
175		return true;
176		}
177		return false;
178		}
179
180		static int find_zig_lib_dir(Buf *out_path) {
181		int err;
182
183		Buf self_exe_path = BUF_INIT;
184		buf_resize(&self_exe_path, 0);
185		if (!(err = os_self_exe_path(&self_exe_path))) {
186		Buf *cur_path = &self_exe_path;
187
188		for (;;) {
189		Buf *test_dir = buf_alloc();
190		os_path_dirname(cur_path, test_dir);
191
192		if (buf_eql_buf(test_dir, cur_path)) {
193		break;
194		}
195
196		if (test_zig_install_prefix(test_dir, out_path)) {
197		return 0;
198		}
199
200		cur_path = test_dir;
201		}
202		}
203
204		return ErrorFileNotFound;
205		}
206
207		static Buf *resolve_zig_lib_dir(void) {
208		int err;
209		Buf *result = buf_alloc();
210		if ((err = find_zig_lib_dir(result))) {
211		fprintf(stderr, "Unable to find zig lib directory\n");
212		exit(EXIT_FAILURE);
213		}
214		return result;
215		}
216
217	146	enum Cmd {
218	147	CmdInvalid,
219	148	CmdBuild,
...	...	@@ -277,6 +206,9 @@ static bool get_cache_opt(CacheOpt opt, bool default_value) {
277	206	}
278	207
279	208	int main(int argc, char **argv) {
	209	char *arg0 = argv[0];
	210	Error err;
	211
280	212	if (argc == 2 && strcmp(argv[1], "BUILD_INFO") == 0) {
281	213	printf("%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
282	214	ZIG_CMAKE_BINARY_DIR,
...	...	@@ -290,8 +222,10 @@ int main(int argc, char **argv) {
290	222	return 0;
291	223	}
292	224
	225	// Must be before all os.hpp function calls.
	226	os_init();
	227
293	228	if (argc == 2 && strcmp(argv[1], "id") == 0) {
294		Error err;
295	229	Buf *compiler_id;
296	230	if ((err = get_compiler_id(&compiler_id))) {
297	231	fprintf(stderr, "Unable to determine compiler id: %s\n", err_str(err));
...	...	@@ -301,9 +235,97 @@ int main(int argc, char **argv) {
301	235	return EXIT_SUCCESS;
302	236	}
303	237
304		os_init();
	238	enum InitKind {
	239	InitKindNone,
	240	InitKindExe,
	241	InitKindLib,
	242	};
	243	InitKind init_kind = InitKindNone;
	244	if (argc >= 2) {
	245	const char *init_cmd = argv[1];
	246	if (strcmp(init_cmd, "init-exe") == 0) {
	247	init_kind = InitKindExe;
	248	} else if (strcmp(init_cmd, "init-lib") == 0) {
	249	init_kind = InitKindLib;
	250	}
	251	if (init_kind != InitKindNone) {
	252	if (argc >= 3) {
	253	fprintf(stderr, "Unexpected extra argument: %s\n", argv[2]);
	254	return usage(arg0);
	255	}
	256	Buf *cmd_template_path = buf_alloc();
	257	os_path_join(get_zig_special_dir(), buf_create_from_str(init_cmd), cmd_template_path);
	258	Buf *build_zig_path = buf_alloc();
	259	os_path_join(cmd_template_path, buf_create_from_str("build.zig"), build_zig_path);
	260	Buf *src_dir_path = buf_alloc();
	261	os_path_join(cmd_template_path, buf_create_from_str("src"), src_dir_path);
	262	Buf *main_zig_path = buf_alloc();
	263	os_path_join(src_dir_path, buf_create_from_str("main.zig"), main_zig_path);
	264
	265	Buf *cwd = buf_alloc();
	266	if ((err = os_get_cwd(cwd))) {
	267	fprintf(stderr, "Unable to get cwd: %s\n", err_str(err));
	268	return EXIT_FAILURE;
	269	}
	270	Buf *cwd_basename = buf_alloc();
	271	os_path_split(cwd, nullptr, cwd_basename);
	272
	273	Buf *build_zig_contents = buf_alloc();
	274	if ((err = os_fetch_file_path(build_zig_path, build_zig_contents, false))) {
	275	fprintf(stderr, "Unable to read %s: %s\n", buf_ptr(build_zig_path), err_str(err));
	276	return EXIT_FAILURE;
	277	}
	278	Buf *modified_build_zig_contents = buf_alloc();
	279	for (size_t i = 0; i < buf_len(build_zig_contents); i += 1) {
	280	char c = buf_ptr(build_zig_contents)[i];
	281	if (c == '$') {
	282	buf_append_buf(modified_build_zig_contents, cwd_basename);
	283	} else {
	284	buf_append_char(modified_build_zig_contents, c);
	285	}
	286	}
	287
	288	Buf *main_zig_contents = buf_alloc();
	289	if ((err = os_fetch_file_path(main_zig_path, main_zig_contents, false))) {
	290	fprintf(stderr, "Unable to read %s: %s\n", buf_ptr(main_zig_path), err_str(err));
	291	return EXIT_FAILURE;
	292	}
	293
	294	Buf *out_build_zig_path = buf_create_from_str("build.zig");
	295	Buf *out_src_dir_path = buf_create_from_str("src");
	296	Buf *out_main_zig_path = buf_alloc();
	297	os_path_join(out_src_dir_path, buf_create_from_str("main.zig"), out_main_zig_path);
	298
	299	bool already_exists;
	300	if ((err = os_file_exists(out_build_zig_path, &already_exists))) {
	301	fprintf(stderr, "Unable test existence of %s: %s\n", buf_ptr(out_build_zig_path), err_str(err));
	302	return EXIT_FAILURE;
	303	}
	304	if (already_exists) {
	305	fprintf(stderr, "This file would be overwritten: %s\n", buf_ptr(out_build_zig_path));
	306	return EXIT_FAILURE;
	307	}
	308
	309	if ((err = os_make_dir(out_src_dir_path))) {
	310	fprintf(stderr, "Unable to make directory: %s: %s\n", buf_ptr(out_src_dir_path), err_str(err));
	311	return EXIT_FAILURE;
	312	}
	313	os_write_file(out_build_zig_path, modified_build_zig_contents);
	314	os_write_file(out_main_zig_path, main_zig_contents);
	315	fprintf(stderr, "Created %s\n", buf_ptr(out_build_zig_path));
	316	fprintf(stderr, "Created %s\n", buf_ptr(out_main_zig_path));
	317	if (init_kind == InitKindExe) {
	318	fprintf(stderr, "\nNext, try `zig build --help` or `zig build run`\n");
	319	} else if (init_kind == InitKindLib) {
	320	fprintf(stderr, "\nNext, try `zig build --help` or `zig build test`\n");
	321	} else {
	322	zig_unreachable();
	323	}
	324
	325	return EXIT_SUCCESS;
	326	}
	327	}
305	328
306		char *arg0 = argv[0];
307	329	Cmd cmd = CmdInvalid;
308	330	EmitFileType emit_file_type = EmitFileTypeBinary;
309	331	const char *in_file = nullptr;
...	...	@@ -333,7 +355,6 @@ int main(int argc, char **argv) {
333	355	ZigList<const char *> link_libs = {0};
334	356	ZigList<const char *> forbidden_link_libs = {0};
335	357	ZigList<const char *> frameworks = {0};
336		int err;
337	358	const char *target_arch = nullptr;
338	359	const char *target_os = nullptr;
339	360	const char *target_environ = nullptr;
...	...	@@ -364,7 +385,6 @@ int main(int argc, char **argv) {
364	385	const char *zig_exe_path = arg0;
365	386	const char *build_file = "build.zig";
366	387	bool asked_for_help = false;
367		bool asked_to_init = false;
368	388
369	389	init_all_targets();
370	390
...	...	@@ -376,9 +396,6 @@ int main(int argc, char **argv) {
376	396	if (strcmp(argv[i], "--help") == 0) {
377	397	asked_for_help = true;
378	398	args.append(argv[i]);
379		} else if (strcmp(argv[i], "--init") == 0) {
380		asked_to_init = true;
381		args.append(argv[i]);
382	399	} else if (i + 1 < argc && strcmp(argv[i], "--build-file") == 0) {
383	400	build_file = argv[i + 1];
384	401	i += 1;
...	...	@@ -390,18 +407,10 @@ int main(int argc, char **argv) {
390	407	}
391	408	}
392	409
393		Buf *zig_lib_dir_buf = resolve_zig_lib_dir();
394
395		Buf *zig_std_dir = buf_alloc();
396		os_path_join(zig_lib_dir_buf, buf_create_from_str("std"), zig_std_dir);
397
398		Buf *special_dir = buf_alloc();
399		os_path_join(zig_std_dir, buf_sprintf("special"), special_dir);
400
401	410	Buf *build_runner_path = buf_alloc();
402		os_path_join(special_dir, buf_create_from_str("build_runner.zig"), build_runner_path);
	411	os_path_join(get_zig_special_dir(), buf_create_from_str("build_runner.zig"), build_runner_path);
403	412
404		CodeGen *g = codegen_create(build_runner_path, nullptr, OutTypeExe, BuildModeDebug, zig_lib_dir_buf);
	413	CodeGen *g = codegen_create(build_runner_path, nullptr, OutTypeExe, BuildModeDebug, get_zig_lib_dir());
405	414	g->enable_time_report = timing_info;
406	415	buf_init_from_str(&g->cache_dir, cache_dir ? cache_dir : default_zig_cache_name);
407	416	codegen_set_out_name(g, buf_create_from_str("build"));
...	...	@@ -437,7 +446,6 @@ int main(int argc, char **argv) {
437	446	"\n"
438	447	"General Options:\n"
439	448	" --help Print this help and exit\n"
440		" --init Generate a build.zig template\n"
441	449	" --build-file [file] Override path to build.zig\n"
442	450	" --cache-dir [path] Override path to cache directory\n"
443	451	" --verbose Print commands before executing them\n"
...	...	@@ -463,22 +471,11 @@ int main(int argc, char **argv) {
463	471	"\n"
464	472	, zig_exe_path);
465	473	return EXIT_SUCCESS;
466		} else if (asked_to_init) {
467		Buf *build_template_path = buf_alloc();
468		os_path_join(special_dir, buf_create_from_str("build_file_template.zig"), build_template_path);
469
470		if ((err = os_copy_file(build_template_path, &build_file_abs))) {
471		fprintf(stderr, "Unable to write build.zig template: %s\n", err_str(err));
472		return EXIT_FAILURE;
473		} else {
474		fprintf(stderr, "Wrote build.zig template\n");
475		return EXIT_SUCCESS;
476		}
477	474	}
478	475
479	476	fprintf(stderr,
480	477	"No 'build.zig' file found.\n"
481		"Initialize a 'build.zig' template file with `zig build --init`,\n"
	478	"Initialize a 'build.zig' template file with `zig init-lib` or `zig init-exe`,\n"
482	479	"or build an executable directly with `zig build-exe $FILENAME.zig`.\n"
483	480	"See: `zig build --help` or `zig help` for more options.\n"
484	481	);
...	...	@@ -773,8 +770,7 @@ int main(int argc, char **argv) {
773	770
774	771	switch (cmd) {
775	772	case CmdBuiltin: {
776		Buf *zig_lib_dir_buf = resolve_zig_lib_dir();
777		CodeGen *g = codegen_create(nullptr, target, out_type, build_mode, zig_lib_dir_buf);
	773	CodeGen *g = codegen_create(nullptr, target, out_type, build_mode, get_zig_lib_dir());
778	774	Buf *builtin_source = codegen_generate_builtin_source(g);
779	775	if (fwrite(buf_ptr(builtin_source), 1, buf_len(builtin_source), stdout) != buf_len(builtin_source)) {
780	776	fprintf(stderr, "unable to write to stdout: %s\n", strerror(ferror(stdout)));
...	...	@@ -832,9 +828,7 @@ int main(int argc, char **argv) {
832	828	if (cmd == CmdRun && buf_out_name == nullptr) {
833	829	buf_out_name = buf_create_from_str("run");
834	830	}
835		Buf *zig_lib_dir_buf = resolve_zig_lib_dir();
836
837		CodeGen *g = codegen_create(zig_root_source_file, target, out_type, build_mode, zig_lib_dir_buf);
	831	CodeGen *g = codegen_create(zig_root_source_file, target, out_type, build_mode, get_zig_lib_dir());
838	832	g->enable_time_report = timing_info;
839	833	buf_init_from_str(&g->cache_dir, cache_dir ? cache_dir : default_zig_cache_name);
840	834	codegen_set_out_name(g, buf_out_name);

src/os.cpp+3-3

...	...	@@ -1091,14 +1091,14 @@ Error os_fetch_file_path(Buf full_path, Buf out_contents, bool skip_shebang) {
1091	1091	return result;
1092	1092	}
1093	1093
1094		int os_get_cwd(Buf *out_cwd) {
	1094	Error os_get_cwd(Buf *out_cwd) {
1095	1095	#if defined(ZIG_OS_WINDOWS)
1096	1096	char buf[4096];
1097	1097	if (GetCurrentDirectory(4096, buf) == 0) {
1098	1098	zig_panic("GetCurrentDirectory failed");
1099	1099	}
1100	1100	buf_init_from_str(out_cwd, buf);
1101		return 0;
	1101	return ErrorNone;
1102	1102	#elif defined(ZIG_OS_POSIX)
1103	1103	char buf[PATH_MAX];
1104	1104	char *res = getcwd(buf, PATH_MAX);
...	...	@@ -1106,7 +1106,7 @@ int os_get_cwd(Buf *out_cwd) {
1106	1106	zig_panic("unable to get cwd: %s", strerror(errno));
1107	1107	}
1108	1108	buf_init_from_str(out_cwd, res);
1109		return 0;
	1109	return ErrorNone;
1110	1110	#else
1111	1111	#error "missing os_get_cwd implementation"
1112	1112	#endif

src/os.hpp+1-1

...	...	@@ -114,7 +114,7 @@ int os_copy_file(Buf src_path, Buf dest_path);
114	114	Error ATTRIBUTE_MUST_USE os_fetch_file(FILE file, Buf out_contents, bool skip_shebang);
115	115	Error ATTRIBUTE_MUST_USE os_fetch_file_path(Buf full_path, Buf out_contents, bool skip_shebang);
116	116
117		int os_get_cwd(Buf *out_cwd);
	117	Error ATTRIBUTE_MUST_USE os_get_cwd(Buf *out_cwd);
118	118
119	119	bool os_stderr_tty(void);
120	120	void os_stderr_set_color(TermColor color);

std/special/build_file_template.zig deleted-10

...	...	@@ -1,10 +0,0 @@
1		const Builder = @import("std").build.Builder;
2
3		pub fn build(b: *Builder) void {
4		const mode = b.standardReleaseOptions();
5		const exe = b.addExecutable("YOUR_NAME_HERE", "src/main.zig");
6		exe.setBuildMode(mode);
7
8		b.default_step.dependOn(&exe.step);
9		b.installArtifact(exe);
10		}

std/special/init-exe/build.zig created+15

...	...	@@ -0,0 +1,15 @@
	1	const Builder = @import("std").build.Builder;
	2
	3	pub fn build(b: *Builder) void {
	4	const mode = b.standardReleaseOptions();
	5	const exe = b.addExecutable("$", "src/main.zig");
	6	exe.setBuildMode(mode);
	7
	8	const run_step = b.step("run", "Run the app");
	9	const run_cmd = b.addCommand(".", b.env_map, [][]const u8{exe.getOutputPath()});
	10	run_step.dependOn(&run_cmd.step);
	11	run_cmd.step.dependOn(&exe.step);
	12
	13	b.default_step.dependOn(&exe.step);
	14	b.installArtifact(exe);
	15	}

std/special/init-exe/src/main.zig created+5

...	...	@@ -0,0 +1,5 @@
	1	const std = @import("std");
	2
	3	pub fn main() error!void {
	4	std.debug.warn("All your base are belong to us.\n");
	5	}

std/special/init-lib/build.zig created+16

...	...	@@ -0,0 +1,16 @@
	1	const Builder = @import("std").build.Builder;
	2
	3	pub fn build(b: *Builder) void {
	4	const mode = b.standardReleaseOptions();
	5	const lib = b.addStaticLibrary("$", "src/main.zig");
	6	lib.setBuildMode(mode);
	7
	8	var main_tests = b.addTest("src/main.zig");
	9	main_tests.setBuildMode(mode);
	10
	11	const test_step = b.step("test", "Run library tests");
	12	test_step.dependOn(&main_tests.step);
	13
	14	b.default_step.dependOn(&lib.step);
	15	b.installArtifact(lib);
	16	}

std/special/init-lib/src/main.zig created+10

...	...	@@ -0,0 +1,10 @@
	1	const std = @import("std");
	2	const assertOrPanic = std.debug.assertOrPanic;
	3
	4	export fn add(a: i32, b: i32) i32 {
	5	return a + b;
	6	}
	7
	8	test "basic add functionality" {
	9	assertOrPanic(add(3, 7) == 10);
	10	}

test/cli.zig created+92

...	...	@@ -0,0 +1,92 @@
	1	const std = @import("std");
	2	const os = std.os;
	3	const assertOrPanic = std.debug.assertOrPanic;
	4
	5	var a: *std.mem.Allocator = undefined;
	6
	7	pub fn main() !void {
	8	var direct_allocator = std.heap.DirectAllocator.init();
	9	defer direct_allocator.deinit();
	10
	11	var arena = std.heap.ArenaAllocator.init(&direct_allocator.allocator);
	12	defer arena.deinit();
	13
	14	var arg_it = os.args();
	15
	16	// skip my own exe name
	17	_ = arg_it.skip();
	18
	19	a = &arena.allocator;
	20
	21	const zig_exe_rel = try (arg_it.next(a) orelse {
	22	std.debug.warn("Expected first argument to be path to zig compiler\n");
	23	return error.InvalidArgs;
	24	});
	25	const cache_root = try (arg_it.next(a) orelse {
	26	std.debug.warn("Expected second argument to be cache root directory path\n");
	27	return error.InvalidArgs;
	28	});
	29	const zig_exe = try os.path.resolve(a, zig_exe_rel);
	30
	31	try testZigInitLib(zig_exe, cache_root);
	32	try testZigInitExe(zig_exe, cache_root);
	33	}
	34
	35	fn unwrapArg(arg: UnwrapArgError![]u8) UnwrapArgError![]u8 {
	36	return arg catch \|err\| {
	37	warn("Unable to parse command line: {}\n", err);
	38	return err;
	39	};
	40	}
	41
	42	fn printCmd(cwd: []const u8, argv: []const []const u8) void {
	43	std.debug.warn("cd {} && ", cwd);
	44	for (argv) \|arg\| {
	45	std.debug.warn("{} ", arg);
	46	}
	47	std.debug.warn("\n");
	48	}
	49
	50	fn exec(cwd: []const u8, argv: []const []const u8) !os.ChildProcess.ExecResult {
	51	const max_output_size = 100 * 1024;
	52	const result = os.ChildProcess.exec(a, argv, cwd, null, max_output_size) catch \|err\| {
	53	std.debug.warn("The following command failed:\n");
	54	printCmd(cwd, argv);
	55	return err;
	56	};
	57	switch (result.term) {
	58	os.ChildProcess.Term.Exited => \|code\| {
	59	if (code != 0) {
	60	std.debug.warn("The following command exited with error code {}:\n", code);
	61	printCmd(cwd, argv);
	62	std.debug.warn("stderr:\n{}\n", result.stderr);
	63	return error.CommandFailed;
	64	}
	65	},
	66	else => {
	67	std.debug.warn("The following command terminated unexpectedly:\n");
	68	printCmd(cwd, argv);
	69	std.debug.warn("stderr:\n{}\n", result.stderr);
	70	return error.CommandFailed;
	71	},
	72	}
	73	return result;
	74	}
	75
	76	fn testZigInitLib(zig_exe: []const u8, cache_root: []const u8) !void {
	77	const dir_path = try os.path.join(a, cache_root, "clitest");
	78	try os.deleteTree(a, dir_path);
	79	try os.makeDir(dir_path);
	80	_ = try exec(dir_path, [][]const u8{ zig_exe, "init-lib" });
	81	const test_result = try exec(dir_path, [][]const u8{ zig_exe, "build", "test" });
	82	assertOrPanic(std.mem.endsWith(u8, test_result.stderr, "All tests passed.\n"));
	83	}
	84
	85	fn testZigInitExe(zig_exe: []const u8, cache_root: []const u8) !void {
	86	const dir_path = try os.path.join(a, cache_root, "clitest");
	87	try os.deleteTree(a, dir_path);
	88	try os.makeDir(dir_path);
	89	_ = try exec(dir_path, [][]const u8{ zig_exe, "init-exe" });
	90	const run_result = try exec(dir_path, [][]const u8{ zig_exe, "build", "run" });
	91	assertOrPanic(std.mem.eql(u8, run_result.stderr, "All your base are belong to us.\n"));
	92	}

test/tests.zig+15

...	...	@@ -103,6 +103,21 @@ pub fn addBuildExampleTests(b: *build.Builder, test_filter: ?[]const u8, modes:
103	103	return cases.step;
104	104	}
105	105
	106	pub fn addCliTests(b: build.Builder, test_filter: ?[]const u8, modes: []const Mode) build.Step {
	107	const step = b.step("test-cli", "Test the command line interface");
	108
	109	const exe = b.addExecutable("test-cli", "test/cli.zig");
	110	const run_cmd = b.addCommand(null, b.env_map, [][]const u8{
	111	b.pathFromRoot(exe.getOutputPath()),
	112	os.path.realAlloc(b.allocator, b.zig_exe) catch unreachable,
	113	b.pathFromRoot(b.cache_root),
	114	});
	115	run_cmd.step.dependOn(&exe.step);
	116
	117	step.dependOn(&run_cmd.step);
	118	return step;
	119	}
	120
106	121	pub fn addAssembleAndLinkTests(b: build.Builder, test_filter: ?[]const u8, modes: []const Mode) build.Step {
107	122	const cases = b.allocator.create(CompareOutputContext{
108	123	.b = b,

author	Andrew Kelley <andrew@ziglang.org> 2018-09-17 17:08:56-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2018-09-17 17:11:18-04:00
log	4c6f1e614a204293732004ef844e8bb057bdc212
tree	5b9ce7cf5888d2122406b79001325ed770d5d872
parent	9c9eefc841b577f646a54e74c8970e074162b594
signature	Commit is signed but in an unrecognized format.

remove `zig build --init`. add `zig init-lib` and `zig init-exe`