summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Uko Kokņevičs2023-07-04 03:12:27 +0300
committerGravatar Uko Kokņevičs2023-07-04 03:12:27 +0300
commit080579a0884a6510f210e700dfd24af32f861b3b (patch)
tree270f7987c97856b11138a9387ba68b36b8d040d9
parentUse build.zig.zon for fetching clap (diff)
downloadzup-080579a0884a6510f210e700dfd24af32f861b3b.tar.gz
zup-080579a0884a6510f210e700dfd24af32f861b3b.tar.xz
zup-080579a0884a6510f210e700dfd24af32f861b3b.zip
Use build.zig.zon for fetching curl
-rw-r--r--build.zig3
-rw-r--r--build.zig.zon4
m---------libs/curl0
3 files changed, 6 insertions, 1 deletions
diff --git a/build.zig b/build.zig
index bc3f145..94cccf9 100644
--- a/build.zig
+++ b/build.zig
@@ -14,6 +14,7 @@ pub fn build(b: *Build) void {
14 config.addOption(SemanticVersion, "version", version); 14 config.addOption(SemanticVersion, "version", version);
15 15
16 const clap = b.dependency("clap", .{}); 16 const clap = b.dependency("clap", .{});
17 const curl = b.dependency("curl", .{});
17 18
18 const exe = b.addExecutable(.{ 19 const exe = b.addExecutable(.{
19 .name = "zup", 20 .name = "zup",
@@ -24,7 +25,7 @@ pub fn build(b: *Build) void {
24 }); 25 });
25 exe.addOptions("zup-config", config); 26 exe.addOptions("zup-config", config);
26 exe.addModule("clap", clap.module("clap")); 27 exe.addModule("clap", clap.module("clap"));
27 exe.addModule("curl", b.createModule(.{ .source_file = .{ .path = "libs/curl/curl.zig" } })); 28 exe.addModule("curl", curl.module("curl"));
28 exe.addModule("libarchive", b.createModule(.{ 29 exe.addModule("libarchive", b.createModule(.{
29 .source_file = .{ .path = "libs/libarchive/libarchive.zig" }, 30 .source_file = .{ .path = "libs/libarchive/libarchive.zig" },
30 })); 31 }));
diff --git a/build.zig.zon b/build.zig.zon
index 575adcc..276ecef 100644
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -7,5 +7,9 @@
7 .url = "https://github.com/Hejsil/zig-clap/archive/bdb5853b678d68f342ec65b04a6785af522ca6c9.tar.gz", 7 .url = "https://github.com/Hejsil/zig-clap/archive/bdb5853b678d68f342ec65b04a6785af522ca6c9.tar.gz",
8 .hash = "12202af04ec78191f2018458a7be29f54e0d9118f7688e7a226857acf754d68b8473", 8 .hash = "12202af04ec78191f2018458a7be29f54e0d9118f7688e7a226857acf754d68b8473",
9 }, 9 },
10 .curl = .{
11 .url = "https://git.sr.ht/~ukko/zig-curl/archive/aa55a3d061fceebf737c0af25a6df2d05f83bcad.tar.gz",
12 .hash = "12208fc84cbd67383b6fe7e3f65a965cead4577ca27cd59660a2812c9f4edc545c5e",
13 },
10 }, 14 },
11} 15}
diff --git a/libs/curl b/libs/curl
deleted file mode 160000
Subproject f6915b7da30b39ced132c4f163ce7f2ec451065