Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove deprecated path #105

Merged
merged 1 commit into from
May 26, 2024
Merged

Remove deprecated path #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,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,
});
Expand All @@ -33,7 +33,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,
});
Expand Down Expand Up @@ -95,7 +95,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,
});
Expand Down Expand Up @@ -134,7 +134,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,
});
Expand All @@ -146,7 +146,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,
});
Expand All @@ -158,7 +158,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,
});
Expand All @@ -175,7 +175,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,
});
Expand Down Expand Up @@ -215,7 +215,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,
});
Expand All @@ -229,7 +229,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,
});
Expand All @@ -253,7 +253,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,
});
Expand Down
14 changes: 7 additions & 7 deletions facil.io/build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(.{
Expand Down