From f842053622e10883b17aec241587cd962c35971b Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Thu, 15 Sep 2022 15:54:27 -0700 Subject: [PATCH] add type field to zigmod.Module --- src/common.zig | 3 +++ src/util/module.zig | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/common.zig b/src/common.zig index 720a94ef55e1dbe7cfa8517088994a233067f692..2c1c27cece57411278288421537c28c914b41d56 100644 --- a/src/common.zig +++ b/src/common.zig @@ -50,6 +50,7 @@ pub fn collect_deps_deep(cachepath: string, mdir: std.fs.Dir, options: *CollectO return zigmod.Module{ .is_sys_lib = false, .is_framework = false, + .type = .local, .id = "root", .name = "root", .main = m.main, @@ -79,6 +80,7 @@ pub fn collect_deps(cachepath: string, mdir: std.fs.Dir, options: *CollectOption return zigmod.Module{ .is_sys_lib = false, .is_framework = false, + .type = .local, .id = m.id, .name = m.name, .main = m.main, @@ -231,6 +233,7 @@ pub fn get_module_from_dep(d: *zigmod.Dep, cachepath: string, options: *CollectO return zigmod.Module{ .is_sys_lib = d.type == .system_lib, .is_framework = d.type == .framework, + .type = d.type, .id = try u.do_hash(options.alloc, std.crypto.hash.sha3.Sha3_384, d.path), .name = d.path, .only_os = d.only_os, diff --git a/src/util/module.zig b/src/util/module.zig index e8a131af1e4fe9cb78ecf8fb0a7c0687f8f6b68e..85d7f4c5a08cdbea811a4ceda6b613d72f55f99a 100644 --- a/src/util/module.zig +++ b/src/util/module.zig @@ -13,6 +13,7 @@ const common = @import("./../common.zig"); pub const Module = struct { is_sys_lib: bool, is_framework: bool, + type: zigmod.Dep.Type, id: string, name: string, main: string, @@ -41,6 +42,7 @@ pub const Module = struct { return Module{ .is_sys_lib = false, .is_framework = false, + .type = dep.type, .id = if (dep.id.len > 0) dep.id else try u.random_string(alloc, 48), .name = dep.name, .main = dep.main, -- 2.54.0