move netsurf and mimalloc into modules

Author: krichprollsch

build.zig

@@ -168,22 +168,33 @@ fn common(
     step: *std.Build.Step.Compile,
     options: jsruntime.Options,
 ) !void {
-    try jsruntime_pkgs.add(step, options);
-    linkNetSurf(b, step);
-
-    // link mimalloc
-    step.addObjectFile(b.path("vendor/mimalloc/out/libmimalloc.a"));
-    step.addIncludePath(b.path("vendor/mimalloc/out/include"));
+    const jsruntimemod = try jsruntime_pkgs.module(
+        b,
+        options,
+        step.root_module.optimize.?,
+        step.root_module.resolved_target.?,
+    );
+    step.root_module.addImport("jsruntime", jsruntimemod);
+
+    const netsurf = moduleNetSurf(b);
+    netsurf.addImport("jsruntime", jsruntimemod);
+    step.root_module.addImport("netsurf", netsurf);
 }
 
-fn linkNetSurf(b: *std.Build, step: *std.Build.Step.Compile) void {
+fn moduleNetSurf(b: *std.Build) *std.Build.Module {
+    const mod = b.addModule("netsurf", .{
+        .root_source_file = b.path("src/netsurf/netsurf.zig"),
+    });
     // iconv
-    step.addObjectFile(b.path("vendor/libiconv/lib/libiconv.a"));
-    step.addIncludePath(b.path("vendor/libiconv/include"));
+    mod.addObjectFile(b.path("vendor/libiconv/lib/libiconv.a"));
+    mod.addIncludePath(b.path("vendor/libiconv/include"));
+
+    // mimalloc
+    mod.addImport("mimalloc", moduleMimalloc(b));
 
     // netsurf libs
     const ns = "vendor/netsurf";
-    step.addIncludePath(b.path(ns ++ "/include"));
+    mod.addIncludePath(b.path(ns ++ "/include"));
 
     const libs: [4][]const u8 = .{
         "libdom",
@@ -192,7 +203,20 @@ fn linkNetSurf(b: *std.Build, step: *std.Build.Step.Compile) void {
         "libwapcaplet",
     };
     inline for (libs) |lib| {
-        step.addObjectFile(b.path(ns ++ "/lib/" ++ lib ++ ".a"));
-        step.addIncludePath(b.path(ns ++ "/" ++ lib ++ "/src"));
+        mod.addObjectFile(b.path(ns ++ "/lib/" ++ lib ++ ".a"));
+        mod.addIncludePath(b.path(ns ++ "/" ++ lib ++ "/src"));
     }
+
+    return mod;
+}
+
+fn moduleMimalloc(b: *std.Build) *std.Build.Module {
+    const mod = b.addModule("mimalloc", .{
+        .root_source_file = b.path("src/mimalloc/mimalloc.zig"),
+    });
+
+    mod.addObjectFile(b.path("vendor/mimalloc/out/libmimalloc.a"));
+    mod.addIncludePath(b.path("vendor/mimalloc/out/include"));
+
+    return mod;
 }

src/browser/browser.zig

@@ -21,7 +21,7 @@ const builtin = @import("builtin");
 
 const Types = @import("root").Types;
 
-const parser = @import("../netsurf.zig");
+const parser = @import("netsurf");
 const Loader = @import("loader.zig").Loader;
 const Dump = @import("dump.zig");
 const Mime = @import("mime.zig");

src/browser/dump.zig

@@ -19,7 +19,7 @@
 const std = @import("std");
 const File = std.fs.File;
 
-const parser = @import("../netsurf.zig");
+const parser = @import("netsurf");
 const Walker = @import("../dom/walker.zig").WalkerChildren;
 
 // writer must be a std.io.Writer

src/css/libdom.zig

@@ -18,7 +18,7 @@
 
 const std = @import("std");
 
-const parser = @import("../netsurf.zig");
+const parser = @import("netsurf");
 
 // Node implementation with Netsurf Libdom C lib.
 pub const Node = struct {

src/css/libdom_test.zig

@@ -19,7 +19,7 @@
 const std = @import("std");
 const css = @import("css.zig");
 const Node = @import("libdom.zig").Node;
-const parser = @import("../netsurf.zig");
+const parser = @import("netsurf");
 
 const Matcher = struct {
     const Nodes = std.ArrayList(Node);

src/dom/attribute.zig

@@ -22,7 +22,7 @@ const jsruntime = @import("jsruntime");
 const Case = jsruntime.test_utils.Case;
 const checkCases = jsruntime.test_utils.checkCases;
 
-const parser = @import("../netsurf.zig");
+const parser = @import("netsurf");
 
 const Node = @import("node.zig").Node;
 const DOMException = @import("exceptions.zig").DOMException;

src/dom/cdata_section.zig

@@ -18,7 +18,7 @@
 
 const std = @import("std");
 
-const parser = @import("../netsurf.zig");
+const parser = @import("netsurf");
 
 const Text = @import("text.zig").Text;
 

src/dom/character_data.zig

@@ -23,7 +23,7 @@ const Case = jsruntime.test_utils.Case;
 const checkCases = jsruntime.test_utils.checkCases;
 const generate = @import("../generate.zig");
 
-const parser = @import("../netsurf.zig");
+const parser = @import("netsurf");
 
 const Node = @import("node.zig").Node;
 const Comment = @import("comment.zig").Comment;

src/dom/comment.zig

@@ -17,7 +17,7 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 const std = @import("std");
 
-const parser = @import("../netsurf.zig");
+const parser = @import("netsurf");
 
 const jsruntime = @import("jsruntime");
 const Case = jsruntime.test_utils.Case;

src/dom/css.zig

@@ -18,7 +18,7 @@
 
 const std = @import("std");
 
-const parser = @import("../netsurf.zig");
+const parser = @import("netsurf");
 
 const css = @import("../css/css.zig");
 const Node = @import("../css/libdom.zig").Node;