| author |  Meghan Denny <hello@nektro.net> 2021-06-05 20:39:56 -07:00 |
| committer | Meghan Denny <hello@nektro.net> 2021-06-05 20:39:56 -07:00 |
| log | 0a970854c1f5c8c11b6ab3ec50328ab8ec137fe5 |
| tree | 2d84c46decf62420f2cacdf0b1a04836bb0a3f9f |
| parent | 6680b93989318cf36c98eadbb1e86452bfc6bb11 |
inline ansi red foreground code and remove `libs/zig-ansi` submodule
6 files changed, 6 insertions(+), 15 deletions(-)
.gitmodules-3
| ... | ... | @@ -1,6 +1,3 @@ |
| 1 | 1 | [submodule "libs/yaml"] |
| 2 | 2 | path = libs/yaml |
| 3 | 3 | url = https://github.com/yaml/libyaml |
| 4 | [submodule "libs/zig-ansi"] | |
| 5 | path = libs/zig-ansi | |
| 6 | url = https://github.com/nektro/zig-ansi |
build.zig-1
| ... | ... | @@ -41,7 +41,6 @@ pub fn build(b: *Builder) void { |
| 41 | 41 | exe.addCSourceFile("./libs/yaml/src/writer.c", &.{}); |
| 42 | 42 | |
| 43 | 43 | exe.addPackagePath("zigmod", "./src/lib.zig"); |
| 44 | exe.addPackagePath("ansi", "./libs/zig-ansi/src/lib.zig"); | |
| 45 | 44 | } else { |
| 46 | 45 | deps.addAllTo(exe); |
| 47 | 46 | } |
deps.zig-2
| ... | ... | @@ -71,12 +71,10 @@ pub const package_data = struct { |
| 71 | 71 | |
| 72 | 72 | pub const packages = &[_]std.build.Pkg{ |
| 73 | 73 | package_data._89ujp8gq842x, |
| 74 | package_data._s84v9o48ucb0, | |
| 75 | 74 | }; |
| 76 | 75 | |
| 77 | 76 | pub const pkgs = struct { |
| 78 | 77 | pub const zigmod = packages[0]; |
| 79 | pub const ansi = packages[1]; | |
| 80 | 78 | }; |
| 81 | 79 | |
| 82 | 80 | pub const c_include_dirs = &[_][]const u8{ |
libs/zig-ansi deleted-1
| ... | ... | @@ -1 +0,0 @@ |
| 1 | Subproject commit 876c32c42044a5e1554f4662b4b9bdfad7ee5086 |
src/util/funcs.zig+4-3
| ... | ... | @@ -1,8 +1,6 @@ |
| 1 | 1 | const std = @import("std"); |
| 2 | 2 | const gpa = std.heap.c_allocator; |
| 3 | 3 | |
| 4 | const ansi = @import("ansi"); | |
| 5 | ||
| 6 | 4 | const u = @import("index.zig"); |
| 7 | 5 | |
| 8 | 6 | // |
| ... | ... | @@ -17,9 +15,12 @@ pub fn print(comptime fmt: []const u8, args: anytype) void { |
| 17 | 15 | std.debug.print(fmt ++ "\n", args); |
| 18 | 16 | } |
| 19 | 17 | |
| 18 | const ansi_red = "\x1B[31m"; | |
| 19 | const ansi_reset = "\x1B[39m"; | |
| 20 | ||
| 20 | 21 | pub fn assert(ok: bool, comptime fmt: []const u8, args: anytype) void { |
| 21 | 22 | if (!ok) { |
| 22 | print(comptime ansi.color.Fg(.Red, "error: " ++ fmt), args); | |
| 23 | print(ansi_red ++ fmt ++ ansi_reset, args); | |
| 23 | 24 | std.os.exit(1); |
| 24 | 25 | } |
| 25 | 26 | } |
zig.mod+2-5
| ... | ... | @@ -25,12 +25,12 @@ dependencies: |
| 25 | 25 | - src/scanner.c |
| 26 | 26 | - src/writer.c |
| 27 | 27 | |
| 28 | - src: git https://github.com/nektro/zig-ansi | |
| 29 | ||
| 30 | 28 | # Entries above this line are needed to bootstrap and kept as git submodules |
| 31 | 29 | # -------- |
| 32 | 30 | # Entries below this line are only fetched with zigmod itself |
| 33 | 31 | |
| 32 | - src: git https://github.com/nektro/zig-ansi | |
| 33 | ||
| 34 | 34 | - src: git https://github.com/ziglibs/known-folders |
| 35 | 35 | |
| 36 | 36 | - src: git https://github.com/nektro/zig-licenses |
| ... | ... | @@ -40,6 +40,3 @@ dependencies: |
| 40 | 40 | - src: git https://github.com/nektro/zig-json |
| 41 | 41 | |
| 42 | 42 | - src: http https://aquila.red/1/nektro/range/v0.1.tar.gz sha256-d2f72fdd8cdb8 0 1 |
| 43 | ||
| 44 | dev_dependencies: | |
| 45 | - src: git https://github.com/nektro/zig-ansi |