| author |  Meghan Denny <hello@nektro.net> 2021-07-29 04:57:54 -07:00 |
| committer | Meghan Denny <hello@nektro.net> 2021-07-29 04:57:54 -07:00 |
| log | d312857810eefe270ea5edb8f5517ce74c839d54 |
| tree | 1e1ff3b74257c839533e6773539db6bb1894c765 |
| parent | 126199765cc76294e3534f41ef147d925c0cd7f8 |
update to zig master `0.9.0-dev.677`
6 files changed, 11 insertions(+), 7 deletions(-)
.circleci/config.yml+1-1
| ... | @@ -15,7 +15,7 @@ jobs: | ... | @@ -15,7 +15,7 @@ jobs: |
| 15 | - run: git submodule update --init --recursive | 15 | - run: git submodule update --init --recursive |
| 16 | 16 | ||
| 17 | - run: apt -y install xz-utils jq | 17 | - run: apt -y install xz-utils jq |
| 18 | - run: ./download_zig.sh 0.9.0-dev.642+b87105c92 | 18 | - run: ./download_zig.sh 0.9.0-dev.677+ed174b738 |
| 19 | - run: zig version | 19 | - run: zig version |
| 20 | - run: zig env | 20 | - run: zig env |
| 21 | - run: zig build -Dbootstrap | 21 | - run: zig build -Dbootstrap |
README.md+1-1
| ... | @@ -17,7 +17,7 @@ A package manager for the Zig programming language. | ... | @@ -17,7 +17,7 @@ A package manager for the Zig programming language. |
| 17 | - https://github.com/nektro/zigmod/releases | 17 | - https://github.com/nektro/zigmod/releases |
| 18 | 18 | ||
| 19 | ## Built With | 19 | ## Built With |
| 20 | - Zig master `0.9.0-dev.642+b87105c92` | 20 | - Zig master `0.9.0-dev.677+ed174b738` |
| 21 | 21 | ||
| 22 | ### Build from Source | 22 | ### Build from Source |
| 23 | Initially, | 23 | Initially, |
docs/README.md+1-1
| ... | @@ -10,7 +10,7 @@ The rest of this documentation will assume you already have Zig installed. | ... | @@ -10,7 +10,7 @@ The rest of this documentation will assume you already have Zig installed. |
| 10 | 10 | ||
| 11 | 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. | 11 | 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. |
| 12 | 12 | ||
| 13 | The most recent release Zigmod was verified to work with is `0.9.0-dev.642+b87105c92`. | 13 | The most recent release Zigmod was verified to work with is `0.9.0-dev.677+ed174b738`. |
| 14 | 14 | ||
| 15 | ## Download | 15 | ## Download |
| 16 | You may download a precompiled binary from https://github.com/nektro/zigmod/releases or build the project from source. | 16 | You may download a precompiled binary from https://github.com/nektro/zigmod/releases or build the project from source. |
src/common.zig+3-1
| ... | @@ -285,7 +285,9 @@ fn add_files_package(pkg_name: []const u8, dirs: []const []const u8, parent_name | ... | @@ -285,7 +285,9 @@ fn add_files_package(pkg_name: []const u8, dirs: []const []const u8, parent_name |
| 285 | defer map.deinit(); | 285 | defer map.deinit(); |
| 286 | 286 | ||
| 287 | for (dirs) |dir_path| { | 287 | for (dirs) |dir_path| { |
| 288 | var walker = try std.fs.walkPath(gpa, dir_path); | 288 | const dir = try std.fs.cwd().openDir(dir_path, .{ .iterate = true }); |
| 289 | var walker = try dir.walk(gpa); | ||
| 290 | defer walker.deinit(); | ||
| 289 | while (try walker.next()) |p| { | 291 | while (try walker.next()) |p| { |
| 290 | if (p.kind == .Directory) { | 292 | if (p.kind == .Directory) { |
| 291 | continue; | 293 | continue; |
src/util/funcs.zig+3-1
| ... | @@ -142,7 +142,9 @@ pub fn list_contains_gen(comptime T: type, haystack: []const T, needle: T) bool | ... | @@ -142,7 +142,9 @@ pub fn list_contains_gen(comptime T: type, haystack: []const T, needle: T) bool |
| 142 | } | 142 | } |
| 143 | 143 | ||
| 144 | pub fn file_list(dpath: []const u8, list: *std.ArrayList([]const u8)) !void { | 144 | pub fn file_list(dpath: []const u8, list: *std.ArrayList([]const u8)) !void { |
| 145 | var walk = try std.fs.walkPath(gpa, dpath); | 145 | const dir = try std.fs.cwd().openDir(dpath, .{ .iterate = true }); |
| 146 | var walk = try dir.walk(gpa); | ||
| 147 | defer walk.deinit(); | ||
| 146 | while (true) { | 148 | while (true) { |
| 147 | if (try walk.next()) |entry| { | 149 | if (try walk.next()) |entry| { |
| 148 | if (entry.kind != .File) { | 150 | if (entry.kind != .File) { |
src/util/module.zig+2-2
| ... | @@ -61,8 +61,8 @@ pub const Module = struct { | ... | @@ -61,8 +61,8 @@ pub const Module = struct { |
| 61 | const file_list_2 = &std.ArrayList([]const u8).init(gpa); | 61 | const file_list_2 = &std.ArrayList([]const u8).init(gpa); |
| 62 | defer file_list_2.deinit(); | 62 | defer file_list_2.deinit(); |
| 63 | for (file_list_1.items) |item| { | 63 | for (file_list_1.items) |item| { |
| 64 | const _a = u.trim_prefix(item, cdpath)[1..]; | 64 | const _a = u.trim_prefix(item, cdpath); |
| 65 | const _b = u.trim_prefix(_a, self.clean_path)[1..]; | 65 | const _b = u.trim_prefix(_a, self.clean_path); |
| 66 | if (_b[0] == '.') continue; | 66 | if (_b[0] == '.') continue; |
| 67 | try file_list_2.append(_b); | 67 | try file_list_2.append(_b); |
| 68 | } | 68 | } |