From bd15e5c43b4a96256517993d17f5f98aa3e3867b Mon Sep 17 00:00:00 2001 From: Bob Farrell Date: Sat, 10 Aug 2024 20:17:54 +0100 Subject: [PATCH] WIP --- build.zig | 7 +++++++ build.zig.zon | 7 +++++++ src/jetzig.zig | 1 + 3 files changed, 15 insertions(+) diff --git a/build.zig b/build.zig index 8c0e6d7..366a9a8 100644 --- a/build.zig +++ b/build.zig @@ -55,14 +55,18 @@ pub fn build(b: *std.Build) !void { const zmpl_module = zmpl_dep.module("zmpl"); const jetkv_dep = b.dependency("jetkv", .{ .target = target, .optimize = optimize }); + const jetquery_dep = b.dependency("jetquery", .{ .target = target, .optimize = optimize }); const zmd_dep = b.dependency("zmd", .{ .target = target, .optimize = optimize }); const httpz_dep = b.dependency("httpz", .{ .target = target, .optimize = optimize }); + const pg_dep = b.dependency("pg", .{ .target = target, .optimize = optimize }); // This is the way to make it look nice in the zig build script // If we would do it the other way around, we would have to do // b.dependency("jetzig",.{}).builder.dependency("zmpl",.{}).module("zmpl"); b.modules.put("zmpl", zmpl_dep.module("zmpl")) catch @panic("Out of memory"); b.modules.put("zmd", zmd_dep.module("zmd")) catch @panic("Out of memory"); + b.modules.put("pg", pg_dep.module("pg")) catch @panic("Out of memory"); + jetquery_dep.module("jetquery").addImport("pg", pg_dep.module("pg")); const smtp_client_dep = b.dependency("smtp_client", .{ .target = target, @@ -74,6 +78,7 @@ pub fn build(b: *std.Build) !void { jetzig_module.addImport("args", zig_args_dep.module("args")); jetzig_module.addImport("zmd", zmd_dep.module("zmd")); jetzig_module.addImport("jetkv", jetkv_dep.module("jetkv")); + jetzig_module.addImport("jetquery", jetquery_dep.module("jetquery")); jetzig_module.addImport("smtp", smtp_client_dep.module("smtp_client")); jetzig_module.addImport("httpz", httpz_dep.module("httpz")); @@ -125,10 +130,12 @@ pub fn jetzigInit(b: *std.Build, exe: *std.Build.Step.Compile, options: JetzigIn const jetzig_module = jetzig_dep.module("jetzig"); const zmpl_module = jetzig_dep.module("zmpl"); const zmd_module = jetzig_dep.module("zmd"); + const pg_module = jetzig_dep.module("pg"); exe.root_module.addImport("jetzig", jetzig_module); exe.root_module.addImport("zmpl", zmpl_module); exe.root_module.addImport("zmd", zmd_module); + exe.root_module.addImport("pg", pg_module); if (b.option(bool, "jetzig_runner", "Used internally by `jetzig server` command.")) |jetzig_runner| { if (jetzig_runner) { diff --git a/build.zig.zon b/build.zig.zon index f975cb2..5cf2d90 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -14,10 +14,17 @@ .url = "https://github.com/jetzig-framework/jetkv/archive/2b1130a48979ea2871c8cf6ca89c38b1e7062839.tar.gz", .hash = "12201d75d73aad5e1c996de4d5ae87a00e58479c8d469bc2eeb5fdeeac8857bc09af", }, + .jetquery = .{ + .path = "../jetquery", + }, .args = .{ .url = "https://github.com/ikskuh/zig-args/archive/0abdd6947a70e6d8cc83b66228cea614aa856206.tar.gz", .hash = "1220411a8c46d95bbf3b6e2059854bcb3c5159d428814099df5294232b9980517e9c", }, + .pg = .{ + .url = "https://github.com/karlseguin/pg.zig/archive/1b4011d4c8218c70471477e283608daf919bee3a.tar.gz", + .hash = "122086d9461b75535b630019374f8a068eff467e657a46d2bb577fe0a507f1cd2fca", + }, .smtp_client = .{ .url = "https://github.com/karlseguin/smtp_client.zig/archive/8fcfad9ca2d9e446612c79f4e54050cfbe81b38d.tar.gz", .hash = "1220cebfcf6c63295819df92ec54abe62aad91b1d16666781194c29a7874bb7bbbda", diff --git a/src/jetzig.zig b/src/jetzig.zig index bab48f5..8d340d0 100644 --- a/src/jetzig.zig +++ b/src/jetzig.zig @@ -3,6 +3,7 @@ const std = @import("std"); pub const zmpl = @import("zmpl").zmpl; pub const zmd = @import("zmd").zmd; pub const jetkv = @import("jetkv").jetkv; +pub const jetquery = @import("jetquery"); pub const http = @import("jetzig/http.zig"); pub const loggers = @import("jetzig/loggers.zig");