mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-06 21:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename std.build.Pkg.path to std.build.Pkg.source (#11557)

Browse Source
This commit is contained in:
Hanna 2022-05-26 19:32:28 -04:00 committed by GitHub
parent 67d5bfefba
commit 4e918873e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/std/build.zig
View File

@ -385,7 +385,7 @@ pub const Builder = struct {
pub fn dupePkg(self: *Builder, package: Pkg) Pkg {
var the_copy = Pkg{
.name = self.dupe(package.name),
.path = package.path.dupe(self),
.source = package.source.dupe(self),
};
if (package.dependencies) |dependencies| {
@ -1353,7 +1353,7 @@ pub const Target = @compileError("deprecated; Use `std.zig.CrossTarget`");
pub const Pkg = struct {
name: []const u8,
path: FileSource,
source: FileSource,
dependencies: ?[]const Pkg = null,
};
@ -2228,7 +2228,7 @@ pub const LibExeObjStep = struct {
}
fn addRecursiveBuildDeps(self: *LibExeObjStep, package: Pkg) void {
package.path.addStepDependencies(&self.step);
package.source.addStepDependencies(&self.step);
if (package.dependencies) |deps| {
for (deps) |dep| {
self.addRecursiveBuildDeps(dep);
@ -2239,7 +2239,7 @@ pub const LibExeObjStep = struct {
pub fn addPackagePath(self: *LibExeObjStep, name: []const u8, pkg_index_path: []const u8) void {
self.addPackage(Pkg{
.name = self.builder.dupe(name),
.path = .{ .path = self.builder.dupe(pkg_index_path) },
.source = .{ .path = self.builder.dupe(pkg_index_path) },
});
}
@ -2300,7 +2300,7 @@ pub const LibExeObjStep = struct {
try zig_args.append("--pkg-begin");
try zig_args.append(pkg.name);
try zig_args.append(builder.pathFromRoot(pkg.path.getPath(self.builder)));
try zig_args.append(builder.pathFromRoot(pkg.source.getPath(self.builder)));
if (pkg.dependencies) |dependencies| {
for (dependencies) |sub_pkg| {
@ -3560,11 +3560,11 @@ test "Builder.dupePkg()" {
var pkg_dep = Pkg{
.name = "pkg_dep",
.path = .{ .path = "/not/a/pkg_dep.zig" },
.source = .{ .path = "/not/a/pkg_dep.zig" },
};
var pkg_top = Pkg{
.name = "pkg_top",
.path = .{ .path = "/not/a/pkg_top.zig" },
.source = .{ .path = "/not/a/pkg_top.zig" },
.dependencies = &[_]Pkg{pkg_dep},
};
const dupe = builder.dupePkg(pkg_top);
@ -3583,9 +3583,9 @@ test "Builder.dupePkg()" {
// the same as those in stack allocated package's fields
try std.testing.expect(dupe_deps.ptr != original_deps.ptr);
try std.testing.expect(dupe.name.ptr != pkg_top.name.ptr);
try std.testing.expect(dupe.path.path.ptr != pkg_top.path.path.ptr);
try std.testing.expect(dupe.source.path.ptr != pkg_top.source.path.ptr);
try std.testing.expect(dupe_deps[0].name.ptr != pkg_dep.name.ptr);
try std.testing.expect(dupe_deps[0].path.path.ptr != pkg_dep.path.path.ptr);
try std.testing.expect(dupe_deps[0].source.path.ptr != pkg_dep.source.path.ptr);
}
test "LibExeObjStep.addPackage" {
@ -3605,11 +3605,11 @@ test "LibExeObjStep.addPackage" {
const pkg_dep = Pkg{
.name = "pkg_dep",
.path = .{ .path = "/not/a/pkg_dep.zig" },
.source = .{ .path = "/not/a/pkg_dep.zig" },
};
const pkg_top = Pkg{
.name = "pkg_dep",
.path = .{ .path = "/not/a/pkg_top.zig" },
.source = .{ .path = "/not/a/pkg_top.zig" },
.dependencies = &[_]Pkg{pkg_dep},
};

2
lib/std/build/OptionsStep.zig
View File

@ -200,7 +200,7 @@ pub fn addOptionArtifact(self: *OptionsStep, name: []const u8, artifact: *LibExe
}
pub fn getPackage(self: *OptionsStep, package_name: []const u8) build.Pkg {
return .{ .name = package_name, .path = self.getSource() };
return .{ .name = package_name, .source = self.getSource() };
}
pub fn getSource(self: *OptionsStep) FileSource {