Commit 9e628ca44b6817ebda927de8d7974ff98d8f95b8 | zigmod

deps.zig+6

 @@ -19,6 +19,11 @@ pub fn addAllTo(exe: *std.build.LibExeObjStep) void {
             exe.linkSystemLibrary(item);
             llc = true;
         }
+        for (pkg.frameworks) |item| {
+            if (!std.Target.current.isDarwin()) @panic(exe.builder.fmt("a dependency is attempting to link to the framework {s}, which is only possible under Darwin", .{item}));
+            exe.linkFramework(item);
+            llc = true;
+        }
         inline for (pkg.c_include_dirs) |item| {
             exe.addIncludeDir(@field(dirs, decl.name) ++ "/" ++ item);
             llc = true;
 @@ -40,6 +45,7 @@ pub const Package = struct {
     c_source_files: []const string = &.{},
     c_source_flags: []const string = &.{},
     system_libs: []const string = &.{},
+    frameworks: []const string = &.{},
     vcpkg: bool = false,
 };

docs/deps.zig.md+1

...	@@ -18,6 +18,7 @@ pub const Package = struct {	...	@@ -18,6 +18,7 @@ pub const Package = struct {
18	c_source_files: []const string = &.{},	18	c_source_files: []const string = &.{},
19	c_source_flags: []const string = &.{},	19	c_source_flags: []const string = &.{},
20	system_libs: []const string = &.{},	20	system_libs: []const string = &.{},
		21	frameworks: []const string = &.{},
21	vcpkg: bool = false,	22	vcpkg: bool = false,
22	};	23	};
23	```	24	```

docs/tutorial.md+3

...	@@ -63,6 +63,9 @@ The core of expandability, it is possible to add dependencies to your project. H	...	@@ -63,6 +63,9 @@ The core of expandability, it is possible to add dependencies to your project. H
63	- Other/System Library	63	- Other/System Library
64	- System libraries are similar to Git dependencies, but instead of `git <url>` it is `system_lib <name>`.	64	- System libraries are similar to Git dependencies, but instead of `git <url>` it is `system_lib <name>`.
65		65
		66	- Other/Framework
		67	- Frameworks are similar to system libraries but are specific to Darwin (macOS, iOS, etc) and are defined with `framework <name>`.
		68
66	- Other/HTTP	69	- Other/HTTP
67	- Http tarballs are also allowed and follow a similar pattern as Git dependencies but use the `http` type. One thing to note is that it is recomended to add a hash verification after your tarball URL so that zigmod may assert whether or not it has been downloaded already to prevent unnecessary trips to the network. Hash verification versions are placed after the URL and in the form `type-string` such as `sha256-8ff0b79fd9118af7a760f1f6a98cac3e69daed325c8f9f0a581ecb62f797fd64`. They may also be placed in their own `version` key instead of `src`. The available hash algorithms are `blake3`, `sha256`, `sha512`.	70	- Http tarballs are also allowed and follow a similar pattern as Git dependencies but use the `http` type. One thing to note is that it is recomended to add a hash verification after your tarball URL so that zigmod may assert whether or not it has been downloaded already to prevent unnecessary trips to the network. Hash verification versions are placed after the URL and in the form `type-string` such as `sha256-8ff0b79fd9118af7a760f1f6a98cac3e69daed325c8f9f0a581ecb62f797fd64`. They may also be placed in their own `version` key instead of `src`. The available hash algorithms are `blake3`, `sha256`, `sha512`.
68		71

docs/zig.mod.md+3

...	@@ -77,6 +77,7 @@ This is the base attribute used to reference external code for use in your proje	...	@@ -77,6 +77,7 @@ This is the base attribute used to reference external code for use in your proje
77	The available `type`s are:	77	The available `type`s are:
78	- `local`	78	- `local`
79	- `system_lib`	79	- `system_lib`
		80	- `framework`
80	- `git`	81	- `git`
81	- `hg`	82	- `hg`
82	- `http`	83	- `http`
...	@@ -94,6 +95,8 @@ This attribute is used to reference the `type`/`path` combo by a specific revisi	...	@@ -94,6 +95,8 @@ This attribute is used to reference the `type`/`path` combo by a specific revisi
94	Version types available to each Dep type:	95	Version types available to each Dep type:
95	- `system_lib`	96	- `system_lib`
96	- Not affected by `version`.	97	- Not affected by `version`.
		98	- `framework`
		99	- Not affected by `version`.
97	- `git`	100	- `git`
98	- `commit`	101	- `commit`
99	- `tag`	102	- `tag`

src/cmd/fetch.zig+17-2

 @@ -66,6 +66,11 @@ pub fn create_depszig(alloc: std.mem.Allocator, cachepath: string, dir: std.fs.D
         \\            exe.linkSystemLibrary(item);
         \\            llc = true;
         \\        }
+        \\        for (pkg.frameworks) |item| {
+        \\            if (!std.Target.current.isDarwin()) @panic(exe.builder.fmt("a dependency is attempting to link to the framework {s}, which is only possible under Darwin", .{item}));
+        \\            exe.linkFramework(item);
+        \\            llc = true;
+        \\        }
         \\        inline for (pkg.c_include_dirs) |item| {
         \\            exe.addIncludeDir(@field(dirs, decl.name) ++ "/" ++ item);
         \\            llc = true;
 @@ -87,6 +92,7 @@ pub fn create_depszig(alloc: std.mem.Allocator, cachepath: string, dir: std.fs.D
         \\    c_source_files: []const string = &.{},
         \\    c_source_flags: []const string = &.{},
         \\    system_libs: []const string = &.{},
+        \\    frameworks: []const string = &.{},
         \\    vcpkg: bool = false,
         \\};
         \\
 @@ -109,7 +115,7 @@ pub fn create_depszig(alloc: std.mem.Allocator, cachepath: string, dir: std.fs.D
     try w.writeAll("pub const package_data = struct {\n");
     var duped = std.ArrayList(zigmod.Module).init(alloc);
     for (list.items) |mod| {
-        if (mod.is_sys_lib) {
+        if (mod.is_sys_lib or mod.is_framework) {
             continue;
         }
         try duped.append(mod);
 @@ -240,7 +246,7 @@ fn diff_printchange(comptime testt: string, comptime replacement: string, item:
 fn print_dirs(w: std.fs.File.Writer, list: []const zigmod.Module) !void {
     for (list) |mod| {
-        if (mod.is_sys_lib) continue;
+        if (mod.is_sys_lib or mod.is_framework) continue;
         if (std.mem.eql(u8, mod.id, "root")) {
             try w.print("    pub const _root = \"\";\n", .{});
             continue;
 @@ -329,6 +335,15 @@ fn print_pkg_data_to(w: std.fs.File.Writer, notdone: *std.ArrayList(zigmod.Modul
                     }
                     try w.writeAll(" },\n");
                 }
+                if (mod.has_framework_deps()) {
+                    try w.writeAll("        .frameworks = &.{");
+                    for (mod.deps) |item, j| {
+                        if (!item.is_sys_lib) continue;
+                        try w.print(" \"{}\"", .{std.zig.fmtEscapes(item.name)});
+                        if (j != mod.deps.len - 1) try w.writeAll(",");
+                    }
+                    try w.writeAll(" },\n");
+                }
                 if (mod.vcpkg) {
                     try w.writeAll("        .vcpkg = true,\n");
                 }

src/cmd/sum.zig+1-1

...	@@ -36,7 +36,7 @@ pub fn execute(args: [][]u8) !void {	...	@@ -36,7 +36,7 @@ pub fn execute(args: [][]u8) !void {
36	if (std.mem.eql(u8, m.clean_path, "../..")) {	36	if (std.mem.eql(u8, m.clean_path, "../..")) {
37	continue;	37	continue;
38	}	38	}
39	if (m.is_sys_lib) continue;	39	if (m.is_sys_lib or m.is_framework) continue;
40	const hash = try m.get_hash(cachepath);	40	const hash = try m.get_hash(cachepath);
41	try w.print("{s} {s}\n", .{ hash, m.clean_path });	41	try w.print("{s} {s}\n", .{ hash, m.clean_path });
42	}	42	}

src/common.zig+6-3

...	@@ -50,6 +50,7 @@ pub fn collect_deps_deep(cachepath: string, mdir: std.fs.Dir, options: *CollectO	...	@@ -50,6 +50,7 @@ pub fn collect_deps_deep(cachepath: string, mdir: std.fs.Dir, options: *CollectO
50	return zigmod.Module{	50	return zigmod.Module{
51	.alloc = options.alloc,	51	.alloc = options.alloc,
52	.is_sys_lib = false,	52	.is_sys_lib = false,
		53	.is_framework = false,
53	.id = "root",	54	.id = "root",
54	.name = "root",	55	.name = "root",
55	.main = m.main,	56	.main = m.main,
...	@@ -79,6 +80,7 @@ pub fn collect_deps(cachepath: string, mdir: std.fs.Dir, options: *CollectOption	...	@@ -79,6 +80,7 @@ pub fn collect_deps(cachepath: string, mdir: std.fs.Dir, options: *CollectOption
79	return zigmod.Module{	80	return zigmod.Module{
80	.alloc = options.alloc,	81	.alloc = options.alloc,
81	.is_sys_lib = false,	82	.is_sys_lib = false,
		83	.is_framework = false,
82	.id = m.id,	84	.id = m.id,
83	.name = m.name,	85	.name = m.name,
84	.main = m.main,	86	.main = m.main,
...	@@ -128,7 +130,7 @@ pub fn get_modpath(cachepath: string, d: zigmod.Dep, options: *CollectOptions) !	...	@@ -128,7 +130,7 @@ pub fn get_modpath(cachepath: string, d: zigmod.Dep, options: *CollectOptions) !
128	}	130	}
129	return d.path;	131	return d.path;
130	},	132	},
131	.system_lib => {	133	.system_lib, .framework => {
132	// no op	134	// no op
133	return "";	135	return "";
134	},	136	},
...	@@ -227,10 +229,11 @@ pub fn get_module_from_dep(d: zigmod.Dep, cachepath: string, options: CollectO	...	@@ -227,10 +229,11 @@ pub fn get_module_from_dep(d: zigmod.Dep, cachepath: string, options: CollectO
227	if (!nocache) try options.already_fetched.append(modpath);	229	if (!nocache) try options.already_fetched.append(modpath);
228		230
229	switch (d.type) {	231	switch (d.type) {
230	.system_lib => {	232	.system_lib, .framework => {
231	return zigmod.Module{	233	return zigmod.Module{
232	.alloc = options.alloc,	234	.alloc = options.alloc,
233	.is_sys_lib = true,	235	.is_sys_lib = d.type == .system_lib,
		236	.is_framework = d.type == .framework,
234	.id = try u.do_hash(options.alloc, std.crypto.hash.sha3.Sha3_384, d.path),	237	.id = try u.do_hash(options.alloc, std.crypto.hash.sha3.Sha3_384, d.path),
235	.name = d.path,	238	.name = d.path,
236	.only_os = d.only_os,	239	.only_os = d.only_os,

src/util/dep_type.zig+5-2

 @@ -10,6 +10,7 @@ const u = @import("./index.zig");
 pub const DepType = enum {
     local,      // A 'package' derived from files in the same repository.
     system_lib, // std.build.LibExeObjStep.linkSystemLibrary
+    framework,  // std.build.LibExeObjStep.linkFramework
     git,        // https://git-scm.com/
     hg,         // https://www.mercurial-scm.org/
     http,       // https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol
 @@ -36,6 +37,7 @@ pub const DepType = enum {
         switch (self) {
             .local => {},
             .system_lib => {},
+            .framework => {},
             .git => {
                 u.assert((try u.run_cmd(alloc, null, &.{ "git", "clone", "--recurse-submodules", rpath, dpath })) == 0, "git clone {s} failed", .{rpath});
             },
 @@ -56,13 +58,13 @@ pub const DepType = enum {
         }
     }
-    // zig fmt: on
     pub fn update(self: DepType, alloc: std.mem.Allocator, dpath: string, rpath: string) !void {
         _ = rpath;
         switch (self) {
             .local => {},
             .system_lib => {},
+            .framework => {},
             .git => {
                 u.assert((try u.run_cmd(alloc, dpath, &.{ "git", "fetch" })) == 0, "git fetch failed", .{});
                 u.assert((try u.run_cmd(alloc, dpath, &.{ "git", "pull" })) == 0, "git pull failed", .{});
 @@ -76,13 +78,13 @@ pub const DepType = enum {
         }
     }
-    // zig fmt: on
     pub fn exact_version(self: DepType, alloc: std.mem.Allocator, mpath: string) !string {
         var mdir = try std.fs.cwd().openDir(mpath, .{});
         defer mdir.close();
         return switch (self) {
             .local => "",
             .system_lib => "",
+            .framework => "",
             .git => try std.fmt.allocPrint(alloc, "commit-{s}", .{(try u.git_rev_HEAD(alloc, mdir))}),
             .hg => "",
             .http => "",
 @@ -93,6 +95,7 @@ pub const DepType = enum {
         return switch (self) {
             .local => true,
             .system_lib => true,
+            .framework => true,
             .git => false,
             .hg => false,
             .http => false,

src/util/module.zig+11

 @@ -13,6 +13,7 @@ const common = @import("./../common.zig");
 pub const Module = struct {
     alloc: std.mem.Allocator,
     is_sys_lib: bool,
+    is_framework: bool,
     id: string,
     name: string,
     main: string,
 @@ -41,6 +42,7 @@ pub const Module = struct {
         return Module{
             .alloc = alloc,
             .is_sys_lib = false,
+            .is_framework = false,
             .id = if (dep.id.len > 0) dep.id else try u.random_string(alloc, 48),
             .name = dep.name,
             .main = dep.main,
 @@ -125,6 +127,15 @@ pub const Module = struct {
         return false;
     }
+    pub fn has_framework_deps(self: Module) bool {
+        for (self.deps) |d| {
+            if (d.is_framework) {
+                return true;
+            }
+        }
+        return false;
+    }
     pub fn short_id(self: Module) string {
         return u.slice(u8, self.id, 0, 12);
     }

author	Meghan Denny <hello@nektro.net> 2022-03-07 21:22:58 -08:00
committer	Meghan Denny <hello@nektro.net> 2022-03-07 21:22:58 -08:00
log	9e628ca44b6817ebda927de8d7974ff98d8f95b8
tree	7c899c9c3cdcec321b665f79f27a0efa6fadf23a
parent	1a078abb8e9727e98054e1f45bc49aac5a2ce5f8

add framework dep type, fixes #10