| author |  Meghan Denny <hello@nektro.net> 2021-06-05 16:52:52 -07:00 |
| committer | Meghan Denny <hello@nektro.net> 2021-06-05 16:52:52 -07:00 |
| log | 2e3f1a0952d8bc9d404f9f472be18b0eabe9d064 |
| tree | 733bcf8f456345825bff2303fc993a64ff3079a5 |
| parent | 9f5b6060c3cee53f952d2b53b0994832d0c4461b |
util/Module- assign id if there isn't on in init
2 files changed, 1 insertions(+), 2 deletions(-)
src/common.zig-1
| ... | @@ -190,7 +190,6 @@ fn get_module_from_dep(list: *std.ArrayList(u.Module), d: u.Dep, dir: []const u8 | ... | @@ -190,7 +190,6 @@ fn get_module_from_dep(list: *std.ArrayList(u.Module), d: u.Dep, dir: []const u8 |
| 190 | error.FileNotFound => { | 190 | error.FileNotFound => { |
| 191 | if (d.main.len > 0 or d.c_include_dirs.len > 0 or d.c_source_files.len > 0) { | 191 | if (d.main.len > 0 or d.c_include_dirs.len > 0 or d.c_source_files.len > 0) { |
| 192 | var mod_from = try u.Module.from(d); | 192 | var mod_from = try u.Module.from(d); |
| 193 | if (mod_from.id.len == 0) mod_from.id = try u.random_string(48); | ||
| 194 | mod_from.clean_path = u.trim_prefix(moddir, dir)[1..]; | 193 | mod_from.clean_path = u.trim_prefix(moddir, dir)[1..]; |
| 195 | if (mod_from.is_for_this()) try list.append(mod_from); | 194 | if (mod_from.is_for_this()) try list.append(mod_from); |
| 196 | } | 195 | } |
src/util/module.zig+1-1
| ... | @@ -26,7 +26,7 @@ pub const Module = struct { | ... | @@ -26,7 +26,7 @@ pub const Module = struct { |
| 26 | pub fn from(dep: u.Dep) !Module { | 26 | pub fn from(dep: u.Dep) !Module { |
| 27 | return Module{ | 27 | return Module{ |
| 28 | .is_sys_lib = false, | 28 | .is_sys_lib = false, |
| 29 | .id = dep.id, | 29 | .id = if (dep.id.len > 0) dep.id else try u.random_string(48), |
| 30 | .name = dep.name, | 30 | .name = dep.name, |
| 31 | .main = dep.main, | 31 | .main = dep.main, |
| 32 | .c_include_dirs = dep.c_include_dirs, | 32 | .c_include_dirs = dep.c_include_dirs, |