Merge pull request #4 from Syndica/0.14.0

update to zig 0.14.0 and remove `usingnamespace`

Author: Rexicon226

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ on:
         - master
 
 jobs:
-    lint:
+    test:
         runs-on: ubuntu-latest
         steps:
           - name: checkout
@@ -18,22 +18,10 @@ jobs:
           - name: setup-zig
             uses: mlugg/setup-zig@v1
             with:
-              version: 0.13.0
-    
-          - name: lint
-            run: |
-              zig fmt --check src/ build.zig build.zig.zon
+              version: 0.14.0
 
-    test:
-        runs-on: ubuntu-latest
-        steps:
-          - name: checkout
-            uses: actions/checkout@v2
+          - name: lint
+            run: zig fmt --check src/ build.zig build.zig.zon
 
-          - name: setup-zig
-            uses: mlugg/setup-zig@v1
-            with:
-              version: 0.13.0
-    
           - name: build
             run: zig build test

build.zig

@@ -8,14 +8,26 @@ pub fn build(b: *std.Build) void {
 
     const zstd_dep = b.dependency("zstd", .{});
 
-    const zstd_lib = b.addStaticLibrary(.{
-        .name = "zstd",
+    const translate_c = b.addTranslateC(.{
+        .root_source_file = b.path("src/headers.h"),
         .target = target,
         .optimize = optimize,
     });
+    translate_c.addIncludePath(zstd_dep.path("lib"));
+
+    const force_pic = b.option(bool, "force_pic", "Forces PIC enabled for this library");
+    const zstd_lib = b.addLibrary(.{
+        .name = "zstd",
+        .linkage = .static,
+        .root_module = b.createModule(.{
+            .target = target,
+            .optimize = optimize,
+            .pic = force_pic,
+        }),
+    });
     b.installArtifact(zstd_lib);
+
     zstd_lib.linkLibC();
-    zstd_lib.addIncludePath(zstd_dep.path("lib"));
     zstd_lib.installHeader(zstd_dep.path("lib/zstd.h"), "zstd.h");
     zstd_lib.installHeader(zstd_dep.path("lib/zstd_errors.h"), "zstd_errors.h");
 
@@ -60,6 +72,7 @@ pub fn build(b: *std.Build) void {
         .root_source_file = b.path("src/lib.zig"),
     });
     zstd_mod.linkLibrary(zstd_lib);
+    zstd_mod.addAnonymousImport("c", .{ .root_source_file = translate_c.getOutput() });
 
     const tests_exe = b.addTest(.{
         .target = target,

build.zig.zon

@@ -1,10 +1,11 @@
 .{
-    .name = "zstd",
+    .name = .zstd,
+    .fingerprint = 0x72fd505e092a0bf1,
     .version = "0.0.1",
     .dependencies = .{
         .zstd = .{
-            .url = "https://github.com/facebook/zstd/archive/794ea1b0afca0f020f4e57b6732332231fb23c70.tar.gz",
-            .hash = "1220cc97075e331a87cb201c03a018a1522325d6aa844619a461462fbfdaedb38c42",
+            .url = "git+https://github.com/facebook/zstd#794ea1b0afca0f020f4e57b6732332231fb23c70",
+            .hash = "N-V-__8AAGHFfQBd9HkISearYAEoBRuWI2GQG3Bvdcv_4uuN",
         },
     },
     .paths = .{

libzstd.a

@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c");
 const InBuffer = @import("types.zig").InBuffer;
 const OutBuffer = @import("types.zig").OutBuffer;
 const ResetDirective = @import("types.zig").ResetDirective;

src/c.zig

@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c");
 const InBuffer = @import("types.zig").InBuffer;
 const OutBuffer = @import("types.zig").OutBuffer;
 const ResetDirective = @import("types.zig").ResetDirective;

src/compress.zig

@@ -1,4 +1,4 @@
-const c = @import("c.zig");
+const c = @import("c");
 
 pub const Error = error{
     Generic,

src/decompress.zig

@@ -0,0 +1,2 @@
+#include "zstd.h"
+#include "zstd_errors.h"

src/error.zig

@@ -1,7 +1,10 @@
-pub const c = @import("c.zig");
-pub usingnamespace @import("compress.zig");
-pub usingnamespace @import("decompress.zig");
-pub usingnamespace @import("types.zig");
-pub usingnamespace @import("error.zig");
-pub usingnamespace @import("reader.zig");
-pub usingnamespace @import("writer.zig");
+const compress = @import("compress.zig");
+const decompress = @import("decompress.zig");
+const types = @import("types.zig");
+const errors = @import("error.zig");
+const reader = @import("reader.zig");
+const writer = @import("writer.zig");
+
+pub const Compressor = compress.Compressor;
+pub const writerCtx = writer.writerCtx;
+pub const Reader = reader.Reader;