motiejus/zig
1
Fork 0
Code Releases Activity

Changes to .path instead of .getPathFn. Changes LibExeObjStep to also provide FileSource.

Browse Source
This commit is contained in:
Felix (xq) Queißner
2021-02-26 11:28:23 +01:00
committed by Veikka Tuominen
parent 07acb1ccc9
commit 27bd0971bb
6 changed files with 82 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/std/build/WriteFileStep.zig
View File

@@ -37,10 +37,7 @@ pub fn add(self: *WriteFileStep, basename: []const u8, bytes: []const u8) void {
const node = self.builder.allocator.create(std.TailQueue(File).Node) catch unreachable;
node.* = .{
.data = .{
.source = build.GeneratedFile{
.step = &self.step,
.getPathFn = getFilePath,
},
.source = build.GeneratedFile{ .step = &self.step },
.basename = self.builder.dupePath(basename),
.bytes = self.builder.dupe(bytes),
},
@@ -59,17 +56,6 @@ pub fn getFileSource(step: *WriteFileStep, basename: []const u8) ?build.FileSour
return null;
}
/// Returns the
fn getFilePath(source: *const build.GeneratedFile) []const u8 {
const file = @fieldParentPtr(File, "source", source);
const step = @fieldParentPtr(WriteFileStep, "step", source.step);
return fs.path.join(
step.builder.allocator,
&[_][]const u8{ step.output_dir, file.basename },
) catch unreachable;
}
fn make(step: *Step) !void {
const self = @fieldParentPtr(WriteFileStep, "step", step);
@@ -124,6 +110,10 @@ fn make(step: *Step) !void {
});
return err;
};
node.data.source.path = fs.path.join(
self.builder.allocator,
&[_][]const u8{ self.output_dir, node.data.basename },
) catch unreachable;
}
}
}