Use zig package manger for zig-clap

This commit is contained in:
Nils André
2024-03-09 20:21:07 -08:00
parent ef042bbcfe
commit 812b3887ad
5 changed files with 10 additions and 37 deletions

3
.gitmodules vendored
View File

@@ -1,3 +0,0 @@
[submodule "src/zig-clap"]
path = src/zig-clap
url = https://github.com/Hejsil/zig-clap.git

View File

@@ -18,7 +18,10 @@ pub fn build(b: *std.Build) void {
// set a preferred release mode, allowing the user to decide how to optimize.
const optimize = b.standardOptimizeOption(.{});
// const clap = b.addModule("clap", .{ .root_source_file = .{ .path = "lib/zig-clap/clap.zig" } });
const clap = b.dependency("clap", .{
.optimize = optimize,
.target = target,
});
const runtime = b.addExecutable(.{
.name = "runtime",
@@ -39,6 +42,7 @@ pub fn build(b: *std.Build) void {
});
dockerc.root_module.addAnonymousImport("runtime", .{ .root_source_file = runtime.getEmittedBin() });
dockerc.root_module.addImport("clap", clap.module("clap"));
b.installArtifact(dockerc);

View File

@@ -15,37 +15,11 @@
// Once all dependencies are fetched, `zig build` no longer requires
// internet connectivity.
.dependencies = .{
// See `zig fetch --save <url>` for a command-line interface for adding dependencies.
//.example = .{
// // When updating this field to a new URL, be sure to delete the corresponding
// // `hash`, otherwise you are communicating that you expect to find the old hash at
// // the new URL.
// .url = "https://example.com/foo.tar.gz",
//
// // This is computed from the file contents of the directory of files that is
// // obtained after fetching `url` and applying the inclusion rules given by
// // `paths`.
// //
// // This field is the source of truth; packages do not come from a `url`; they
// // come from a `hash`. `url` is just one of many possible mirrors for how to
// // obtain a package matching this `hash`.
// //
// // Uses the [multihash](https://multiformats.io/multihash/) format.
// .hash = "...",
//
// // When this is provided, the package is found in a directory relative to the
// // build root. In this case the package's hash is irrelevant and therefore not
// // computed. This field and `url` are mutually exclusive.
// .path = "foo",
//},
.clap = .{
.url = "https://github.com/Hejsil/zig-clap/archive/0f2db7700b05356ebb1ccddbbf1797048925f072.tar.gz",
.hash = "12203896de6eedec14712f4f1eaac8b646939cfed213c56accf231a0abb05f9dbb77",
},
},
// Specifies the set of files and directories that are included in this package.
// Only files and directories listed here are included in the `hash` that
// is computed for this package.
// Paths are relative to the build root. Use the empty string (`""`) to refer to
// the build root itself.
// A directory listed here means that all files within, recursively, are included.
.paths = .{
// This makes *all* files, recursively, included in this package. It is generally
// better to explicitly list the files and directories instead, to insure that

View File

@@ -1,6 +1,5 @@
const std = @import("std");
// const clap = @import("../lib/zip-clap/clap.zig");
const clap = @import("zig-clap/clap.zig");
const clap = @import("clap");
const common = @import("common.zig");
const mkdtemp = common.mkdtemp;

Submodule src/zig-clap deleted from 4267b0b60e