Commit a232f7e8ec

@@ -108,6 +108,12 @@ pub const JobQueue = struct {
     /// Creates the dependencies.zig file and corresponding `Module` for the
     /// build runner to obtain via `@import("@dependencies")`.
     pub fn createDependenciesModule(jq: *JobQueue, buf: *std.ArrayList(u8)) Allocator.Error!void {
+        const keys = jq.table.keys();
+        const values = jq.table.values();
+
+        if (keys.len == 0)
+            return createEmptyDependenciesModule(buf);
+
         try buf.appendSlice("pub const packages = struct {\n");
 
         // Ensure the generated .zig file is deterministic.
@@ -116,9 +122,9 @@ pub const JobQueue = struct {
             pub fn lessThan(ctx: @This(), a_index: usize, b_index: usize) bool {
                 return std.mem.lessThan(u8, &ctx.keys[a_index], &ctx.keys[b_index]);
             }
-        }, .{ .keys = jq.table.keys() }));
+        }, .{ .keys = keys }));
 
-        for (jq.table.keys()[1..], jq.table.values()[1..]) |hash, fetch| {
+        for (keys[1..], values[1..]) |hash, fetch| {
             try buf.writer().print(
                 \\    pub const {} = struct {{
                 \\        pub const build_root = "{q}";
@@ -176,6 +182,14 @@ pub const JobQueue = struct {
         }
         try buf.appendSlice("};\n");
     }
+
+    pub fn createEmptyDependenciesModule(buf: *std.ArrayList(u8)) Allocator.Error!void {
+        try buf.appendSlice(
+            \\pub const packages = struct {};
+            \\pub const root_deps: []const struct { []const u8, []const u8 } = &.{};
+            \\
+        );
+    }
 };
 
 pub const Location = union(enum) {

@@ -4827,13 +4827,10 @@ pub fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !voi
             .root = .{ .root_dir = build_root },
             .root_src_path = build_zig_basename,
         };
+        var dependencies_zig_src = std.ArrayList(u8).init(gpa);
+        defer dependencies_zig_src.deinit();
         if (build_options.only_core_functionality) {
-            const deps_mod = try Package.createFilePkg(gpa, local_cache_directory, "dependencies.zig",
-                \\pub const packages = struct {};
-                \\pub const root_deps: []const struct { []const u8, []const u8 } = &.{};
-                \\
-            );
-            try main_mod.deps.put(arena, "@dependencies", deps_mod);
+            try Package.Fetch.createEmptyDependenciesModule(&dependencies_zig_src);
         } else {
             var http_client: std.http.Client = .{ .allocator = gpa };
             defer http_client.deinit();
@@ -4887,19 +4884,39 @@ pub fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !voi
                 process.exit(1);
             }
 
-            var buf = std.ArrayList(u8).init(gpa);
-            defer buf.deinit();
-            try job_queue.createDependenciesModule(&buf);
-            if (true) {
-                std.debug.print("dependencies source:\n\n{s}\n", .{buf.items});
-                @panic("TODO");
+            try job_queue.createDependenciesModule(&dependencies_zig_src);
+        }
+        {
+            // Atomically create the file in a directory named after the hash of its contents.
+            const basename = "dependencies.zig";
+            const rand_int = std.crypto.random.int(u64);
+            const tmp_dir_sub_path = "tmp" ++ fs.path.sep_str ++ Package.Manifest.hex64(rand_int);
+            {
+                var tmp_dir = try local_cache_directory.handle.makeOpenPath(tmp_dir_sub_path, .{});
+                defer tmp_dir.close();
+                try tmp_dir.writeFile(basename, dependencies_zig_src.items);
             }
-            //const deps_mod = try job_queue.createDependenciesModule(
-            //    arena,
-            //    local_cache_directory,
-            //    "dependencies.zig",
-            //);
-            //try main_mod.deps.put(arena, "@dependencies", deps_mod);
+
+            var hh: Cache.HashHelper = .{};
+            hh.addBytes(build_options.version);
+            hh.addBytes(dependencies_zig_src.items);
+            const hex_digest = hh.final();
+
+            const o_dir_sub_path = try arena.dupe(u8, "o" ++ fs.path.sep_str ++ hex_digest);
+            try Package.Fetch.renameTmpIntoCache(
+                local_cache_directory.handle,
+                tmp_dir_sub_path,
+                o_dir_sub_path,
+            );
+
+            const deps_mod = try Package.Module.create(arena, .{
+                .root = .{
+                    .root_dir = local_cache_directory,
+                    .sub_path = o_dir_sub_path,
+                },
+                .root_src_path = basename,
+            });
+            try main_mod.deps.put(arena, "@dependencies", deps_mod);
         }
         try main_mod.deps.put(arena, "@build", &build_mod);