| ... | ... | @@ -279,7 +279,7 @@ pub fn fetchAndAddDependencies( |
| 279 | 279 | const sub_prefix = try std.fmt.allocPrint(arena, "{s}{s}.", .{ name_prefix, name }); |
| 280 | 280 | const fqn = sub_prefix[0 .. sub_prefix.len - 1]; |
| 281 | 281 | |
| 282 | | const sub_pkg = try fetchAndUnpack( |
| 282 | const sub = try fetchAndUnpack( |
| 283 | 283 | thread_pool, |
| 284 | 284 | http_client, |
| 285 | 285 | global_cache_directory, |
| ... | ... | @@ -290,28 +290,30 @@ pub fn fetchAndAddDependencies( |
| 290 | 290 | all_modules, |
| 291 | 291 | ); |
| 292 | 292 | |
| 293 | | try sub_pkg.fetchAndAddDependencies( |
| 294 | | deps_pkg, |
| 295 | | arena, |
| 296 | | thread_pool, |
| 297 | | http_client, |
| 298 | | sub_pkg.root_src_directory, |
| 299 | | global_cache_directory, |
| 300 | | local_cache_directory, |
| 301 | | dependencies_source, |
| 302 | | build_roots_source, |
| 303 | | sub_prefix, |
| 304 | | error_bundle, |
| 305 | | all_modules, |
| 306 | | ); |
| 293 | if (!sub.found_existing) { |
| 294 | try sub.mod.fetchAndAddDependencies( |
| 295 | deps_pkg, |
| 296 | arena, |
| 297 | thread_pool, |
| 298 | http_client, |
| 299 | sub.mod.root_src_directory, |
| 300 | global_cache_directory, |
| 301 | local_cache_directory, |
| 302 | dependencies_source, |
| 303 | build_roots_source, |
| 304 | sub_prefix, |
| 305 | error_bundle, |
| 306 | all_modules, |
| 307 | ); |
| 308 | } |
| 307 | 309 | |
| 308 | | try pkg.add(gpa, name, sub_pkg); |
| 310 | try pkg.add(gpa, name, sub.mod); |
| 309 | 311 | if (deps_pkg.table.get(dep.hash.?)) |other_sub| { |
| 310 | 312 | // This should be the same package (and hence module) since it's the same hash |
| 311 | 313 | // TODO: dedup multiple versions of the same package |
| 312 | | assert(other_sub == sub_pkg); |
| 314 | assert(other_sub == sub.mod); |
| 313 | 315 | } else { |
| 314 | | try deps_pkg.add(gpa, dep.hash.?, sub_pkg); |
| 316 | try deps_pkg.add(gpa, dep.hash.?, sub.mod); |
| 315 | 317 | } |
| 316 | 318 | |
| 317 | 319 | try dependencies_source.writer().print(" pub const {s} = @import(\"{}\");\n", .{ |
| ... | ... | @@ -413,7 +415,7 @@ fn fetchAndUnpack( |
| 413 | 415 | build_roots_source: *std.ArrayList(u8), |
| 414 | 416 | fqn: []const u8, |
| 415 | 417 | all_modules: *AllModules, |
| 416 | | ) !*Package { |
| 418 | ) !struct { mod: *Package, found_existing: bool } { |
| 417 | 419 | const gpa = http_client.allocator; |
| 418 | 420 | const s = fs.path.sep_str; |
| 419 | 421 | |
| ... | ... | @@ -441,7 +443,10 @@ fn fetchAndUnpack( |
| 441 | 443 | const gop = try all_modules.getOrPut(gpa, hex_digest.*); |
| 442 | 444 | if (gop.found_existing) { |
| 443 | 445 | gpa.free(build_root); |
| 444 | | return gop.value_ptr.*; |
| 446 | return .{ |
| 447 | .mod = gop.value_ptr.*, |
| 448 | .found_existing = true, |
| 449 | }; |
| 445 | 450 | } |
| 446 | 451 | |
| 447 | 452 | const ptr = try gpa.create(Package); |
| ... | ... | @@ -460,7 +465,10 @@ fn fetchAndUnpack( |
| 460 | 465 | }; |
| 461 | 466 | |
| 462 | 467 | gop.value_ptr.* = ptr; |
| 463 | | return ptr; |
| 468 | return .{ |
| 469 | .mod = ptr, |
| 470 | .found_existing = false, |
| 471 | }; |
| 464 | 472 | } |
| 465 | 473 | |
| 466 | 474 | const uri = try std.Uri.parse(dep.url); |
| ... | ... | @@ -575,7 +583,11 @@ fn fetchAndUnpack( |
| 575 | 583 | std.zig.fmtId(fqn), std.zig.fmtEscapes(build_root), |
| 576 | 584 | }); |
| 577 | 585 | |
| 578 | | return createWithDir(gpa, global_cache_directory, pkg_dir_sub_path, build_zig_basename); |
| 586 | const mod = try createWithDir(gpa, global_cache_directory, pkg_dir_sub_path, build_zig_basename); |
| 587 | return .{ |
| 588 | .mod = mod, |
| 589 | .found_existing = false, |
| 590 | }; |
| 579 | 591 | } |
| 580 | 592 | |
| 581 | 593 | fn unpackTarball( |
Matthew Lugg <mlugg@mlugg.co.uk> 2023-04-23 02:11:04+01:00
Andrew Kelley <andrew@ziglang.org> 2023-05-18 00:27:21-07:00
src