authorgravatar for sahnvour@pm.meSahnvour <sahnvour@pm.me> 2019-10-10 21:58:47+02:00
committergravatar for sahnvour@pm.meSahnvour <sahnvour@pm.me> 2019-11-09 12:37:38+01:00
logdef5462d053d744a9f4c2c6874355a23d3371b3d
tree69fa5e0a56032af6eb989b77f1ede5e8f48925c0
parent8c8078513e60df7e017f91193524384e4e9640ca

build: initial support for using vcpkg libraries

2 files changed, 115 insertions(+), 1 deletions(-)

lib/std/build.zig+81-1
...@@ -53,7 +53,7 @@ pub const Builder = struct {...@@ -53,7 +53,7 @@ pub const Builder = struct {
53 release_mode: ?builtin.Mode,53 release_mode: ?builtin.Mode,
54 is_release: bool,54 is_release: bool,
55 override_lib_dir: ?[]const u8,55 override_lib_dir: ?[]const u8,
5656 vcpkg_root: VcpkgRoot,
57 pkg_config_pkg_list: ?(PkgConfigError![]const PkgConfigPkg) = null,57 pkg_config_pkg_list: ?(PkgConfigError![]const PkgConfigPkg) = null,
5858
59 const PkgConfigError = error{59 const PkgConfigError = error{
...@@ -159,6 +159,7 @@ pub const Builder = struct {...@@ -159,6 +159,7 @@ pub const Builder = struct {
159 .is_release = false,159 .is_release = false,
160 .override_lib_dir = null,160 .override_lib_dir = null,
161 .install_path = undefined,161 .install_path = undefined,
162 .vcpkg_root = VcpkgRoot{ .Unattempted = {} },
162 };163 };
163 try self.top_level_steps.append(&self.install_tls);164 try self.top_level_steps.append(&self.install_tls);
164 try self.top_level_steps.append(&self.uninstall_tls);165 try self.top_level_steps.append(&self.uninstall_tls);
...@@ -1046,6 +1047,7 @@ pub const LibExeObjStep = struct {...@@ -1046,6 +1047,7 @@ pub const LibExeObjStep = struct {
1046 output_dir: ?[]const u8,1047 output_dir: ?[]const u8,
1047 need_system_paths: bool,1048 need_system_paths: bool,
1048 is_linking_libc: bool = false,1049 is_linking_libc: bool = false,
1050 vcpkg_bin_path: ?[]const u8 = null,
10491051
1050 installed_path: ?[]const u8,1052 installed_path: ?[]const u8,
1051 install_step: ?*InstallArtifactStep,1053 install_step: ?*InstallArtifactStep,
...@@ -1264,6 +1266,11 @@ pub const LibExeObjStep = struct {...@@ -1264,6 +1266,11 @@ pub const LibExeObjStep = struct {
1264 // option is supplied.1266 // option is supplied.
1265 const run_step = RunStep.create(exe.builder, exe.builder.fmt("run {}", exe.step.name));1267 const run_step = RunStep.create(exe.builder, exe.builder.fmt("run {}", exe.step.name));
1266 run_step.addArtifactArg(exe);1268 run_step.addArtifactArg(exe);
1269
1270 if (exe.vcpkg_bin_path) |path| {
1271 run_step.addPathDir(path);
1272 }
1273
1267 return run_step;1274 return run_step;
1268 }1275 }
12691276
...@@ -1569,6 +1576,43 @@ pub const LibExeObjStep = struct {...@@ -1569,6 +1576,43 @@ pub const LibExeObjStep = struct {
1569 }) catch unreachable;1576 }) catch unreachable;
1570 }1577 }
15711578
1579 /// If Vcpkg was found on the system, it will be added to include and lib
1580 /// paths for the specified target.
1581 pub fn addVcpkgPaths(self: *LibExeObjStep, linkage: VcpkgLinkage) !void {
1582 // Ideally in the Unattempted case we would call the function recursively
1583 // after findVcpkgRoot and have only one switch statement, but the compiler
1584 // cannot resolve the error set.
1585 switch (self.builder.vcpkg_root) {
1586 .Unattempted => {
1587 self.builder.vcpkg_root = if (try findVcpkgRoot(self.builder.allocator)) |root|
1588 VcpkgRoot{ .Found = root }
1589 else
1590 .NotFound;
1591 },
1592 .NotFound => return error.VcpkgNotFound,
1593 .Found => {},
1594 }
1595
1596 switch (self.builder.vcpkg_root) {
1597 .Unattempted => unreachable,
1598 .NotFound => return error.VcpkgNotFound,
1599 .Found => |root| {
1600 const allocator = self.builder.allocator;
1601 const triplet = try Target.vcpkgTriplet(allocator, self.target, linkage);
1602 defer self.builder.allocator.free(triplet);
1603
1604 const include_path = try fs.path.join(allocator, [_][]const u8{ root, "installed", triplet, "include" });
1605 errdefer allocator.free(include_path);
1606 try self.include_dirs.append(IncludeDir{ .RawPath = include_path });
1607
1608 const lib_path = try fs.path.join(allocator, [_][]const u8{ root, "installed", triplet, "lib" });
1609 try self.lib_paths.append(lib_path);
1610
1611 self.vcpkg_bin_path = try fs.path.join(allocator, [_][]const u8{ root, "installed", triplet, "bin" });
1612 },
1613 }
1614 }
1615
1572 pub fn setExecCmd(self: *LibExeObjStep, args: []const ?[]const u8) void {1616 pub fn setExecCmd(self: *LibExeObjStep, args: []const ?[]const u8) void {
1573 assert(self.kind == Kind.Test);1617 assert(self.kind == Kind.Test);
1574 self.exec_cmd_args = args;1618 self.exec_cmd_args = args;
...@@ -2341,6 +2385,42 @@ fn doAtomicSymLinks(allocator: *Allocator, output_path: []const u8, filename_maj...@@ -2341,6 +2385,42 @@ fn doAtomicSymLinks(allocator: *Allocator, output_path: []const u8, filename_maj
2341 };2385 };
2342}2386}
23432387
2388/// Returned slice must be freed by the caller.
2389fn findVcpkgRoot(allocator: *Allocator) !?[]const u8 {
2390 const appdata_path = try fs.getAppDataDir(allocator, "vcpkg");
2391 defer allocator.free(appdata_path);
2392
2393 const path_file = try fs.path.join(allocator, [_][]const u8{ appdata_path, "vcpkg.path.txt" });
2394 defer allocator.free(path_file);
2395
2396 const file = fs.File.openRead(path_file) catch return null;
2397 defer file.close();
2398
2399 const size = @intCast(usize, try file.getEndPos());
2400 const vcpkg_path = try allocator.alloc(u8, size);
2401 const size_read = try file.read(vcpkg_path);
2402 std.debug.assert(size == size_read);
2403
2404 return vcpkg_path;
2405}
2406
2407const VcpkgRoot = union(VcpkgRootStatus) {
2408 Unattempted: void,
2409 NotFound: void,
2410 Found: []const u8,
2411};
2412
2413const VcpkgRootStatus = enum {
2414 Unattempted,
2415 NotFound,
2416 Found,
2417};
2418
2419pub const VcpkgLinkage = enum {
2420 Static,
2421 Dynamic,
2422};
2423
2344pub const InstallDir = enum {2424pub const InstallDir = enum {
2345 Prefix,2425 Prefix,
2346 Lib,2426 Lib,
lib/std/target.zig+34
...@@ -218,6 +218,40 @@ pub const Target = union(enum) {...@@ -218,6 +218,40 @@ pub const Target = union(enum) {
218 );218 );
219 }219 }
220220
221 /// Returned slice must be freed by the caller.
222 pub fn vcpkgTriplet(allocator: *mem.Allocator, target: Target, linkage: std.build.VcpkgLinkage) ![]const u8 {
223 const arch = switch (target.getArch()) {
224 .i386 => "x86",
225 .x86_64 => "x64",
226
227 .arm,
228 .armeb,
229 .thumb,
230 .thumbeb,
231 .aarch64_32,
232 => "arm",
233
234 .aarch64,
235 .aarch64_be,
236 => "arm64",
237
238 else => return error.VcpkgNoSuchArchitecture,
239 };
240
241 const os = switch (target.getOs()) {
242 .windows => "windows",
243 .linux => "linux",
244 .macosx => "macos",
245 else => return error.VcpkgNoSuchOs,
246 };
247
248 if (linkage == .Static) {
249 return try mem.join(allocator, "-", [_][]const u8{ arch, os, "static" });
250 } else {
251 return try mem.join(allocator, "-", [_][]const u8{ arch, os });
252 }
253 }
254
221 pub fn allocDescription(self: Target, allocator: *mem.Allocator) ![]u8 {255 pub fn allocDescription(self: Target, allocator: *mem.Allocator) ![]u8 {
222 // TODO is there anything else worthy of the description that is not256 // TODO is there anything else worthy of the description that is not
223 // already captured in the triple?257 // already captured in the triple?