mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 13:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Only add build.zig module dependencies once

Browse source
This commit is contained in:
mlugg 2023-04-23 02:11:04 +01:00 • committed by Andrew Kelley
parent f65e8c7862
commit db7496d6ef
1 changed files with 34 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/Package.zig
View file

@ -279,7 +279,7 @@ pub fn fetchAndAddDependencies(
const sub_prefix = try std.fmt.allocPrint(arena, "{s}{s}.", .{ name_prefix, name }); const sub_prefix = try std.fmt.allocPrint(arena, "{s}{s}.", .{ name_prefix, name });
const fqn = sub_prefix[0 .. sub_prefix.len - 1]; const fqn = sub_prefix[0 .. sub_prefix.len - 1];
const sub_pkg = try fetchAndUnpack( const sub = try fetchAndUnpack(
thread_pool, thread_pool,
http_client, http_client,
global_cache_directory, global_cache_directory,
@ -290,28 +290,30 @@ pub fn fetchAndAddDependencies(
all_modules, all_modules,
); );
try sub_pkg.fetchAndAddDependencies( if (!sub.found_existing) {
deps_pkg, try sub.mod.fetchAndAddDependencies(
arena, deps_pkg,
thread_pool, arena,
http_client, thread_pool,
sub_pkg.root_src_directory, http_client,
global_cache_directory, sub.mod.root_src_directory,
local_cache_directory, global_cache_directory,
dependencies_source, local_cache_directory,
build_roots_source, dependencies_source,
sub_prefix, build_roots_source,
error_bundle, sub_prefix,
all_modules, error_bundle,
); all_modules,
);
}
try pkg.add(gpa, name, sub_pkg); try pkg.add(gpa, name, sub.mod);
if (deps_pkg.table.get(dep.hash.?)) |other_sub| { if (deps_pkg.table.get(dep.hash.?)) |other_sub| {
// This should be the same package (and hence module) since it's the same hash // This should be the same package (and hence module) since it's the same hash
// TODO: dedup multiple versions of the same package // TODO: dedup multiple versions of the same package
assert(other_sub == sub_pkg); assert(other_sub == sub.mod);
} else { } else {
try deps_pkg.add(gpa, dep.hash.?, sub_pkg); try deps_pkg.add(gpa, dep.hash.?, sub.mod);
} }
try dependencies_source.writer().print(" pub const {s} = @import(\"{}\");\n", .{ try dependencies_source.writer().print(" pub const {s} = @import(\"{}\");\n", .{
@ -413,7 +415,7 @@ fn fetchAndUnpack(
build_roots_source: *std.ArrayList(u8), build_roots_source: *std.ArrayList(u8),
fqn: []const u8, fqn: []const u8,
all_modules: *AllModules, all_modules: *AllModules,
) !*Package { ) !struct { mod: *Package, found_existing: bool } {
const gpa = http_client.allocator; const gpa = http_client.allocator;
const s = fs.path.sep_str; const s = fs.path.sep_str;
@ -441,7 +443,10 @@ fn fetchAndUnpack(
const gop = try all_modules.getOrPut(gpa, hex_digest.*); const gop = try all_modules.getOrPut(gpa, hex_digest.*);
if (gop.found_existing) { if (gop.found_existing) {
gpa.free(build_root); gpa.free(build_root);
return gop.value_ptr.*; return .{
.mod = gop.value_ptr.*,
.found_existing = true,
};
} }
const ptr = try gpa.create(Package); const ptr = try gpa.create(Package);
@ -460,7 +465,10 @@ fn fetchAndUnpack(
}; };
gop.value_ptr.* = ptr; gop.value_ptr.* = ptr;
return ptr; return .{
.mod = ptr,
.found_existing = false,
};
} }
const uri = try std.Uri.parse(dep.url); const uri = try std.Uri.parse(dep.url);
@ -575,7 +583,11 @@ fn fetchAndUnpack(
std.zig.fmtId(fqn), std.zig.fmtEscapes(build_root), std.zig.fmtId(fqn), std.zig.fmtEscapes(build_root),
}); });
return createWithDir(gpa, global_cache_directory, pkg_dir_sub_path, build_zig_basename); const mod = try createWithDir(gpa, global_cache_directory, pkg_dir_sub_path, build_zig_basename);
return .{
.mod = mod,
.found_existing = false,
};
} }
fn unpackTarball( fn unpackTarball(