Merge pull request #105 from SlaktarMicke92/feature/remove-deprecated…

…-path Remove deprecated path
zigzap · May 26, 2024 · 3f9c7d0 · 3f9c7d0
2 parents 094d4cf + 8d15746
commit 3f9c7d0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/build.zig b/build.zig
@@ -23,7 +23,7 @@ pub fn build(b: *std.Build) !void {
     const facilio = try build_facilio("facil.io", b, target, optimize, use_openssl);
 
     const zap_module = b.addModule("zap", .{
-        .root_source_file = .{ .path = "src/zap.zig" },
+        .root_source_file = b.path("src/zap.zig"),
         .target = target,
         .optimize = optimize,
     });
@@ -34,7 +34,7 @@ pub fn build(b: *std.Build) !void {
     // -- Docs
     const docs_obj = b.addObject(.{
         .name = "zap", // name doesn't seem to matter
-        .root_source_file = .{ .path = "src/zap.zig" },
+        .root_source_file = b.path("src/zap.zig"),
         .target = target,
         .optimize = .Debug,
     });
@@ -96,7 +96,7 @@ pub fn build(b: *std.Build) !void {
 
         var example = b.addExecutable(.{
             .name = ex_name,
-            .root_source_file = .{ .path = ex_src },
+            .root_source_file = b.path(ex_src),
             .target = target,
             .optimize = optimize,
         });
@@ -135,7 +135,7 @@ pub fn build(b: *std.Build) !void {
     //
     const auth_tests = b.addTest(.{
         .name = "auth_tests",
-        .root_source_file = .{ .path = "src/tests/test_auth.zig" },
+        .root_source_file = b.path("src/tests/test_auth.zig"),
         .target = target,
         .optimize = optimize,
     });
@@ -147,7 +147,7 @@ pub fn build(b: *std.Build) !void {
     // mustache tests
     const mustache_tests = b.addTest(.{
         .name = "mustache_tests",
-        .root_source_file = .{ .path = "src/tests/test_mustache.zig" },
+        .root_source_file = b.path("src/tests/test_mustache.zig"),
         .target = target,
         .optimize = optimize,
     });
@@ -159,7 +159,7 @@ pub fn build(b: *std.Build) !void {
     // http paramters (qyery, body) tests
     const httpparams_tests = b.addTest(.{
         .name = "http_params_tests",
-        .root_source_file = .{ .path = "src/tests/test_http_params.zig" },
+        .root_source_file = b.path("src/tests/test_http_params.zig"),
         .target = target,
         .optimize = optimize,
     });
@@ -176,7 +176,7 @@ pub fn build(b: *std.Build) !void {
     // http paramters (qyery, body) tests
     const sendfile_tests = b.addTest(.{
         .name = "sendfile_tests",
-        .root_source_file = .{ .path = "src/tests/test_sendfile.zig" },
+        .root_source_file = b.path("src/tests/test_sendfile.zig"),
         .target = target,
         .optimize = optimize,
     });
@@ -216,7 +216,7 @@ pub fn build(b: *std.Build) !void {
     //
     const pkghash_exe = b.addExecutable(.{
         .name = "pkghash",
-        .root_source_file = .{ .path = "./tools/pkghash.zig" },
+        .root_source_file = b.path("./tools/pkghash.zig"),
         .target = target,
         .optimize = optimize,
     });
@@ -230,7 +230,7 @@ pub fn build(b: *std.Build) !void {
     //
     const docserver_exe = b.addExecutable(.{
         .name = "docserver",
-        .root_source_file = .{ .path = "./tools/docserver.zig" },
+        .root_source_file = b.path("./tools/docserver.zig"),
         .target = target,
         .optimize = optimize,
     });
@@ -254,7 +254,7 @@ pub fn build(b: *std.Build) !void {
     //
     const announceybot_exe = b.addExecutable(.{
         .name = "announceybot",
-        .root_source_file = .{ .path = "./tools/announceybot.zig" },
+        .root_source_file = b.path("./tools/announceybot.zig"),
         .target = target,
         .optimize = optimize,
     });

diff --git a/facil.io/build.zig b/facil.io/build.zig
@@ -32,14 +32,14 @@ pub fn build_facilio(
         try flags.append("-DHAVE_OPENSSL -DFIO_TLS_FOUND");
 
     // Include paths
-    lib.addIncludePath(.{ .path = subdir ++ "/." });
-    lib.addIncludePath(.{ .path = subdir ++ "/lib/facil" });
-    lib.addIncludePath(.{ .path = subdir ++ "/lib/facil/fiobj" });
-    lib.addIncludePath(.{ .path = subdir ++ "/lib/facil/cli" });
-    lib.addIncludePath(.{ .path = subdir ++ "/lib/facil/http" });
-    lib.addIncludePath(.{ .path = subdir ++ "/lib/facil/http/parsers" });
+    lib.addIncludePath(b.path(subdir ++ "/."));
+    lib.addIncludePath(b.path(subdir ++ "/lib/facil"));
+    lib.addIncludePath(b.path(subdir ++ "/lib/facil/fiobj"));
+    lib.addIncludePath(b.path(subdir ++ "/lib/facil/cli"));
+    lib.addIncludePath(b.path(subdir ++ "/lib/facil/http"));
+    lib.addIncludePath(b.path(subdir ++ "/lib/facil/http/parsers"));
     if (use_openssl)
-        lib.addIncludePath(.{ .path = subdir ++ "/lib/facil/tls" });
+        lib.addIncludePath(b.path(subdir ++ "/lib/facil/tls"));
 
     // C source files
     lib.addCSourceFiles(.{