motiejus/zig
1
Fork 0
Code Releases Activity

Build: cleanup

Browse Source 
* `doc/langref` formatting
 * upgrade `.{ .path = "..." }` to `b.path("...")`
 * avoid using arguments named `self`
 * make `Build.Step.Id` usage more consistent
 * add `Build.pathResolve`
 * use `pathJoin` and `pathResolve` everywhere
 * make sure `Build.LazyPath.getPath2` returns an absolute path
This commit is contained in:
Jacob Young
2024-05-04 14:29:17 -04:00
parent d582575aba
commit e3424332d3
59 changed files with 1306 additions and 1311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/std/Build/Step/InstallFile.zig
View File

@@ -5,7 +5,7 @@ const InstallDir = std.Build.InstallDir;
const InstallFile = @This();
const assert = std.debug.assert;
pub const base_id = .install_file;
pub const base_id: Step.Id = .install_file;
step: Step,
source: LazyPath,
@@ -20,8 +20,8 @@ pub fn create(
) *InstallFile {
assert(dest_rel_path.len != 0);
owner.pushInstalledFile(dir, dest_rel_path);
const self = owner.allocator.create(InstallFile) catch @panic("OOM");
self.* = .{
const install_file = owner.allocator.create(InstallFile) catch @panic("OOM");
install_file.* = .{
.step = Step.init(.{
.id = base_id,
.name = owner.fmt("install {s} to {s}", .{ source.getDisplayName(), dest_rel_path }),
@@ -32,16 +32,16 @@ pub fn create(
.dir = dir.dupe(owner),
.dest_rel_path = owner.dupePath(dest_rel_path),
};
source.addStepDependencies(&self.step);
return self;
source.addStepDependencies(&install_file.step);
return install_file;
}
fn make(step: *Step, prog_node: *std.Progress.Node) !void {
_ = prog_node;
const b = step.owner;
const self: *InstallFile = @fieldParentPtr("step", step);
const full_src_path = self.source.getPath2(b, step);
const full_dest_path = b.getInstallPath(self.dir, self.dest_rel_path);
const install_file: *InstallFile = @fieldParentPtr("step", step);
const full_src_path = install_file.source.getPath2(b, step);
const full_dest_path = b.getInstallPath(install_file.dir, install_file.dest_rel_path);
const cwd = std.fs.cwd();
const prev = std.fs.Dir.updateFile(cwd, full_src_path, cwd, full_dest_path, .{}) catch |err| {
return step.fail("unable to update file from '{s}' to '{s}': {s}", .{