Commit db7496d6efb64d8210816e49008753b5a81d46f4 | zig

author	Matthew Lugg <mlugg@mlugg.co.uk> 2023-04-23 02:11:04+01:00
committer	Andrew Kelley <andrew@ziglang.org> 2023-05-18 00:27:21-07:00
log	db7496d6efb64d8210816e49008753b5a81d46f4
tree	32b684f3a6eafb0fdfcf81d3e7a798f1f687a3fc
parent	f65e8c78621c90c9b9932903a9ed99c973dbcf63

Only add build.zig module dependencies once

1 files changed, 34 insertions(+), 22 deletions(-)

src
- Package.zig

src/Package.zig+34-22

 @@ -279,7 +279,7 @@ pub fn fetchAndAddDependencies(
         const sub_prefix = try std.fmt.allocPrint(arena, "{s}{s}.", .{ name_prefix, name });
         const fqn = sub_prefix[0 .. sub_prefix.len - 1];
-        const sub_pkg = try fetchAndUnpack(
+        const sub = try fetchAndUnpack(
             thread_pool,
             http_client,
             global_cache_directory,
 @@ -290,28 +290,30 @@ pub fn fetchAndAddDependencies(
             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| {
             // This should be the same package (and hence module) since it's the same hash
             // TODO: dedup multiple versions of the same package
-            assert(other_sub == sub_pkg);
+            assert(other_sub == sub.mod);
         } 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", .{
 @@ -413,7 +415,7 @@ fn fetchAndUnpack(
     build_roots_source: *std.ArrayList(u8),
     fqn: []const u8,
     all_modules: *AllModules,
-) !*Package {
+) !struct { mod: *Package, found_existing: bool } {
     const gpa = http_client.allocator;
     const s = fs.path.sep_str;
 @@ -441,7 +443,10 @@ fn fetchAndUnpack(
         const gop = try all_modules.getOrPut(gpa, hex_digest.*);
         if (gop.found_existing) {
             gpa.free(build_root);
-            return gop.value_ptr.*;
+            return .{
+                .mod = gop.value_ptr.*,
+                .found_existing = true,
+            };
         }
         const ptr = try gpa.create(Package);
 @@ -460,7 +465,10 @@ fn fetchAndUnpack(
         };
         gop.value_ptr.* = ptr;
-        return ptr;
+        return .{
+            .mod = ptr,
+            .found_existing = false,
+        };
     }
     const uri = try std.Uri.parse(dep.url);
 @@ -575,7 +583,11 @@ fn fetchAndUnpack(
         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(