Commit afc77f0603395d9c1829a49081e198b0fa255abc | zig

author	Matthew Lugg <mlugg@mlugg.co.uk> 2024-12-16 16:19:35+00:00
committer	Eric Joldasov <bratishkaerik@landless-city.net> 2024-12-18 01:49:14+05:00
log	afc77f0603395d9c1829a49081e198b0fa255abc
tree	ca604dbab15963d63216650d77d76f14c6156e91
parent	6bd590ad37dcb7e46c8eb78c54e69ad07e5b565e
signature	Commit is signed but in an unrecognized format.

init template: expand slightly, migrate from deprecated std.Build APIs

3 files changed, 45 insertions(+), 13 deletions(-)

lib
- init
  - build.zig
  - src
    main.zig
    root.zig

lib/init/build.zig+35-11

 @@ -15,8 +15,12 @@ pub fn build(b: *std.Build) void {
     // set a preferred release mode, allowing the user to decide how to optimize.
     const optimize = b.standardOptimizeOption(.{});
-    const lib = b.addStaticLibrary(.{
+    // This creates a "module", which represents a collection of source files alongside
-        .name = "$",
+    // some compilation options, such as optimization mode and linked system libraries.
+    // Every executable or library we compile will be based on one or more modules.
+    const lib_mod = b.createModule(.{
+        // `root_source_file` is the Zig "entry point" of the module. If a module
+        // only contains e.g. external object files, you can make this `null`.
         // In this case the main source file is merely a path, however, in more
         // complicated build scripts, this could be a generated file.
         .root_source_file = b.path("src/root.zig"),
 @@ -24,16 +28,40 @@ pub fn build(b: *std.Build) void {
         .optimize = optimize,
     });
+    // We will also create a module for our other entry point, 'main.zig'.
+    const exe_mod = b.createModule(.{
+        // `root_source_file` is the Zig "entry point" of the module. If a module
+        // only contains e.g. external object files, you can make this `null`.
+        // In this case the main source file is merely a path, however, in more
+        // complicated build scripts, this could be a generated file.
+        .root_source_file = b.path("src/main.zig"),
+        .target = target,
+        .optimize = optimize,
+    });
+    // Modules can depend on one another using the `std.Build.Module.addImport` function.
+    // This is what allows Zig source code to use `@import("foo")` where 'foo' is not a
+    // file path. In this case, we set up `exe_mod` to import `lib_mod`.
+    exe_mod.addImport("$_lib", lib_mod);
+    // Now, we will create a static library based on the module we created above.
+    // This creates a `std.Build.Step.Compile`, which is the build step responsible
+    // for actually invoking the compiler.
+    const lib = b.addStaticLibrary(.{
+        .name = "$",
+        .root_module = lib_mod,
+    });
     // This declares intent for the library to be installed into the standard
     // location when the user invokes the "install" step (the default step when
     // running `zig build`).
     b.installArtifact(lib);
+    // This creates another `std.Build.Step.Compile`, but this one builds an executable
+    // rather than a static library.
     const exe = b.addExecutable(.{
         .name = "$",
-        .root_source_file = b.path("src/main.zig"),
+        .root_module = exe_mod,
-        .target = target,
-        .optimize = optimize,
     });
     // This declares intent for the executable to be installed into the
 @@ -67,17 +95,13 @@ pub fn build(b: *std.Build) void {
     // Creates a step for unit testing. This only builds the test executable
     // but does not run it.
     const lib_unit_tests = b.addTest(.{
-        .root_source_file = b.path("src/root.zig"),
+        .root_module = lib_mod,
-        .target = target,
-        .optimize = optimize,
     });
     const run_lib_unit_tests = b.addRunArtifact(lib_unit_tests);
     const exe_unit_tests = b.addTest(.{
-        .root_source_file = b.path("src/main.zig"),
+        .root_module = exe_mod,
-        .target = target,
-        .optimize = optimize,
     });
     const run_exe_unit_tests = b.addRunArtifact(exe_unit_tests);

lib/init/src/main.zig+9-1

...	@@ -1,7 +1,6 @@	...	@@ -1,7 +1,6 @@
1	//! By convention, main.zig is where your main function lives in the case that	1	//! By convention, main.zig is where your main function lives in the case that
2	//! you are building an executable. If you are making a library, the convention	2	//! you are building an executable. If you are making a library, the convention
3	//! is to delete this file and start with root.zig instead.	3	//! is to delete this file and start with root.zig instead.
4	const std = @import("std");
5		4
6	pub fn main() !void {	5	pub fn main() !void {
7	// Prints to stderr (it's a shortcut based on `std.io.getStdErr()`)	6	// Prints to stderr (it's a shortcut based on `std.io.getStdErr()`)
...	@@ -26,6 +25,10 @@ test "simple test" {	...	@@ -26,6 +25,10 @@ test "simple test" {
26	try std.testing.expectEqual(@as(i32, 42), list.pop());	25	try std.testing.expectEqual(@as(i32, 42), list.pop());
27	}	26	}
28		27
		28	test "use other module" {
		29	try std.testing.expectEqual(@as(i32, 150), lib.add(100, 50));
		30	}
		31
29	test "fuzz example" {	32	test "fuzz example" {
30	const global = struct {	33	const global = struct {
31	fn testOne(input: []const u8) anyerror!void {	34	fn testOne(input: []const u8) anyerror!void {
...	@@ -35,3 +38,8 @@ test "fuzz example" {	...	@@ -35,3 +38,8 @@ test "fuzz example" {
35	};	38	};
36	try std.testing.fuzz(global.testOne, .{});	39	try std.testing.fuzz(global.testOne, .{});
37	}	40	}
		41
		42	const std = @import("std");
		43
		44	/// This imports the separate module containing `root.zig`. Take a look in `build.zig` for details.
		45	const lib = @import("$_lib");

lib/init/src/root.zig+1-1

...	@@ -4,7 +4,7 @@	...	@@ -4,7 +4,7 @@
4	const std = @import("std");	4	const std = @import("std");
5	const testing = std.testing;	5	const testing = std.testing;
6		6
7	export fn add(a: i32, b: i32) i32 {	7	pub export fn add(a: i32, b: i32) i32 {
8	return a + b;	8	return a + b;
9	}	9	}
10		10