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

149
build.zig
View File

@@ -15,144 +15,33 @@ pub fn build(b: *std.Build) void {
const target = b.standardTargetOptions(.{});
const optimize = b.standardOptimizeOption(.{});
const triple = target.result;
if (triple.os.tag != .linux or triple.cpu.arch != .x86_64) {
std.log.warn("The build file only supports Linux x86-64 right now.\n", .{});
std.log.warn(
"You can extend the build.zig to call the appropriate platform scripts " ++
"in 3rd/libomtnet/build/ and 3rd/libomt/build and 3rd/libvmx/build/ " ++
"and modifying the install scripts",
.{},
);
return;
}
{
// This comes from the libomt build scripts
const omt_out_path = "3rd/libomt/bin/Release/net8.0/linux-x64/publish/";
// Build libomtnet
const libomtnet_build_script = b.addSystemCommand(&.{"bash"});
libomtnet_build_script.cwd = b.path("3rd/libomtnet/build");
libomtnet_build_script.addFileArg(b.path("3rd/libomtnet/build/buildall.sh"));
// Build libomt
const libomt_build_script = b.addSystemCommand(&.{"bash"});
libomt_build_script.cwd = b.path("3rd/libomt/build");
libomt_build_script.addFileArg(b.path("3rd/libomt/build/buildlinuxx64.sh"));
libomt_build_script.step.dependOn(&libomtnet_build_script.step);
// Install libomt
const install_omt_h = b.addInstallHeaderFile(
b.path(b.pathJoin(&.{ omt_out_path, "libomt.h" })),
"libomt.h",
);
install_omt_h.step.dependOn(&libomt_build_script.step);
const install_omt_so = b.addInstallLibFile(
b.path(b.pathJoin(&.{ omt_out_path, "libomt.so" })),
"libomt.so",
);
install_omt_so.step.dependOn(&libomt_build_script.step);
// Build libvmx
const libvmx_build = b.addSystemCommand(&.{"bash"});
libvmx_build.cwd = b.path("3rd/libvmx/build");
libvmx_build.addFileArg(b.path("3rd/libvmx/build/buildlinuxx64.sh"));
// Install libvmx
const install_vmx_so = b.addInstallLibFile(
b.path("3rd/libvmx/build/libvmx.so"),
"libvmx.so",
);
install_vmx_so.step.dependOn(&libvmx_build.step);
{
// Manual build step for libomt dependencies
const build_omt_step = b.step("omt", "Build libomtnet, libomt and libvmx");
build_omt_step.dependOn(&install_omt_h.step);
build_omt_step.dependOn(&install_omt_so.step);
build_omt_step.dependOn(&install_vmx_so.step);
}
}
// 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"),
const zomt = b.dependency("omt", .{
.target = target,
.optimize = optimize,
});
omt_module.linkSystemLibrary("omt", .{});
omt_module.addLibraryPath(lib_output_path);
omt_module.addIncludePath(include_output_path);
const exe = b.addExecutable((.{
.name = "omtoy",
.root_module = b.createModule(.{
.root_source_file = b.path("src/main.zig"),
.target = target,
.optimize = optimize,
}),
}));
{
// Define executables
const sender_exe = b.addExecutable(.{
.name = "omtoy-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);
exe.root_module.addImport("omt", zomt.module("zomt"));
exe.addLibraryPath(b.path("omt/zig-out/lib/"));
sender_exe.root_module.addLibraryPath(lib_output_path);
sender_exe.root_module.addIncludePath(include_output_path);
sender_exe.linkSystemLibrary("omt");
sender_exe.linkLibC();
b.installArtifact(exe);
b.installArtifact(sender_exe);
// Run step
const run_step = b.step("run", "Run Omtoy");
const run_cmd = b.addRunArtifact(exe);
run_step.dependOn(&run_cmd.step);
run_cmd.step.dependOn(b.getInstallStep());
// 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",
.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.addLibraryPath(lib_output_path);
receiver_exe.root_module.addIncludePath(include_output_path);
receiver_exe.linkSystemLibrary("omt");
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);
}
if (b.args) |args| {
run_cmd.addArgs(args);
}
// TODO: write tests and stuff