authorgravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2023-03-20 12:00:37 -07:00
committergravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2023-03-20 12:00:37 -07:00
logfaf6058318dad6e880f53c2bee6a45436536600d
tree352aec7a0baf2f6544b8dc186b780d9ea979815c
parentab25f4a6d42217b41a7cb2e6b988ddac977fb18b

regenerate deps.zig

1 files changed, 61 insertions(+), 56 deletions(-)

deps.zig+61-56
......@@ -22,7 +22,7 @@ pub const GitExactStep = struct {
2222 var urlpath = url;
2323 urlpath = trimPrefix(u8, urlpath, "https://");
2424 urlpath = trimPrefix(u8, urlpath, "git://");
25 const repopath = b.fmt("{s}/zigmod/deps/git/{s}/{s}", .{ b.cache_root, urlpath, commit });
25 const repopath = b.fmt("{s}/zigmod/deps/git/{s}/{s}", .{ b.cache_root.path.?, urlpath, commit });
2626 flip(std.fs.cwd().access(repopath, .{})) catch return result;
2727
2828 var clonestep = std.build.RunStep.create(b, "clone");
......@@ -45,27 +45,27 @@ pub fn fetch(exe: *std.build.LibExeObjStep) void {
4545 const b = exe.builder;
4646 inline for (comptime std.meta.declarations(package_data)) |decl| {
4747 const path = &@field(package_data, decl.name).entry;
48 const root = if (@field(package_data, decl.name).store) |_| b.cache_root else ".";
48 const root = if (@field(package_data, decl.name).store) |_| b.cache_root.path.? else ".";
4949 if (path.* != null) path.* = b.fmt("{s}/zigmod/deps{s}", .{ root, path.*.? });
5050 }
51 exe.step.dependOn(&GitExactStep.create(b, "https://gist.github.com/nektro/d468fea84f8217e4c26ee8fbeeea38cc", "00f00febc5ad7c485fb101583d5a74930f6ac313").step);
5251 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/MasterQ32/zig-uri", "d4299ad6043ad19f2ce0676687b0bff57273eae2").step);
53 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/marlersoft/zigwin32", "56cf335ddcdb72a6d7059c5b6f131263830b3eca").step);
52 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/marlersoft/zigwin32", "b70e7f818d77a0c0f39b0bd9c549e16439ff5780").step);
5453 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/arqv-ini", "ee395fd34e152d9067def609d86b7af5382b83b1").step);
55 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/iguanaTLS", "5dee3ead2b289319080834add91b5f35dfdb1847").step);
56 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-ansi", "8d6fdb4983a616940c1d5137110292a7862f6a7e").step);
57 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-detect-license", "de5c285d999eea68b9189b48bb000243fef0a689").step);
58 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-extras", "b45c99e2e747e3bb8df5e1051078cacb1470a430").step);
59 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-inquirer", "25e35a46400cfa1d7278436c0b7d14d314889d7c").step);
60 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-json", "0e7d026b0d3889ed7f96e1b24566a66cd9df6cb3").step);
61 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-leven", "ab852cf74fa0b4edc530d925f0654b62c60365bf").step);
54 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/iguanaTLS", "9356ff1d2edf627b531a2829a679a7b6d908a6ca").step);
55 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-ansi", "faf9585bfe5980c24748ee8a3e6a22faaa50b437").step);
56 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-detect-license", "8f13721bd18c0e546841b6f2e11da839550d6287").step);
57 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-extras", "d34ac633f0a0af8d348b66a38e7497d031f027b1").step);
58 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-inquirer", "5cc2a5565d04fe2c0085f0d6818590e800d9dcf7").step);
59 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-json", "b0111b41d725682629b7f899b90500ddad3818bf").step);
60 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-leven", "550cabd5a18ace5e67761bc5b867c10e926f4314").step);
6261 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-licenses", "c9b8cbf3565675a056ad4e9b57cb4f84020e7680").step);
6362 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-licenses-text", "3c07c6e4eb0965dafd0b029c632f823631b3169c").step);
6463 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-range", "4b2f12808aa09be4b27a163efc424dd4e0415992").step);
65 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-time", "aff2df866eb16ad781e26a25f8b664d498e2211a").step);
66 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/truemedian/hzzp", "2d2ab34b666e6806a6f6c98cc50ca94e606c9103").step);
64 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-time", "bfb7da7b8ee92b6c07f90a14b044a9b8f4df182c").step);
65 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-yaml", "3f3641e90697546e7f8aeef365815c4ccab168b0").step);
66 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/truemedian/hzzp", "9b5de4d8626ddedf925bf82dbe49610513485b9d").step);
6767 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/truemedian/zfetch", "829973144f680cd16be16923041fa810c1dee417").step);
68 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/ziglibs/known-folders", "6b37490ac7285133bf09441850b8102c9728a776").step);
68 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/ziglibs/known-folders", "d13ba6137084e55f873f6afb67447fe8906cc951").step);
6969 exe.step.dependOn(&GitExactStep.create(b, "https://github.com/yaml/libyaml", "2c891fc7a770e8ba2fec34fc6b545c672beb37e6").step);
7070}
7171
......@@ -94,7 +94,7 @@ pub fn addAllTo(exe: *std.build.LibExeObjStep) void {
9494 var vcpkg = false;
9595 inline for (comptime std.meta.declarations(package_data)) |decl| {
9696 const pkg = @as(Package, @field(package_data, decl.name));
97 const root = if (pkg.store) |st| b.fmt("{s}/zigmod/deps/{s}", .{ b.cache_root, st }) else ".";
97 const root = if (pkg.store) |st| b.fmt("{s}/zigmod/deps/{s}", .{ b.cache_root.path.?, st }) else ".";
9898 for (pkg.system_libs) |item| {
9999 exe.linkSystemLibrary(item);
100100 llc = true;
......@@ -129,24 +129,30 @@ pub const Package = struct {
129129 system_libs: []const string = &.{},
130130 frameworks: []const string = &.{},
131131 vcpkg: bool = false,
132 module: ?ModuleDependency = null,
132133
133 pub fn zp(self: *const Package, b: *std.build.Builder) ModuleDependency {
134 pub fn zp(self: *Package, b: *std.build.Builder) ModuleDependency {
134135 var temp: [100]ModuleDependency = undefined;
135 for (self.deps) |item, i| {
136 for (self.deps, 0..) |item, i| {
136137 temp[i] = item.zp(b);
137138 }
138 return .{
139 if (self.module) |mod| {
140 return mod;
141 }
142 const result = ModuleDependency{
139143 .name = self.name,
140144 .module = b.createModule(.{
141145 .source_file = .{ .path = self.entry.? },
142146 .dependencies = b.allocator.dupe(ModuleDependency, temp[0..self.deps.len]) catch @panic("oom"),
143147 }),
144148 };
149 self.module = result;
150 return result;
145151 }
146152};
147153
148154fn checkMinZig(current: std.SemanticVersion, exe: *std.build.LibExeObjStep) void {
149 const min = std.SemanticVersion.parse("0.11.0-dev.1570+693b12f8e") catch return;
155 const min = std.SemanticVersion.parse("0.11.0-dev.1681+0bb178bbb") catch return;
150156 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}));
151157}
152158
......@@ -157,9 +163,9 @@ pub const package_data = struct {
157163 .entry = "/git/github.com/MasterQ32/zig-uri/d4299ad6043ad19f2ce0676687b0bff57273eae2/uri.zig",
158164 };
159165 pub var _o6ogpor87xc2 = Package{
160 .store = "/git/github.com/marlersoft/zigwin32/56cf335ddcdb72a6d7059c5b6f131263830b3eca",
166 .store = "/git/github.com/marlersoft/zigwin32/b70e7f818d77a0c0f39b0bd9c549e16439ff5780",
161167 .name = "win32",
162 .entry = "/git/github.com/marlersoft/zigwin32/56cf335ddcdb72a6d7059c5b6f131263830b3eca/win32.zig",
168 .entry = "/git/github.com/marlersoft/zigwin32/b70e7f818d77a0c0f39b0bd9c549e16439ff5780/win32.zig",
163169 };
164170 pub var _u7sysdckdymi = Package{
165171 .store = "/git/github.com/nektro/arqv-ini/ee395fd34e152d9067def609d86b7af5382b83b1",
......@@ -167,14 +173,25 @@ pub const package_data = struct {
167173 .entry = "/git/github.com/nektro/arqv-ini/ee395fd34e152d9067def609d86b7af5382b83b1/src/ini.zig",
168174 };
169175 pub var _csbnipaad8n7 = Package{
170 .store = "/git/github.com/nektro/iguanaTLS/5dee3ead2b289319080834add91b5f35dfdb1847",
176 .store = "/git/github.com/nektro/iguanaTLS/9356ff1d2edf627b531a2829a679a7b6d908a6ca",
171177 .name = "iguanaTLS",
172 .entry = "/git/github.com/nektro/iguanaTLS/5dee3ead2b289319080834add91b5f35dfdb1847/src/main.zig",
178 .entry = "/git/github.com/nektro/iguanaTLS/9356ff1d2edf627b531a2829a679a7b6d908a6ca/src/main.zig",
173179 };
174180 pub var _s84v9o48ucb0 = Package{
175 .store = "/git/github.com/nektro/zig-ansi/8d6fdb4983a616940c1d5137110292a7862f6a7e",
181 .store = "/git/github.com/nektro/zig-ansi/faf9585bfe5980c24748ee8a3e6a22faaa50b437",
176182 .name = "ansi",
177 .entry = "/git/github.com/nektro/zig-ansi/8d6fdb4983a616940c1d5137110292a7862f6a7e/src/lib.zig",
183 .entry = "/git/github.com/nektro/zig-ansi/faf9585bfe5980c24748ee8a3e6a22faaa50b437/src/lib.zig",
184 };
185 pub var _f7dubzb7cyqe = Package{
186 .store = "/git/github.com/nektro/zig-extras/d34ac633f0a0af8d348b66a38e7497d031f027b1",
187 .name = "extras",
188 .entry = "/git/github.com/nektro/zig-extras/d34ac633f0a0af8d348b66a38e7497d031f027b1/src/lib.zig",
189 };
190 pub var _ocmr9rtohgcc = Package{
191 .store = "/git/github.com/nektro/zig-json/b0111b41d725682629b7f899b90500ddad3818bf",
192 .name = "json",
193 .entry = "/git/github.com/nektro/zig-json/b0111b41d725682629b7f899b90500ddad3818bf/src/lib.zig",
194 .deps = &[_]*Package{ &_f7dubzb7cyqe },
178195 };
179196 pub var _0npcrzfdlrvk = Package{
180197 .store = "/git/github.com/nektro/zig-licenses/c9b8cbf3565675a056ad4e9b57cb4f84020e7680",
......@@ -191,52 +208,40 @@ pub const package_data = struct {
191208 .name = "range",
192209 .entry = "/git/github.com/nektro/zig-range/4b2f12808aa09be4b27a163efc424dd4e0415992/src/lib.zig",
193210 };
194 pub var _f7dubzb7cyqe = Package{
195 .store = "/git/github.com/nektro/zig-extras/b45c99e2e747e3bb8df5e1051078cacb1470a430",
196 .name = "extras",
197 .entry = "/git/github.com/nektro/zig-extras/b45c99e2e747e3bb8df5e1051078cacb1470a430/src/lib.zig",
198 .deps = &[_]*Package{ &_tnj3qf44tpeq },
199 };
200 pub var _g982zq6e8wsv = Package{
201 .store = "/git/gist.github.com/nektro/d468fea84f8217e4c26ee8fbeeea38cc/00f00febc5ad7c485fb101583d5a74930f6ac313",
202 .name = "yaml",
203 .entry = "/git/gist.github.com/nektro/d468fea84f8217e4c26ee8fbeeea38cc/00f00febc5ad7c485fb101583d5a74930f6ac313/yaml.zig",
204 .deps = &[_]*Package{ &_f7dubzb7cyqe },
205 };
206211 pub var _c1xirp1ota5p = Package{
207 .store = "/git/github.com/nektro/zig-inquirer/25e35a46400cfa1d7278436c0b7d14d314889d7c",
212 .store = "/git/github.com/nektro/zig-inquirer/5cc2a5565d04fe2c0085f0d6818590e800d9dcf7",
208213 .name = "inquirer",
209 .entry = "/git/github.com/nektro/zig-inquirer/25e35a46400cfa1d7278436c0b7d14d314889d7c/src/lib.zig",
214 .entry = "/git/github.com/nektro/zig-inquirer/5cc2a5565d04fe2c0085f0d6818590e800d9dcf7/src/lib.zig",
210215 .deps = &[_]*Package{ &_s84v9o48ucb0, &_tnj3qf44tpeq },
211216 };
212 pub var _ocmr9rtohgcc = Package{
213 .store = "/git/github.com/nektro/zig-json/0e7d026b0d3889ed7f96e1b24566a66cd9df6cb3",
214 .name = "json",
215 .entry = "/git/github.com/nektro/zig-json/0e7d026b0d3889ed7f96e1b24566a66cd9df6cb3/src/lib.zig",
216 .deps = &[_]*Package{ &_f7dubzb7cyqe },
217 };
218217 pub var _96h80ezrvj7i = Package{
219 .store = "/git/github.com/nektro/zig-leven/ab852cf74fa0b4edc530d925f0654b62c60365bf",
218 .store = "/git/github.com/nektro/zig-leven/550cabd5a18ace5e67761bc5b867c10e926f4314",
220219 .name = "leven",
221 .entry = "/git/github.com/nektro/zig-leven/ab852cf74fa0b4edc530d925f0654b62c60365bf/src/lib.zig",
220 .entry = "/git/github.com/nektro/zig-leven/550cabd5a18ace5e67761bc5b867c10e926f4314/src/lib.zig",
222221 .deps = &[_]*Package{ &_tnj3qf44tpeq },
223222 };
224223 pub var _2ovav391ivak = Package{
225 .store = "/git/github.com/nektro/zig-detect-license/de5c285d999eea68b9189b48bb000243fef0a689",
224 .store = "/git/github.com/nektro/zig-detect-license/8f13721bd18c0e546841b6f2e11da839550d6287",
226225 .name = "detect-license",
227 .entry = "/git/github.com/nektro/zig-detect-license/de5c285d999eea68b9189b48bb000243fef0a689/src/lib.zig",
226 .entry = "/git/github.com/nektro/zig-detect-license/8f13721bd18c0e546841b6f2e11da839550d6287/src/lib.zig",
228227 .deps = &[_]*Package{ &_pt88y5d80m25, &_96h80ezrvj7i },
229228 };
230229 pub var _iecwp4b3bsfm = Package{
231 .store = "/git/github.com/nektro/zig-time/aff2df866eb16ad781e26a25f8b664d498e2211a",
230 .store = "/git/github.com/nektro/zig-time/bfb7da7b8ee92b6c07f90a14b044a9b8f4df182c",
232231 .name = "time",
233 .entry = "/git/github.com/nektro/zig-time/aff2df866eb16ad781e26a25f8b664d498e2211a/time.zig",
232 .entry = "/git/github.com/nektro/zig-time/bfb7da7b8ee92b6c07f90a14b044a9b8f4df182c/time.zig",
233 .deps = &[_]*Package{ &_f7dubzb7cyqe },
234 };
235 pub var _g982zq6e8wsv = Package{
236 .store = "/git/github.com/nektro/zig-yaml/3f3641e90697546e7f8aeef365815c4ccab168b0",
237 .name = "yaml",
238 .entry = "/git/github.com/nektro/zig-yaml/3f3641e90697546e7f8aeef365815c4ccab168b0/yaml.zig",
234239 .deps = &[_]*Package{ &_f7dubzb7cyqe },
235240 };
236241 pub var _9k24gimke1an = Package{
237 .store = "/git/github.com/truemedian/hzzp/2d2ab34b666e6806a6f6c98cc50ca94e606c9103",
242 .store = "/git/github.com/truemedian/hzzp/9b5de4d8626ddedf925bf82dbe49610513485b9d",
238243 .name = "hzzp",
239 .entry = "/git/github.com/truemedian/hzzp/2d2ab34b666e6806a6f6c98cc50ca94e606c9103/src/main.zig",
244 .entry = "/git/github.com/truemedian/hzzp/9b5de4d8626ddedf925bf82dbe49610513485b9d/src/main.zig",
240245 };
241246 pub var _ejw82j2ipa0e = Package{
242247 .store = "/git/github.com/truemedian/zfetch/829973144f680cd16be16923041fa810c1dee417",
......@@ -245,9 +250,9 @@ pub const package_data = struct {
245250 .deps = &[_]*Package{ &_9k24gimke1an, &_csbnipaad8n7, &_u9w9dpp6p804 },
246251 };
247252 pub var _2ta738wrqbaq = Package{
248 .store = "/git/github.com/ziglibs/known-folders/6b37490ac7285133bf09441850b8102c9728a776",
253 .store = "/git/github.com/ziglibs/known-folders/d13ba6137084e55f873f6afb67447fe8906cc951",
249254 .name = "known-folders",
250 .entry = "/git/github.com/ziglibs/known-folders/6b37490ac7285133bf09441850b8102c9728a776/known-folders.zig",
255 .entry = "/git/github.com/ziglibs/known-folders/d13ba6137084e55f873f6afb67447fe8906cc951/known-folders.zig",
251256 };
252257 pub var _89ujp8gq842x = Package{
253258 .name = "zigmod",
......@@ -264,7 +269,7 @@ pub const package_data = struct {
264269 };
265270};
266271
267pub const packages = [_]*const Package{
272pub const packages = [_]*Package{
268273 &package_data._89ujp8gq842x,
269274 &package_data._o6ogpor87xc2,
270275 &package_data._f7dubzb7cyqe,