chore: update to the new build system

This commit is contained in:
Rekai Nyangadzayi Musuka 2023-06-19 12:04:35 -05:00
parent 215e053b9a
commit 39a4260ffd
4 changed files with 16 additions and 44 deletions

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "lib/zig-network"]
path = lib/zig-network
url = https://github.com/MasterQ32/zig-network

View File

@ -1,50 +1,16 @@
const std = @import("std"); const std = @import("std");
const CompileStep = std.Build.CompileStep;
fn path(comptime suffix: []const u8) []const u8 {
if (suffix[0] == '/') @compileError("expected a relative path");
return comptime (std.fs.path.dirname(@src().file) orelse ".") ++ std.fs.path.sep_str ++ suffix;
}
pub fn getModule(b: *std.Build) *std.build.Module {
// https://github.com/MasterQ32/zig-network
const network = b.createModule(.{ .source_file = .{ .path = path("lib/zig-network/network.zig") } });
return b.createModule(.{
.source_file = .{ .path = path("src/lib.zig") },
.dependencies = &.{.{ .name = "network", .module = network }},
});
}
pub fn build(b: *std.Build) void { pub fn build(b: *std.Build) void {
const target = b.standardTargetOptions(.{}); const target = b.standardTargetOptions(.{});
// const optimize = b.standardOptimizeOption(.{}); const net_dep = b.dependency("zig-network", .{}); // https://github.com/MasterQ32/zig-network
// -- Library -- _ = b.addModule("gdbstub", .{
.source_file = .{ .path = "src/lib.zig" },
const lib_test = b.addTest(.{ .dependencies = &.{.{ .name = "network", .module = net_dep.module("network") }},
.root_source_file = .{ .path = "src/lib.zig" },
.target = target,
}); });
const lib_test = b.addTest(.{ .root_source_file = .{ .path = "src/lib.zig" }, .target = target });
const test_step = b.step("test", "Run Library Tests"); const test_step = b.step("test", "Run Library Tests");
test_step.dependOn(&lib_test.step); test_step.dependOn(&lib_test.step);
// -- Executable --
// const exe = b.addExecutable(.{
// .name = "gdbserver",
// .root_source_file = .{ .path = "src/main.zig" },
// .target = target,
// .optimize = optimize,
// });
// link(exe);
// exe.install();
// const run_cmd = exe.run();
// run_cmd.step.dependOn(b.getInstallStep());
// if (b.args) |args| run_cmd.addArgs(args);
// const run_step = b.step("run", "Run the app");
// run_step.dependOn(&run_cmd.step);
} }

10
build.zig.zon Normal file
View File

@ -0,0 +1,10 @@
.{
.name = "zba-gdbstub",
.version = "0.1.0",
.dependencies = .{
.@"zig-network" = .{
.url = "https://github.com/MasterQ32/zig-network/archive/86c315be67c7567195cc426615d81202a39bbb91.tar.gz",
.hash = "1220746fef79fb9774d76a0a5d746ccf30cfc847bce4a3a7388c3451817b7ab92869",
},
},
}

@ -1 +0,0 @@
Subproject commit 45ae8cf0ce3972eb4dddad3f5def8613c9b546f3