From b47ad60a009653139dc811ce5c66f9b8f53cd34b Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Sun, 25 Sep 2022 17:36:28 -0700 Subject: [PATCH] update to zig master 0.10.0-dev.4099+d3d24874c --- .github/workflows/nightly.yml | 2 +- .github/workflows/push.yml | 2 +- README.md | 2 +- deps.zig | 10 +++++----- docs/README.md | 2 +- src/cmd/fetch.zig | 2 +- src/cmd/generate.zig | 2 +- zig.mod | 2 +- zigmod.lock | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 0fb65ba2654f520cbbe3cf778aadc92332e9c83e..e02eba0b004407770b7f8b19494e5b8d26dcc145 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -26,7 +26,7 @@ jobs: - name: Setup Zig uses: goto-bus-stop/setup-zig@v1 with: - version: "0.10.0-dev.3998+c25ce5bba" + version: "0.10.0-dev.4099+d3d24874c" - run: zig version - run: zig env diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index cc879703efe8f6d442eadb32a31e60e89d01f2a0..343c6249124335312eab49741918a3c3d513b933 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Zig uses: goto-bus-stop/setup-zig@v1 with: - version: "0.10.0-dev.3998+c25ce5bba" + version: "0.10.0-dev.4099+d3d24874c" - run: zig version - run: zig env diff --git a/README.md b/README.md index 1ed31bcfea8efebb568a3fec10eaf6f3ef4f5ea5..1ed15f8dbe05a0a1dd05ae65c7aae7c2fa70c191 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ A package manager for the Zig programming language. - https://github.com/nektro/zigmod/releases ## Built With -- Zig master (at least `0.10.0-dev.3998+c25ce5bba`) +- Zig master (at least `0.10.0-dev.4099+d3d24874c`) - See [`zig.mod`](./zig.mod) and [`zigmod.lock`](./zigmod.lock) ### Build from Source diff --git a/deps.zig b/deps.zig index f8cbe8ed32e4bccee6f4b8c242cc2304c0b7eaec..7ceef17a089e7c7b1eed269401a07ab8cf1f9169 100644 --- a/deps.zig +++ b/deps.zig @@ -52,7 +52,7 @@ pub fn fetch(exe: *std.build.LibExeObjStep) void { exe.step.dependOn(&GitExactStep.create(b, "https://github.com/MasterQ32/zig-uri", "e879df3a236869f92298fbe2db3c25e6e84cfd4c").step); exe.step.dependOn(&GitExactStep.create(b, "https://github.com/marlersoft/zigwin32", "209f07cc5861c7bd9c3010a37f32bf6244f9a158").step); exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/arqv-ini", "1a9b2e90379895e197893b6e19c93bd213ad36e6").step); - exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/iguanaTLS", "c9403b8414d7f80b5e2c04c8f1f8780ca1d2827f").step); + exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/iguanaTLS", "bd003aa75c8bc00e8a61a1be575b9305249dc749").step); exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-ansi", "d4a53bcac5b87abecc65491109ec22aaf5f3dc2f").step); exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-detect-license", "de5c285d999eea68b9189b48bb000243fef0a689").step); exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-extras", "01fae956e2f17aa992e717e041a3dd457d440b31").step); @@ -104,7 +104,7 @@ pub fn addAllTo(exe: *std.build.LibExeObjStep) void { llc = true; } for (pkg.c_include_dirs) |item| { - exe.addIncludeDir(b.fmt("{s}/{s}", .{ root, item })); + exe.addIncludePath(b.fmt("{s}/{s}", .{ root, item })); llc = true; } for (pkg.c_source_files) |item| { @@ -143,7 +143,7 @@ pub const Package = struct { }; fn checkMinZig(current: std.SemanticVersion, exe: *std.build.LibExeObjStep) void { - const min = std.SemanticVersion.parse("0.10.0-dev.3998+c25ce5bba") catch return; + const min = std.SemanticVersion.parse("0.10.0-dev.4099+d3d24874c") catch return; if (current.order(min).compare(.lt)) @panic(exe.builder.fmt("Your Zig version v{} does not meet the minimum build requirement of v{}", .{current, min})); } @@ -164,9 +164,9 @@ pub const package_data = struct { .entry = "/git/github.com/nektro/arqv-ini/1a9b2e90379895e197893b6e19c93bd213ad36e6/src/ini.zig", }; pub var _csbnipaad8n7 = Package{ - .store = "/git/github.com/nektro/iguanaTLS/c9403b8414d7f80b5e2c04c8f1f8780ca1d2827f", + .store = "/git/github.com/nektro/iguanaTLS/bd003aa75c8bc00e8a61a1be575b9305249dc749", .name = "iguanaTLS", - .entry = "/git/github.com/nektro/iguanaTLS/c9403b8414d7f80b5e2c04c8f1f8780ca1d2827f/src/main.zig", + .entry = "/git/github.com/nektro/iguanaTLS/bd003aa75c8bc00e8a61a1be575b9305249dc749/src/main.zig", }; pub var _s84v9o48ucb0 = Package{ .store = "/git/github.com/nektro/zig-ansi/d4a53bcac5b87abecc65491109ec22aaf5f3dc2f", diff --git a/docs/README.md b/docs/README.md index 28a381ccffbc2094cf06460a17591ba144a0eabc..9a0466800bb16ceacea6646e00ff0f374d57eaca 100644 --- a/docs/README.md +++ b/docs/README.md @@ -10,7 +10,7 @@ The rest of this documentation will assume you already have Zig installed. As Zig is still in development itself, if you plan to contribute to Zigmod you will need a master download of Zig. Those can be obtained from https://ziglang.org/download/#release-master. -The earliest Zig release this Zigmod was verified to work with is `0.10.0-dev.3998+c25ce5bba`. +The earliest Zig release this Zigmod was verified to work with is `0.10.0-dev.4099+d3d24874c`. ## Download You may download a precompiled binary from https://github.com/nektro/zigmod/releases or build the project from source. diff --git a/src/cmd/fetch.zig b/src/cmd/fetch.zig index 495a42947368a2bf7226554b105227261bd3f6d2..9d064fdae1ce569a60f94efcd1e969a3ccf0b7d1 100644 --- a/src/cmd/fetch.zig +++ b/src/cmd/fetch.zig @@ -67,7 +67,7 @@ pub fn create_depszig(alloc: std.mem.Allocator, cachepath: string, dir: std.fs.D \\ llc = true; \\ } \\ inline for (pkg.c_include_dirs) |item| { - \\ exe.addIncludeDir(@field(dirs, decl.name) ++ "/" ++ item); + \\ exe.addIncludePath(@field(dirs, decl.name) ++ "/" ++ item); \\ llc = true; \\ } \\ inline for (pkg.c_source_files) |item| { diff --git a/src/cmd/generate.zig b/src/cmd/generate.zig index 9eab0f133034105c06fb14eba38c9535176391c0..d1042e89e13e42797440c08edc39f70d6378bbdf 100644 --- a/src/cmd/generate.zig +++ b/src/cmd/generate.zig @@ -139,7 +139,7 @@ pub fn create_depszig(alloc: std.mem.Allocator, cachepath: string, dir: std.fs.D \\ llc = true; \\ } \\ for (pkg.c_include_dirs) |item| { - \\ exe.addIncludeDir(b.fmt("{s}/{s}", .{ root, item })); + \\ exe.addIncludePath(b.fmt("{s}/{s}", .{ root, item })); \\ llc = true; \\ } \\ for (pkg.c_source_files) |item| { diff --git a/zig.mod b/zig.mod index dd0888146dd222a17e049320db78e03a7b2c9647..f80c3ac9f9ff35606e69ab498f85975f1cc82129 100644 --- a/zig.mod +++ b/zig.mod @@ -3,7 +3,7 @@ name: zigmod main: src/lib.zig license: MIT description: A package manager for the Zig programming language. -min_zig_version: 0.10.0-dev.3998+c25ce5bba +min_zig_version: 0.10.0-dev.4099+d3d24874c dependencies: - src: git https://gist.github.com/nektro/d468fea84f8217e4c26ee8fbeeea38cc # yaml - src: git https://github.com/nektro/zig-ansi diff --git a/zigmod.lock b/zigmod.lock index 4fceaab5fca18c84e4a3d7104bc19e6885e45bd3..9c6cfa0d06e32b07b122ef8fe02c33201f2fb292 100644 --- a/zigmod.lock +++ b/zigmod.lock @@ -3,7 +3,7 @@ git https://gist.github.com/nektro/d468fea84f8217e4c26ee8fbeeea38cc commit-0911d git https://github.com/MasterQ32/zig-uri commit-e879df3a236869f92298fbe2db3c25e6e84cfd4c git https://github.com/marlersoft/zigwin32 commit-209f07cc5861c7bd9c3010a37f32bf6244f9a158 git https://github.com/nektro/arqv-ini commit-1a9b2e90379895e197893b6e19c93bd213ad36e6 -git https://github.com/nektro/iguanaTLS commit-c9403b8414d7f80b5e2c04c8f1f8780ca1d2827f +git https://github.com/nektro/iguanaTLS commit-bd003aa75c8bc00e8a61a1be575b9305249dc749 git https://github.com/nektro/zig-ansi commit-d4a53bcac5b87abecc65491109ec22aaf5f3dc2f git https://github.com/nektro/zig-detect-license commit-de5c285d999eea68b9189b48bb000243fef0a689 git https://github.com/nektro/zig-extras commit-01fae956e2f17aa992e717e041a3dd457d440b31 -- 2.54.0