authorgravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2023-08-26 11:48:26 -07:00
committergravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2023-08-26 11:48:26 -07:00
log8fb6d2491c0e80968ca83df0ba6599db3eaf150c
treea1c9a156aaf0ec9c6aca696038fd46e6b70b639a
parent97241c463edc1b4c43f39d7250fbc36059248795

remove self/files package since files.zig is now rendered in consumer root

6 files changed, 12 insertions(+), 39 deletions(-)

docs/zig.mod.md+2-2
...@@ -36,11 +36,11 @@ This is a list of relative paths to C source files to compile along with this pr...@@ -36,11 +36,11 @@ This is a list of relative paths to C source files to compile along with this pr
3636
37### `files`37### `files`
38- Type: `[]string`38- Type: `[]string`
39This accepts a list of local directories to embed static assets. These files will be provided through a `self/files` package to `@import(main)`.39This accepts a list of local directories to embed static assets. These files will be provided through a `files.zig` files in the module root. It generates a list of `@embedFile` calls.
4040
41### `root_files`41### `root_files`
42- Type: `[]string`42- Type: `[]string`
43This accepts a list of local directories to embed static assets. These files will be provided through a `self/files` package to `@import("root")`.43This accepts a list of local directories to embed static assets. These files will be provided through a `files.zig` files in the package root. It generates a list of `@embedFile` calls.
4444
45### `dependencies`45### `dependencies`
46- Type: `[]Dep`46- Type: `[]Dep`
src/cmd/generate.zig-2
...@@ -106,7 +106,6 @@ pub fn create_depszig(alloc: std.mem.Allocator, cachepath: string, dir: std.fs.D...@@ -106,7 +106,6 @@ pub fn create_depszig(alloc: std.mem.Allocator, cachepath: string, dir: std.fs.D
106 .git => try w.print(" exe.step.dependOn(&GitExactStep.create(b, \"{s}\", \"{s}\").step);\n", .{ module.dep.?.path, try module.pin(alloc, cachepath) }),106 .git => try w.print(" exe.step.dependOn(&GitExactStep.create(b, \"{s}\", \"{s}\").step);\n", .{ module.dep.?.path, try module.pin(alloc, cachepath) }),
107 .hg => @panic("TODO"),107 .hg => @panic("TODO"),
108 .http => @panic("TODO"),108 .http => @panic("TODO"),
109 .files => {},
110 }109 }
111 }110 }
112 try w.writeAll(111 try w.writeAll(
...@@ -274,7 +273,6 @@ fn print_pkg_data_to(w: std.fs.File.Writer, alloc: std.mem.Allocator, cachepath:...@@ -274,7 +273,6 @@ fn print_pkg_data_to(w: std.fs.File.Writer, alloc: std.mem.Allocator, cachepath:
274 .git => try w.print(" .store = \"/{}/{s}\",\n", .{ std.zig.fmtEscapes(fixed_path), try mod.pin(alloc, cachepath) }),273 .git => try w.print(" .store = \"/{}/{s}\",\n", .{ std.zig.fmtEscapes(fixed_path), try mod.pin(alloc, cachepath) }),
275 .hg => @panic("TODO"),274 .hg => @panic("TODO"),
276 .http => @panic("TODO"),275 .http => @panic("TODO"),
277 .files => {},
278 }276 }
279 if (mod.main.len > 0 and !std.mem.eql(u8, mod.id, "root")) {277 if (mod.main.len > 0 and !std.mem.eql(u8, mod.id, "root")) {
280 try w.print(" .name = \"{s}\",\n", .{mod.name});278 try w.print(" .name = \"{s}\",\n", .{mod.name});
src/common.zig+9-28
...@@ -31,7 +31,7 @@ pub fn collect_deps_deep(cachepath: string, mdir: std.fs.Dir, options: *CollectO...@@ -31,7 +31,7 @@ pub fn collect_deps_deep(cachepath: string, mdir: std.fs.Dir, options: *CollectO
31 var moduledeps = std.ArrayList(zigmod.Module).init(options.alloc);31 var moduledeps = std.ArrayList(zigmod.Module).init(options.alloc);
32 errdefer moduledeps.deinit();32 errdefer moduledeps.deinit();
33 if (m.root_files.len > 0) {33 if (m.root_files.len > 0) {
34 try moduledeps.append(try add_files_package(options.alloc, cachepath, mdir, m.root_files));34 try gen_files_package(options.alloc, cachepath, mdir, m.root_files);
35 }35 }
36 try moduledeps.append(try collect_deps(cachepath, mdir, .local, options));36 try moduledeps.append(try collect_deps(cachepath, mdir, .local, options));
37 for (m.rootdeps) |*d| {37 for (m.rootdeps) |*d| {
...@@ -65,7 +65,7 @@ pub fn collect_deps(cachepath: string, mdir: std.fs.Dir, dtype: zigmod.Dep.Type,...@@ -65,7 +65,7 @@ pub fn collect_deps(cachepath: string, mdir: std.fs.Dir, dtype: zigmod.Dep.Type,
65 var moduledeps = std.ArrayList(zigmod.Module).init(options.alloc);65 var moduledeps = std.ArrayList(zigmod.Module).init(options.alloc);
66 errdefer moduledeps.deinit();66 errdefer moduledeps.deinit();
67 if (m.files.len > 0) {67 if (m.files.len > 0) {
68 try moduledeps.append(try add_files_package(options.alloc, cachepath, mdir, m.files));68 try gen_files_package(options.alloc, cachepath, mdir, m.files);
69 }69 }
70 for (m.deps) |*d| {70 for (m.deps) |*d| {
71 if (try get_module_from_dep(d, cachepath, options)) |founddep| {71 if (try get_module_from_dep(d, cachepath, options)) |founddep| {
...@@ -117,7 +117,7 @@ pub fn get_modpath(cachepath: string, d: zigmod.Dep, options: *CollectOptions) !...@@ -117,7 +117,7 @@ pub fn get_modpath(cachepath: string, d: zigmod.Dep, options: *CollectOptions) !
117 }117 }
118 }118 }
119 switch (d.type) {119 switch (d.type) {
120 .local, .files => {120 .local => {
121 if (!std.mem.endsWith(u8, d.main, ".zig")) {121 if (!std.mem.endsWith(u8, d.main, ".zig")) {
122 return d.main;122 return d.main;
123 }123 }
...@@ -216,7 +216,7 @@ pub fn get_module_from_dep(d: *zigmod.Dep, cachepath: string, options: *CollectO...@@ -216,7 +216,7 @@ pub fn get_module_from_dep(d: *zigmod.Dep, cachepath: string, options: *CollectO
216 }216 }
217 if (!d.is_for_this()) return null;217 if (!d.is_for_this()) return null;
218 const modpath = try get_modpath(cachepath, d.*, options);218 const modpath = try get_modpath(cachepath, d.*, options);
219 const moddir = if (d.type == .files or modpath.len == 0) try std.fs.cwd().openDir(cachepath, .{}) else try std.fs.cwd().openDir(modpath, .{});219 const moddir = if (modpath.len == 0) try std.fs.cwd().openDir(cachepath, .{}) else try std.fs.cwd().openDir(modpath, .{});
220220
221 const nocache = d.type.isLocal();221 const nocache = d.type.isLocal();
222 if (!nocache) try options.already_fetched.append(modpath);222 if (!nocache) try options.already_fetched.append(modpath);
...@@ -244,7 +244,7 @@ pub fn get_module_from_dep(d: *zigmod.Dep, cachepath: string, options: *CollectO...@@ -244,7 +244,7 @@ pub fn get_module_from_dep(d: *zigmod.Dep, cachepath: string, options: *CollectO
244 error.ManifestNotFound => {244 error.ManifestNotFound => {
245 if (d.main.len > 0 or d.c_include_dirs.len > 0 or d.c_source_files.len > 0 or d.keep) {245 if (d.main.len > 0 or d.c_include_dirs.len > 0 or d.c_source_files.len > 0 or d.keep) {
246 var mod_from = try zigmod.Module.from(options.alloc, d.*, cachepath, options);246 var mod_from = try zigmod.Module.from(options.alloc, d.*, cachepath, options);
247 if (d.type != .local and d.type != .files) mod_from.clean_path = extras.trimPrefix(modpath, cachepath)[1..];247 if (d.type != .local) mod_from.clean_path = extras.trimPrefix(modpath, cachepath)[1..];
248 if (mod_from.is_for_this()) return mod_from;248 if (mod_from.is_for_this()) return mod_from;
249 return null;249 return null;
250 }250 }
...@@ -258,7 +258,7 @@ pub fn get_module_from_dep(d: *zigmod.Dep, cachepath: string, options: *CollectO...@@ -258,7 +258,7 @@ pub fn get_module_from_dep(d: *zigmod.Dep, cachepath: string, options: *CollectO
258 d.*.name = tryname;258 d.*.name = tryname;
259 d.*.main = trymain.?;259 d.*.main = trymain.?;
260 var mod_from = try zigmod.Module.from(options.alloc, d.*, cachepath, options);260 var mod_from = try zigmod.Module.from(options.alloc, d.*, cachepath, options);
261 if (d.type != .local and d.type != .files) mod_from.clean_path = extras.trimPrefix(modpath, cachepath)[1..];261 if (d.type != .local) mod_from.clean_path = extras.trimPrefix(modpath, cachepath)[1..];
262 if (mod_from.is_for_this()) return mod_from;262 if (mod_from.is_for_this()) return mod_from;
263 return null;263 return null;
264 }264 }
...@@ -269,7 +269,7 @@ pub fn get_module_from_dep(d: *zigmod.Dep, cachepath: string, options: *CollectO...@@ -269,7 +269,7 @@ pub fn get_module_from_dep(d: *zigmod.Dep, cachepath: string, options: *CollectO
269 dd.dep = d.*;269 dd.dep = d.*;
270 dd.for_build = d.for_build;270 dd.for_build = d.for_build;
271 const save = dd;271 const save = dd;
272 if (d.type != .local and d.type != .files) dd.clean_path = extras.trimPrefix(modpath, cachepath)[1..];272 if (d.type != .local) dd.clean_path = extras.trimPrefix(modpath, cachepath)[1..];
273 if (dd.id.len == 0) dd.id = try u.random_string(options.alloc, 48);273 if (dd.id.len == 0) dd.id = try u.random_string(options.alloc, 48);
274 if (d.name.len > 0) dd.name = d.name;274 if (d.name.len > 0) dd.name = d.name;
275 if (d.main.len > 0) dd.main = d.main;275 if (d.main.len > 0) dd.main = d.main;
...@@ -278,15 +278,14 @@ pub fn get_module_from_dep(d: *zigmod.Dep, cachepath: string, options: *CollectO...@@ -278,15 +278,14 @@ pub fn get_module_from_dep(d: *zigmod.Dep, cachepath: string, options: *CollectO
278 if (d.c_source_files.len > 0) dd.c_source_files = d.c_source_files;278 if (d.c_source_files.len > 0) dd.c_source_files = d.c_source_files;
279 if (d.only_os.len > 0) dd.only_os = d.only_os;279 if (d.only_os.len > 0) dd.only_os = d.only_os;
280 if (d.except_os.len > 0) dd.except_os = d.except_os;280 if (d.except_os.len > 0) dd.except_os = d.except_os;
281 if (d.type == .local or d.type == .files) dd.main = try std.fs.path.join(options.alloc, &.{ d.main, save.main });281 if (d.type == .local) dd.main = try std.fs.path.join(options.alloc, &.{ d.main, save.main });
282 if (d.type == .files) dd.clean_path = modpath;
283 if (dd.is_for_this()) return dd;282 if (dd.is_for_this()) return dd;
284 return null;283 return null;
285 },284 },
286 }285 }
287}286}
288287
289pub fn add_files_package(alloc: std.mem.Allocator, cachepath: string, mdir: std.fs.Dir, dirs: []const string) !zigmod.Module {288pub fn gen_files_package(alloc: std.mem.Allocator, cachepath: string, mdir: std.fs.Dir, dirs: []const string) !void {
290 var map = std.StringHashMap(string).init(alloc);289 var map = std.StringHashMap(string).init(alloc);
291 defer map.deinit();290 defer map.deinit();
292291
...@@ -316,24 +315,6 @@ pub fn add_files_package(alloc: std.mem.Allocator, cachepath: string, mdir: std....@@ -316,24 +315,6 @@ pub fn add_files_package(alloc: std.mem.Allocator, cachepath: string, mdir: std.
316 while (iter.next()) |item| {315 while (iter.next()) |item| {
317 try w.print("pub const @\"/{}\" = @embedFile(\"{}\");\n", .{ std.zig.fmtEscapes(item.key_ptr.*), std.zig.fmtEscapes(item.value_ptr.*) });316 try w.print("pub const @\"/{}\" = @embedFile(\"{}\");\n", .{ std.zig.fmtEscapes(item.key_ptr.*), std.zig.fmtEscapes(item.value_ptr.*) });
318 }317 }
319
320 var d: zigmod.Dep = .{
321 .type = .files,
322 .path = extras.trimPrefix(extras.trimPrefix(dpath, cachepath), "/"),
323 .id = "",
324 .name = "self/files",
325 .main = fname,
326 .version = "absolute",
327 .yaml = null,
328 .deps = &.{},
329 .parent_id = "TODO-1",
330 };
331 var options = CollectOptions{
332 .log = false,
333 .update = false,
334 .alloc = alloc,
335 };
336 return (try get_module_from_dep(&d, cachepath, &options)).?;
337}318}
338319
339pub fn parse_lockfile(alloc: std.mem.Allocator, dir: std.fs.Dir) ![]const [4]string {320pub fn parse_lockfile(alloc: std.mem.Allocator, dir: std.fs.Dir) ![]const [4]string {
src/util/dep.zig+1-1
...@@ -34,7 +34,7 @@ pub const Dep = struct {...@@ -34,7 +34,7 @@ pub const Dep = struct {
34 pub const Type = @import("./dep_type.zig").DepType;34 pub const Type = @import("./dep_type.zig").DepType;
3535
36 pub fn clean_path(self: Dep, alloc: std.mem.Allocator) !string {36 pub fn clean_path(self: Dep, alloc: std.mem.Allocator) !string {
37 if (self.type == .local or self.type == .files) {37 if (self.type == .local) {
38 return self.path;38 return self.path;
39 }39 }
40 var p = self.path;40 var p = self.path;
src/util/dep_type.zig-5
...@@ -14,7 +14,6 @@ pub const DepType = enum {...@@ -14,7 +14,6 @@ pub const DepType = enum {
14 git, // https://git-scm.com/14 git, // https://git-scm.com/
15 hg, // https://www.mercurial-scm.org/15 hg, // https://www.mercurial-scm.org/
16 http, // https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol16 http, // https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol
17 files, // TEMP also local
1817
19 // zig fmt: on18 // zig fmt: on
20 pub fn pull(self: DepType, alloc: std.mem.Allocator, rpath: string, dpath: string) !void {19 pub fn pull(self: DepType, alloc: std.mem.Allocator, rpath: string, dpath: string) !void {
...@@ -39,7 +38,6 @@ pub const DepType = enum {...@@ -39,7 +38,6 @@ pub const DepType = enum {
39 u.assert((try u.run_cmd(alloc, dpath, &.{ "tar", "-xf", f, "-C", "." })) == 0, "un-tar {s} failed", .{f});38 u.assert((try u.run_cmd(alloc, dpath, &.{ "tar", "-xf", f, "-C", "." })) == 0, "un-tar {s} failed", .{f});
40 }39 }
41 },40 },
42 .files => {},
43 }41 }
44 }42 }
4543
...@@ -60,7 +58,6 @@ pub const DepType = enum {...@@ -60,7 +58,6 @@ pub const DepType = enum {
60 .http => {58 .http => {
61 //59 //
62 },60 },
63 .files => {},
64 }61 }
65 }62 }
6663
...@@ -74,7 +71,6 @@ pub const DepType = enum {...@@ -74,7 +71,6 @@ pub const DepType = enum {
74 .git => try std.fmt.allocPrint(alloc, "commit-{s}", .{(try u.git_rev_HEAD(alloc, mdir))}),71 .git => try std.fmt.allocPrint(alloc, "commit-{s}", .{(try u.git_rev_HEAD(alloc, mdir))}),
75 .hg => "",72 .hg => "",
76 .http => "",73 .http => "",
77 .files => "",
78 };74 };
79 }75 }
8076
...@@ -86,7 +82,6 @@ pub const DepType = enum {...@@ -86,7 +82,6 @@ pub const DepType = enum {
86 .git => false,82 .git => false,
87 .hg => false,83 .hg => false,
88 .http => false,84 .http => false,
89 .files => true,
90 };85 };
91 }86 }
9287
src/util/module.zig-1
...@@ -174,7 +174,6 @@ pub const Module = struct {...@@ -174,7 +174,6 @@ pub const Module = struct {
174 .git => try u.git_rev_HEAD(alloc, mdir),174 .git => try u.git_rev_HEAD(alloc, mdir),
175 .hg => @panic("TODO"),175 .hg => @panic("TODO"),
176 .http => @panic("TODO"),176 .http => @panic("TODO"),
177 .files => unreachable,
178 };177 };
179 },178 },
180 };179 };