Merge pull request #191 from Tesseract22/master

Update to zig 0.15

Author: vrischmann

build.zig

@@ -110,10 +110,15 @@ fn computeTestTargets(isNative: bool, ci: ?bool) ?[]const TestTarget {
 
 // This creates a SQLite static library from the SQLite dependency code.
 fn makeSQLiteLib(b: *std.Build, dep: *std.Build.Dependency, c_flags: []const []const u8, target: std.Build.ResolvedTarget, optimize: std.builtin.OptimizeMode, sqlite_c: enum { with, without }) *std.Build.Step.Compile {
-    const lib = b.addStaticLibrary(.{
-        .name = "sqlite",
+    const mod = b.addModule("lib-sqlite", .{
         .target = target,
         .optimize = optimize,
+        .link_libc = true,
+    });
+    const lib = b.addLibrary(.{
+        .name = "sqlite",
+        .linkage = .dynamic,
+        .root_module = mod,
     });
 
     lib.addIncludePath(dep.path("."));
@@ -128,7 +133,6 @@ fn makeSQLiteLib(b: *std.Build, dep: *std.Build.Dependency, c_flags: []const []c
         .file = b.path("c/workaround.c"),
         .flags = c_flags,
     });
-    lib.linkLibC();
 
     return lib;
 }
@@ -225,13 +229,17 @@ pub fn build(b: *std.Build) !void {
 
         const test_sqlite_lib = makeSQLiteLib(b, sqlite_dep, c_flags, cross_target, optimize, .with);
 
-        const tests = b.addTest(.{
-            .name = test_name,
+        const mod = b.addModule(test_name, .{
             .target = cross_target,
             .optimize = optimize,
             .root_source_file = b.path("sqlite.zig"),
             .single_threaded = test_target.single_threaded,
         });
+
+        const tests = b.addTest(.{
+            .name = test_name,
+            .root_module = mod,
+        });
         tests.addIncludePath(b.path("c"));
         tests.addIncludePath(sqlite_dep.path("."));
         tests.linkLibrary(test_sqlite_lib);
@@ -282,13 +290,17 @@ fn addPreprocessStep(b: *std.Build, sqlite_dep: *std.Build.Dependency) void {
 }
 
 fn addZigcrypto(b: *std.Build, sqlite_mod: *std.Build.Module, target: std.Build.ResolvedTarget, optimize: std.builtin.OptimizeMode) *std.Build.Step.InstallArtifact {
-    const exe = b.addSharedLibrary(.{
-        .name = "zigcrypto",
+    const mod = b.addModule("zigcryto", .{
         .root_source_file = b.path("examples/zigcrypto.zig"),
-        .version = null,
         .target = getTarget(target),
         .optimize = optimize,
     });
+    const exe = b.addLibrary(.{
+        .name = "zigcrypto",
+        .root_module = mod,
+        .version = null,
+        .linkage = .dynamic,
+    });
     exe.root_module.addImport("sqlite", sqlite_mod);
 
     const install_artifact = b.addInstallArtifact(exe, .{});
@@ -298,12 +310,15 @@ fn addZigcrypto(b: *std.Build, sqlite_mod: *std.Build.Module, target: std.Build.
 }
 
 fn addZigcryptoTestRun(b: *std.Build, sqlite_mod: *std.Build.Module, target: std.Build.ResolvedTarget, optimize: std.builtin.OptimizeMode) *std.Build.Step.Run {
-    const zigcrypto_test = b.addExecutable(.{
-        .name = "zigcrypto-test",
+    const mod = b.addModule("zigcryto-test", .{
         .root_source_file = b.path("examples/zigcrypto_test.zig"),
         .target = getTarget(target),
         .optimize = optimize,
     });
+    const zigcrypto_test = b.addExecutable(.{
+        .name = "zigcrypto-test",
+        .root_module = mod,
+    });
     zigcrypto_test.root_module.addImport("sqlite", sqlite_mod);
 
     const install = b.addInstallArtifact(zigcrypto_test, .{});

build/Preprocessor.zig

@@ -27,10 +27,10 @@ const mem = std.mem;
 fn readOriginalData(allocator: mem.Allocator, path: []const u8) ![]const u8 {
     var file = try std.fs.cwd().openFile(path, .{});
     defer file.close();
+    var buf: [1024]u8 = undefined;
+    var reader = file.reader(&buf);
 
-    var reader = file.reader();
-
-    const data = reader.readAllAlloc(allocator, 1024 * 1024);
+    const data = reader.interface.readAlloc(allocator, 1024 * 1024);
     return data;
 }
 
@@ -127,13 +127,13 @@ const Processor = struct {
             switch (range) {
                 .delete => |dr| {
                     const to_write = self.data[pos..dr.start];
-                    try writer.writeAll(to_write);
+                    try writer.interface.writeAll(to_write);
                     pos = dr.end;
                 },
                 .replace => |rr| {
                     const to_write = self.data[pos..rr.start];
-                    try writer.writeAll(to_write);
-                    try writer.writeAll(rr.replacement);
+                    try writer.interface.writeAll(to_write);
+                    try writer.interface.writeAll(rr.replacement);
                     pos = rr.end;
                 },
             }
@@ -148,7 +148,7 @@ const Processor = struct {
         // Finally append the remaining data in the buffer (the last range will probably not be the end of the file)
         if (pos < self.data.len) {
             const remaining_data = self.data[pos..];
-            try writer.writeAll(remaining_data);
+            try writer.interface.writeAll(remaining_data);
         }
     }
 };
@@ -196,7 +196,9 @@ pub fn sqlite3(allocator: mem.Allocator, input_path: []const u8, output_path: []
     defer output_file.close();
 
     try output_file.writeAll("/* sqlite3.h edited by the zig-sqlite build script */\n");
-    try processor.dump(output_file.writer());
+    var buf: [1024]u8 = undefined;
+    var out_writer = output_file.writer(&buf);
+    try processor.dump(&out_writer);
 }
 
 pub fn sqlite3ext(allocator: mem.Allocator, input_path: []const u8, output_path: []const u8) !void {
@@ -232,5 +234,7 @@ pub fn sqlite3ext(allocator: mem.Allocator, input_path: []const u8, output_path:
     defer output_file.close();
 
     try output_file.writeAll("/* sqlite3ext.h edited by the zig-sqlite build script */\n");
-    try processor.dump(output_file.writer());
+    var buf: [1024]u8 = undefined;
+    var out_writer = output_file.writer(&buf);
+    try processor.dump(&out_writer);
 }