From 974ee20698d91b7b2f9cad2e6119e10ebdc26be0 Mon Sep 17 00:00:00 2001 From: Meghan Date: Tue, 15 Dec 2020 06:25:58 -0800 Subject: [PATCH] add dep.clean_path_v --- src/cmd_fetch.zig | 2 +- src/util/dep.zig | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/cmd_fetch.zig b/src/cmd_fetch.zig index f9953a1bf5da2fd57aae1d42fcfaf00f1577175d..f11535ff47114113000da2531e550a2273ec82f9 100644 --- a/src/cmd_fetch.zig +++ b/src/cmd_fetch.zig @@ -78,7 +78,7 @@ fn fetch_deps(dir: []const u8, mpath: []const u8) anyerror!u.Module { var moddir: []const u8 = undefined; for (m.deps) |d| { const p = try fs.path.join(gpa, &[_][]const u8{dir, try d.clean_path()}); - const pv = try fs.path.join(gpa, &[_][]const u8{dir, "v", try d.clean_path(), d.version}); + const pv = try fs.path.join(gpa, &[_][]const u8{dir, try d.clean_path_v()}); u.print("fetch: {}: {}: {}", .{m.name, @tagName(d.type), d.path}); moddir = p; switch (d.type) { diff --git a/src/util/dep.zig b/src/util/dep.zig index 5b8ffa8ab8a371b2cfdf649a3519fa8f05989d60..50db5ce9700c85088db2ece7e8c4faa6e1bfdc7c 100644 --- a/src/util/dep.zig +++ b/src/util/dep.zig @@ -32,6 +32,13 @@ pub const Dep = struct { return p; } + pub fn clean_path_v(self: Dep) ![]const u8 { + if (self.type == .http and self.version.len > 0) { + return std.fs.path.join(gpa, &[_][]const u8{"v", @tagName(self.type), self.version}); + } + return std.fs.path.join(gpa, &[_][]const u8{"v", try self.clean_path(), self.version}); + } + pub fn is_for_this(self: Dep) bool { const os = @tagName(builtin.os.tag); if (self.only_os.len > 0) { -- 2.54.0