schme/omtoy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reorganize project (wip)

Browse Source 
We can build omt again, but something weird happens on import
This commit is contained in:
Kasper Sauramo
2025-10-21 23:25:49 +03:00
parent b48388bc73
commit d4e42514ff
6 changed files with 147 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
omt/build.zig
View File

@@ -27,6 +27,31 @@ pub fn build(b: *std.Build) void {
return;
}
// The output lib and header directories
const lib_output_path: std.Build.LazyPath = .{
.cwd_relative = b.lib_dir,
};
const include_output_path: std.Build.LazyPath = .{
.cwd_relative = b.h_dir,
};
const omt_module = b.addModule("zomt", .{
.root_source_file = b.path("src/omt.zig"),
.target = target,
.optimize = optimize,
});
const omt = b.addLibrary(.{
.name = "zomt",
.linkage = .static,
.root_module = omt_module,
});
omt.root_module.linkSystemLibrary("omt", .{});
omt.root_module.addLibraryPath(lib_output_path);
omt.root_module.addIncludePath(include_output_path);
b.installArtifact(omt);
{
// This comes from the libomt build scripts
const omt_out_path = "3rd/libomt/bin/Release/net8.0/linux-x64/publish/";
@@ -67,6 +92,12 @@ pub fn build(b: *std.Build) void {
);
install_vmx_so.step.dependOn(&libvmx_build.step);
{
// Module dependencies
omt.step.dependOn(&install_omt_h.step);
omt.step.dependOn(&install_omt_so.step);
omt.step.dependOn(&install_vmx_so.step);
}
{
// Manual build step for libomt dependencies
const build_omt_step = b.step("omt", "Build libomtnet, libomt and libvmx");
@@ -76,36 +107,18 @@ pub fn build(b: *std.Build) void {
}
}
// The output lib and header directories
const lib_output_path: std.Build.LazyPath = .{
.cwd_relative = b.lib_dir,
};
const include_output_path: std.Build.LazyPath = .{
.cwd_relative = b.h_dir,
};
// Zig omt module
const omt_module = b.addModule("omt", .{
.root_source_file = b.path("src/omt.zig"),
.target = target,
.optimize = optimize,
});
omt_module.linkSystemLibrary("omt", .{});
omt_module.addLibraryPath(lib_output_path);
omt_module.addIncludePath(include_output_path);
{
// Define executables
const sender_exe = b.addExecutable(.{
.name = "omtoy-sender",
.name = "sender",
.root_module = b.createModule(.{
.root_source_file = b.path("utils/sender.zig"),
.target = target,
.optimize = optimize,
}),
});
sender_exe.root_module.addImport("omt", omt_module);
// sender_exe.root_module.addImport("omt", omt);
sender_exe.root_module.linkLibrary(omt);
sender_exe.root_module.addLibraryPath(lib_output_path);
sender_exe.root_module.addIncludePath(include_output_path);
@@ -113,29 +126,19 @@ pub fn build(b: *std.Build) void {
sender_exe.linkLibC();
b.installArtifact(sender_exe);
// Add run step for sender
const run_sender_step = b.step("sender-run", "Run the sender client");
const run_sender_cmd = b.addRunArtifact(sender_exe);
run_sender_step.dependOn(&run_sender_cmd.step);
run_sender_cmd.step.dependOn(b.getInstallStep());
// Don't actually have arguments, so this is moot
if (b.args) |args| {
run_sender_cmd.addArgs(args);
}
}
{
const receiver_exe = b.addExecutable(.{
.name = "omtoy-receiver",
.name = "receiver",
.root_module = b.createModule(.{
.root_source_file = b.path("utils/receiver.zig"),
.target = target,
.optimize = optimize,
}),
});
receiver_exe.root_module.addImport("omt", omt_module);
receiver_exe.root_module.linkLibrary(omt);
receiver_exe.root_module.addImport("omt", omt.root_module);
receiver_exe.root_module.addLibraryPath(lib_output_path);
receiver_exe.root_module.addIncludePath(include_output_path);
@@ -143,25 +146,5 @@ pub fn build(b: *std.Build) void {
receiver_exe.linkLibC();
b.installArtifact(receiver_exe);
const run_receiver_step = b.step("receiver-run", "Run the receiver client");
const run_receiver_cmd = b.addRunArtifact(receiver_exe);
run_receiver_step.dependOn(&run_receiver_cmd.step);
run_receiver_cmd.step.dependOn(b.getInstallStep());
// Don't actually have arguments so this is moot
if (b.args) |args| {
run_receiver_cmd.addArgs(args);
}
}
// TODO: write tests and stuff
// const exe_tests = b.addTest(.{
// .root_module = sender_exe.root_module,
// });
// const run_exe_tests = b.addRunArtifact(exe_tests);
// const test_step = b.step("test", "Run tests");
// test_step.dependOn(&run_exe_tests.step);
}