authorgravatar for hello@nektro.netMeghan <hello@nektro.net> 2021-01-11 02:04:12 -08:00
committergravatar for hello@nektro.netMeghan <hello@nektro.net> 2021-01-11 02:04:12 -08:00
log8ce6e12106c6247e58058614f600fc7fe749a059
tree3c4bcc50143e4f1f44713cdd2b210794855c628d
parent486f6185ea963fca97954c78920f5aebef2583ec

add support for the src dep attribute

2 files changed, 13 insertions(+), 6 deletions(-)

README.md+3-4
...@@ -98,10 +98,8 @@ id: t5ch3nfmdaa25ndlch7ucz7yztq8n1iaanv2d7iwiw4q5n65...@@ -98,10 +98,8 @@ id: t5ch3nfmdaa25ndlch7ucz7yztq8n1iaanv2d7iwiw4q5n65
98name: my_app98name: my_app
99main: src/main.zig99main: src/main.zig
100dependencies:100dependencies:
101- type: git101- src: git https://github.com/Hejsil/zig-clap
102 path: https://github.com/Hejsil/zig-clap102- src: git https://github.com/alexnask/ctregex.zig
103- type: git
104 path: https://github.com/alexnask/ctregex.zig
105 # ctregex.zig doesn't have a zig.mod file so we can manually103 # ctregex.zig doesn't have a zig.mod file so we can manually
106 # define its entry point. this can also be used generally to104 # define its entry point. this can also be used generally to
107 # override any attribute we want in this dependency.105 # override any attribute we want in this dependency.
...@@ -124,6 +122,7 @@ dependencies:...@@ -124,6 +122,7 @@ dependencies:
124|------|------|------|-------------|122|------|------|------|-------------|
125| `type` | `string` | required, enum | One of `system_lib`, `git`, `hg`, `http` |123| `type` | `string` | required, enum | One of `system_lib`, `git`, `hg`, `http` |
126| `path` | `string` | required | URL/path to this dependency. depends on the type |124| `path` | `string` | required | URL/path to this dependency. depends on the type |
125| `src` | `string` | Shorthand for the format `type path`. |
127| `version` | `string` | only on some types | pin this dependency at a specific version |126| `version` | `string` | only on some types | pin this dependency at a specific version |
128| `only_os` | `string` | | comma separated list of OS names to add this Dep to |127| `only_os` | `string` | | comma separated list of OS names to add this Dep to |
129| `except_os` | `string` | | comma separated list of OS names to exclude this Dep from |128| `except_os` | `string` | | comma separated list of OS names to exclude this Dep from |
src/util/modfile.zig+10-2
...@@ -38,8 +38,16 @@ pub const ModFile = struct {...@@ -38,8 +38,16 @@ pub const ModFile = struct {
38 if (doc.mapping.get("dependencies")) |dep_seq| {38 if (doc.mapping.get("dependencies")) |dep_seq| {
39 if (dep_seq == .sequence) {39 if (dep_seq == .sequence) {
40 for (dep_seq.sequence) |item| {40 for (dep_seq.sequence) |item| {
41 const dtype = item.mapping.get("type").?.string;41 var dtype: []const u8 = undefined;
42 const path = item.mapping.get("path").?.string;42 var path: []const u8 = undefined;
43 if (item.mapping.get("src")) |val| {
44 var src_iter = std.mem.split(val.string, " ");
45 dtype = src_iter.next().?;
46 path = src_iter.next().?;
47 } else {
48 dtype = item.mapping.get("type").?.string;
49 path = item.mapping.get("path").?.string;
50 }
43 const dep_type = std.meta.stringToEnum(u.DepType, dtype).?;51 const dep_type = std.meta.stringToEnum(u.DepType, dtype).?;
4452
45 try dep_list.append(u.Dep{53 try dep_list.append(u.Dep{