diff --git a/deps.zig b/deps.zig index aec0e4071ea7062ed6917b47174df0eec9924413..331877e78271d863bcff33e118a60e34d5460bde 100644 --- a/deps.zig +++ b/deps.zig @@ -36,7 +36,7 @@ pub const _ids = .{ }; pub const _paths = .{ - "", + "/../../", "/v/git/github.com/yaml/libyaml/tag-0.2.5/", "/v/git/github.com/nektro/zig-ansi/commit-25039ca/", "/v/git/github.com/ziglibs/known-folders/commit-f0f4188/", @@ -51,22 +51,17 @@ pub const package_data = struct { pub const _2b7mq571jmq31ktmpigopu29480iw245heueajgxzxn7ab8o = std.build.Pkg{ .name = "zuri", .path = cache ++ "/v/git/github.com/Vexu/zuri/commit-41bcd78/src/zuri.zig", .dependencies = &[_]std.build.Pkg{ } }; pub const _csbnipaad8n77buaszsnjvlmn6j173fl7pkprsctelswjywe = std.build.Pkg{ .name = "iguanatls", .path = cache ++ "/v/git/github.com/alexnask/iguanaTLS/commit-1767e48/src/main.zig", .dependencies = &[_]std.build.Pkg{ } }; pub const _0npcrzfdlrvkf44mzjo8bduj9gmqyefo0j3rstt6b0pm2r6r = std.build.Pkg{ .name = "licenses", .path = cache ++ "/v/git/github.com/nektro/zig-licenses/commit-1a19e4b/src/lib.zig", .dependencies = &[_]std.build.Pkg{ } }; + pub const _89ujp8gq842x6mzok8feypwze138n2d96zpugw44hcq7406r = std.build.Pkg{ .name = "zigmod", .path = cache ++ "/../../src/lib.zig", .dependencies = &[_]std.build.Pkg{ _s84v9o48ucb0xq0cmzq0cn433hgw0iaqztugja16h8bzxu3h, _2ta738wrqbaqzl3iwzoo8nj35k9ynwz5p5iyz80ryrpp4ttf, _2b7mq571jmq31ktmpigopu29480iw245heueajgxzxn7ab8o, _csbnipaad8n77buaszsnjvlmn6j173fl7pkprsctelswjywe, _0npcrzfdlrvkf44mzjo8bduj9gmqyefo0j3rstt6b0pm2r6r, } }; }; pub const packages = &[_]std.build.Pkg{ + package_data._89ujp8gq842x6mzok8feypwze138n2d96zpugw44hcq7406r, package_data._s84v9o48ucb0xq0cmzq0cn433hgw0iaqztugja16h8bzxu3h, - package_data._2ta738wrqbaqzl3iwzoo8nj35k9ynwz5p5iyz80ryrpp4ttf, - package_data._2b7mq571jmq31ktmpigopu29480iw245heueajgxzxn7ab8o, - package_data._csbnipaad8n77buaszsnjvlmn6j173fl7pkprsctelswjywe, - package_data._0npcrzfdlrvkf44mzjo8bduj9gmqyefo0j3rstt6b0pm2r6r, }; pub const pkgs = struct { + pub const zigmod = packages[0]; pub const ansi = packages[1]; - pub const known_folders = packages[2]; - pub const zuri = packages[3]; - pub const iguanatls = packages[4]; - pub const licenses = packages[5]; }; pub const c_include_dirs = &[_][]const u8{ diff --git a/src/lib.zig b/src/lib.zig new file mode 100644 index 0000000000000000000000000000000000000000..8970c5e38c7cf9673236693b759e05ca0cbb79ec --- /dev/null +++ b/src/lib.zig @@ -0,0 +1,11 @@ +pub const commands_to_bootstrap = struct { + pub const fetch = @import("./cmd/fetch.zig"); +}; + +pub const commands = struct { + pub const init = @import("./cmd/init.zig"); + pub const fetch = @import("./cmd/fetch.zig"); + pub const sum = @import("./cmd/sum.zig"); + pub const zpm = @import("./cmd/zpm.zig"); + pub const license = @import("./cmd/license.zig"); +}; diff --git a/src/main.zig b/src/main.zig index dd467691e7bc4b3e5f67b5093323249a392e2744..217ca03b72857073488dca042b6bb83ed9533a16 100644 --- a/src/main.zig +++ b/src/main.zig @@ -1,6 +1,7 @@ const std = @import("std"); const builtin = std.builtin; const build_options = @import("build_options"); +const zigmod = @import("zigmod"); pub const u = @import("./util/index.zig"); pub const common = @import("./common.zig"); @@ -8,18 +9,6 @@ pub const common = @import("./common.zig"); // // -pub const commands_to_bootstrap = struct { - pub const fetch = @import("./cmd/fetch.zig"); -}; - -pub const commands = struct { - pub const init = @import("./cmd/init.zig"); - pub const fetch = @import("./cmd/fetch.zig"); - pub const sum = @import("./cmd/sum.zig"); - pub const zpm = @import("./cmd/zpm.zig"); - pub const license = @import("./cmd/license.zig"); -}; - pub fn main() !void { const gpa = std.heap.c_allocator; @@ -37,7 +26,7 @@ pub fn main() !void { return; } - const available = if (build_options.bootstrap) commands_to_bootstrap else commands; + const available = if (build_options.bootstrap) zigmod.commands_to_bootstrap else zigmod.commands; inline for (std.meta.declarations(available)) |decl| { if (std.mem.eql(u8, args[0], decl.name)) { diff --git a/zig.mod b/zig.mod index c0fb04585465ef0876ab28d46d6e2e51391c4d90..0b38acffff893b6da310a47980f4e7082a865015 100644 --- a/zig.mod +++ b/zig.mod @@ -1,6 +1,6 @@ id: 89ujp8gq842x6mzok8feypwze138n2d96zpugw44hcq7406r name: zigmod -main: src/main.zig +main: src/lib.zig license: MIT dependencies: - src: git https://github.com/yaml/libyaml tag-0.2.5 @@ -37,3 +37,6 @@ dependencies: - src: git https://github.com/alexnask/iguanaTLS commit-1767e48 - src: git https://github.com/nektro/zig-licenses commit-1a19e4b + +dev_dependencies: + - src: git https://github.com/nektro/zig-ansi commit-25039ca