Reremove vendored zig-sqlite

malcolmstill · Jun 23, 2024 · fa5e172 · fa5e172
1 parent 5b99b2d
commit fa5e172
Show file tree

Hide file tree

Showing 38 changed files with 4 additions and 288,785 deletions.
diff --git a/build.zig b/build.zig
@@ -7,23 +7,9 @@ pub fn build(b: *std.Build) void {
     const sqlite = b.dependency("sqlite", .{
         .target = target,
         .optimize = optimize,
+        .fts5 = true,
     });
 
-    const lib_sqlite = b.addStaticLibrary(.{
-        .name = "sqlite",
-        .target = target,
-        .optimize = optimize,
-    });
-    lib_sqlite.addCSourceFile(.{
-        .file = b.path("lib/zig-sqlite/c/sqlite3.c"),
-        .flags = &[_][]const u8{
-            "-std=c99",
-            "-DSQLITE_ENABLE_FTS5",
-        },
-    });
-    lib_sqlite.addIncludePath(b.path("lib/zig-sqlite/c"));
-    lib_sqlite.linkLibC();
-
     const @"ansi-term" = b.dependency("ansi-term", .{
         .target = target,
         .optimize = optimize,
@@ -39,7 +25,7 @@ pub fn build(b: *std.Build) void {
     exe.root_module.addImport("ansi-term", @"ansi-term".module("ansi-term"));
 
     // links the bundled sqlite3, so leave this out if you link the system one
-    exe.linkLibrary(lib_sqlite);
+    exe.linkLibrary(sqlite.artifact("sqlite"));
 
     // This declares intent for the executable to be installed into the
     // standard location when the user invokes the "install" step (the default

diff --git a/build.zig.zon b/build.zig.zon
@@ -3,8 +3,8 @@
     .version = "0.0.0",
     .dependencies = .{
         .sqlite = .{
-            .url = "https://github.com/vrischmann/zig-sqlite/archive/91e5fedd15c5ea3cb42ccceefb3d0f4bb9bad68f.tar.gz",
-            .hash = "1220ba277845cb3cece7a7a1f929b920c97e9085bb644471c5dc8c72571f1485c75f",
+            .url = "https://github.com/malcolmstill/zig-sqlite/archive/f262d12d2ba385d79a0f70281b52de4f8299406c.tar.gz",
+            .hash = "122027c5dfc2c8c4441db69bdb43ae036fa9ff7731f3c61875da9e2f213ee2b5e78e",
         },
         .@"ansi-term" = .{
             // ansi-term not yet on zig-0.13.0

diff --git a/lib/zig-sqlite/.dockerignore b/lib/zig-sqlite/.dockerignore
diff --git a/lib/zig-sqlite/.gitattributes b/lib/zig-sqlite/.gitattributes
diff --git a/lib/zig-sqlite/.github/ISSUE_TEMPLATE/bug_report.yml b/lib/zig-sqlite/.github/ISSUE_TEMPLATE/bug_report.yml
diff --git a/lib/zig-sqlite/.github/pull_request_template.md b/lib/zig-sqlite/.github/pull_request_template.md
diff --git a/lib/zig-sqlite/.github/workflows/main.yml b/lib/zig-sqlite/.github/workflows/main.yml
diff --git a/lib/zig-sqlite/.gitignore b/lib/zig-sqlite/.gitignore
diff --git a/lib/zig-sqlite/LICENSE b/lib/zig-sqlite/LICENSE