Update to zig master and simplify build script
This commit is contained in:
Andrew Kelley
Sam Tebbs
parent
b2ce5f6310
commit
798b1c1d34
9 changed files with 143 additions and 636 deletions
230
build.zig
230
build.zig
|
|
@ -1,187 +1,93 @@
|
|||
// Zig version: 0.4.0
|
||||
|
||||
const Builder = @import("std").build.Builder;
|
||||
const Step = @import("std").build.Step;
|
||||
const builtin = @import("builtin");
|
||||
const std = @import("std");
|
||||
const os = std.os;
|
||||
const ArrayList = std.ArrayList;
|
||||
const warn = std.debug.warn;
|
||||
const mem = std.mem;
|
||||
const builtin = @import("builtin");
|
||||
const Builder = std.build.Builder;
|
||||
const Step = std.build.Step;
|
||||
const Target = std.build.Target;
|
||||
const fs = std.fs;
|
||||
|
||||
var src_files: ArrayList([]const u8) = undefined;
|
||||
var src_files_asm: ArrayList([]const u8) = undefined;
|
||||
|
||||
fn concat(allocator: *std.mem.Allocator, str: []const u8, str2: []const u8) !std.Buffer {
|
||||
var b = try std.Buffer.init(allocator, str);
|
||||
try b.append(str2);
|
||||
return b;
|
||||
}
|
||||
|
||||
pub fn build(b: *Builder) void {
|
||||
src_files = ArrayList([]const u8).init(b.allocator);
|
||||
src_files_asm = ArrayList([]const u8).init(b.allocator);
|
||||
pub fn build(b: *Builder) !void {
|
||||
const target = Target{
|
||||
.Cross = std.build.CrossTarget{
|
||||
.arch = .i386,
|
||||
.os = .freestanding,
|
||||
.abi = .gnu,
|
||||
},
|
||||
};
|
||||
const debug = b.option(bool, "debug", "build with debug symbols / make qemu wait for a debug connection") orelse false;
|
||||
var build_path = b.option([]const u8, "build-path", "path to build to") orelse "bin";
|
||||
var src_path = b.option([]const u8, "source-path", "path to source") orelse "src";
|
||||
var target = b.option([]const u8, "target", "target to build/run for") orelse "x86";
|
||||
const rt_test = b.option(bool, "rt-test", "enable/disable runtime testing") orelse false;
|
||||
const builtin_target = if (mem.eql(u8, target, "x86")) builtin.Arch.i386 else unreachable;
|
||||
const zig_path = b.option([]const u8, "zig-path", "the path to the zig binary to use for rt testing") orelse "/snap/bin/zig";
|
||||
|
||||
b.makePath(build_path) catch unreachable;
|
||||
var grub_path = concat(b.allocator, build_path, "/iso/boot/grub") catch unreachable;
|
||||
var kern_path = concat(b.allocator, build_path, "/kernel") catch unreachable;
|
||||
var a_path = concat(b.allocator, build_path, "/kernel/arch/") catch unreachable;
|
||||
a_path = concat(b.allocator, a_path.toSlice(), target) catch unreachable;
|
||||
b.makePath(grub_path.toSlice()) catch unreachable;
|
||||
b.makePath(kern_path.toSlice()) catch unreachable;
|
||||
b.makePath(a_path.toSlice()) catch unreachable;
|
||||
b.makePath("zig-cache/kernel") catch unreachable;
|
||||
|
||||
src_files.append("kernel/kmain") catch unreachable;
|
||||
|
||||
// Add the assemblies
|
||||
switch (builtin_target) {
|
||||
builtin.Arch.i386 => {
|
||||
src_files_asm.append("kernel/arch/x86/irq_asm") catch unreachable;
|
||||
src_files_asm.append("kernel/arch/x86/isr_asm") catch unreachable;
|
||||
const main_src = "src/kernel/kmain.zig";
|
||||
const exec = b.addExecutable("pluto", main_src);
|
||||
exec.setMainPkgPath(".");
|
||||
exec.addBuildOption(bool, "rt_test", rt_test);
|
||||
exec.setLinkerScriptPath("link.ld");
|
||||
exec.setTheTarget(target);
|
||||
switch (target.getArch()) {
|
||||
.i386 => {
|
||||
exec.addAssemblyFile("src/kernel/arch/x86/irq_asm.s");
|
||||
exec.addAssemblyFile("src/kernel/arch/x86/isr_asm.s");
|
||||
},
|
||||
else => {},
|
||||
}
|
||||
|
||||
var arch_boot = concat(b.allocator, "kernel/arch/", target) catch unreachable;
|
||||
arch_boot.append("/boot") catch unreachable;
|
||||
src_files.append(arch_boot.toSlice()) catch unreachable;
|
||||
const iso_path = fs.path.join(b.allocator, [_][]const u8{ b.exe_dir, "pluto.iso" }) catch unreachable;
|
||||
const grub_build_path = fs.path.join(b.allocator, [_][]const u8{ b.exe_dir, "iso", "boot" }) catch unreachable;
|
||||
const iso_dir_path = fs.path.join(b.allocator, [_][]const u8{ b.exe_dir, "iso" }) catch unreachable;
|
||||
|
||||
const iso_path = concat(b.allocator, build_path, "/pluto.iso") catch unreachable;
|
||||
var objects = buildObjects(b, builtin_target, build_path, src_path);
|
||||
var link_step = buildLink(b, builtin_target, build_path);
|
||||
const iso_step = buildISO(b, build_path, iso_path.toSlice());
|
||||
const mkdir_cmd = b.addSystemCommand([_][]const u8{ "mkdir", "-p", fs.path.dirname(grub_build_path).? });
|
||||
|
||||
for (objects.toSlice()) |obj| {
|
||||
if (std.mem.eql(u8, obj.name, "kernel/kmain")) {
|
||||
// Add build options here
|
||||
obj.addBuildOption(bool, "rt_test", rt_test);
|
||||
}
|
||||
b.default_step.dependOn(&obj.step);
|
||||
}
|
||||
b.default_step.dependOn(link_step);
|
||||
for (iso_step.toSlice()) |step| b.default_step.dependOn(step);
|
||||
const grub_cmd = b.addSystemCommand([_][]const u8{ "cp", "-r", "grub", grub_build_path });
|
||||
grub_cmd.step.dependOn(&mkdir_cmd.step);
|
||||
|
||||
buildRun(b, builtin_target, build_path, iso_path.toSlice(), debug, rt_test);
|
||||
buildDebug(b);
|
||||
buildTest(b, src_path, rt_test, target, zig_path);
|
||||
}
|
||||
const cp_elf_cmd = b.addSystemCommand([_][]const u8{"cp"});
|
||||
cp_elf_cmd.addArtifactArg(exec);
|
||||
cp_elf_cmd.addArg(try fs.path.join(b.allocator, [_][]const u8{ grub_build_path, "pluto.elf" }));
|
||||
cp_elf_cmd.step.dependOn(&grub_cmd.step);
|
||||
cp_elf_cmd.step.dependOn(&exec.step);
|
||||
|
||||
fn buildTest(b: *Builder, src_path: []const u8, rt_test: bool, target: []const u8, zig_path: []const u8) void {
|
||||
const step = b.step("test", "Run tests");
|
||||
if (rt_test) {
|
||||
const script = b.addSystemCommand([][]const u8{ "python3", "test/rt-test.py", target, zig_path});
|
||||
step.dependOn(&script.step);
|
||||
} else {
|
||||
const src_path2 = concat(b.allocator, src_path, "/") catch unreachable;
|
||||
for (src_files.toSlice()) |file| {
|
||||
var file_src = concat(b.allocator, src_path2.toSlice(), file) catch unreachable;
|
||||
file_src.append(".zig") catch unreachable;
|
||||
const tst = b.addTest(file_src.toSlice());
|
||||
tst.setMainPkgPath(".");
|
||||
step.dependOn(&tst.step);
|
||||
}
|
||||
}
|
||||
}
|
||||
const iso_cmd = b.addSystemCommand([_][]const u8{ "grub-mkrescue", "-o", iso_path, iso_dir_path });
|
||||
iso_cmd.step.dependOn(&cp_elf_cmd.step);
|
||||
b.default_step.dependOn(&iso_cmd.step);
|
||||
|
||||
fn buildDebug(b: *Builder) void {
|
||||
const step = b.step("debug", "Debug with gdb");
|
||||
const cmd = b.addSystemCommand([][]const u8{
|
||||
"gdb",
|
||||
"-ex",
|
||||
"symbol-file bin/iso/boot/pluto.elf",
|
||||
"-ex",
|
||||
"target remote localhost:1234",
|
||||
});
|
||||
step.dependOn(&cmd.step);
|
||||
}
|
||||
|
||||
fn buildRun(b: *Builder, target: builtin.Arch, build_path: []const u8, iso_path: []const u8, debug: bool, rt_test: bool) void {
|
||||
const step = b.step("run", "Run with qemu");
|
||||
const qemu = if (target == builtin.Arch.i386) "qemu-system-i386" else unreachable;
|
||||
var qemu_flags = ArrayList([]const u8).init(b.allocator);
|
||||
qemu_flags.appendSlice([][]const u8{
|
||||
qemu,
|
||||
const run_step = b.step("run", "Run with qemu");
|
||||
const qemu_bin = if (target.getArch() == builtin.Arch.i386) "qemu-system-i386" else unreachable;
|
||||
const qemu_cmd = b.addSystemCommand([_][]const u8{
|
||||
qemu_bin,
|
||||
"-cdrom",
|
||||
iso_path,
|
||||
"-boot",
|
||||
"d",
|
||||
"-serial",
|
||||
"stdio",
|
||||
}) catch unreachable;
|
||||
});
|
||||
if (debug)
|
||||
qemu_flags.appendSlice([][]const u8{
|
||||
"-s",
|
||||
"-S",
|
||||
}) catch unreachable;
|
||||
qemu_cmd.addArgs([_][]const u8{ "-s", "-S" });
|
||||
if (rt_test)
|
||||
qemu_flags.appendSlice([][]const u8{
|
||||
"-display",
|
||||
"none"
|
||||
}) catch unreachable;
|
||||
const cmd = b.addSystemCommand(qemu_flags.toSlice());
|
||||
step.dependOn(&cmd.step);
|
||||
}
|
||||
qemu_cmd.addArgs([_][]const u8{ "-display", "none" });
|
||||
run_step.dependOn(&qemu_cmd.step);
|
||||
qemu_cmd.step.dependOn(&iso_cmd.step);
|
||||
|
||||
fn buildISO(b: *Builder, build_path: []const u8, iso_path: []const u8) ArrayList(*Step) {
|
||||
const grub_build_path = concat(b.allocator, build_path, "/iso/boot/") catch unreachable;
|
||||
const iso_dir_path = concat(b.allocator, build_path, "/iso") catch unreachable;
|
||||
const grub_cmd = b.addSystemCommand([][]const u8{ "cp", "-r", "grub", grub_build_path.toSlice() });
|
||||
const iso_cmd = b.addSystemCommand([][]const u8{ "grub-mkrescue", "-o", iso_path, iso_dir_path.toSlice() });
|
||||
var steps = ArrayList(*Step).init(b.allocator);
|
||||
steps.append(&grub_cmd.step) catch unreachable;
|
||||
steps.append(&iso_cmd.step) catch unreachable;
|
||||
return steps;
|
||||
}
|
||||
const test_step = b.step("test", "Run tests");
|
||||
if (rt_test) {
|
||||
const script = b.addSystemCommand([_][]const u8{ "python3", "test/rt-test.py", "x86", b.zig_exe });
|
||||
test_step.dependOn(&script.step);
|
||||
} else {
|
||||
const unit_tests = b.addTest(main_src);
|
||||
unit_tests.setMainPkgPath(".");
|
||||
unit_tests.addBuildOption(bool, "rt_test", rt_test);
|
||||
test_step.dependOn(&unit_tests.step);
|
||||
}
|
||||
|
||||
fn buildLink(b: *Builder, target: builtin.Arch, build_path: []const u8) *Step {
|
||||
const exec = b.addExecutable("pluto.elf", null);
|
||||
const elf_path = concat(b.allocator, build_path, "/iso/boot") catch unreachable;
|
||||
exec.setOutputDir(elf_path.toSlice());
|
||||
exec.setLinkerScriptPath("link.ld");
|
||||
exec.setTarget(target, builtin.Os.freestanding, builtin.Abi.gnu);
|
||||
for (src_files.toSlice()) |file| {
|
||||
var file_obj = concat(b.allocator, build_path, "/") catch unreachable;
|
||||
file_obj.append(file) catch unreachable;
|
||||
file_obj.append(".o") catch unreachable;
|
||||
exec.addObjectFile(file_obj.toSlice());
|
||||
exec.setMainPkgPath(".");
|
||||
}
|
||||
for (src_files_asm.toSlice()) |file| {
|
||||
var file_obj = concat(b.allocator, build_path, "/") catch unreachable;
|
||||
file_obj.append(file) catch unreachable;
|
||||
file_obj.append(".o") catch unreachable;
|
||||
exec.addObjectFile(file_obj.toSlice());
|
||||
}
|
||||
return &exec.step;
|
||||
}
|
||||
|
||||
fn buildObjects(b: *Builder, target: builtin.Arch, build_path: []const u8, src_path: []const u8) ArrayList(*std.build.LibExeObjStep) {
|
||||
var objects = ArrayList(*std.build.LibExeObjStep).init(b.allocator);
|
||||
const src_path2 = concat(b.allocator, src_path, "/") catch unreachable;
|
||||
for (src_files.toSlice()) |file| {
|
||||
var file_src = concat(b.allocator, src_path2.toSlice(), file) catch unreachable;
|
||||
file_src.append(".zig") catch unreachable;
|
||||
const obj = b.addObject(file, file_src.toSlice());
|
||||
obj.setMainPkgPath(".");
|
||||
obj.setOutputDir(build_path);
|
||||
obj.setTarget(target, builtin.Os.freestanding, builtin.Abi.gnu);
|
||||
objects.append(obj) catch unreachable;
|
||||
}
|
||||
for (src_files_asm.toSlice()) |file| {
|
||||
var file_src = concat(b.allocator, src_path2.toSlice(), file) catch unreachable;
|
||||
file_src.append(".s") catch unreachable;
|
||||
const obj = b.addAssemble(file, file_src.toSlice());
|
||||
obj.setOutputDir(build_path);
|
||||
obj.setTarget(target, builtin.Os.freestanding, builtin.Abi.gnu);
|
||||
objects.append(obj) catch unreachable;
|
||||
}
|
||||
return objects;
|
||||
const debug_step = b.step("debug", "Debug with gdb");
|
||||
const debug_cmd = b.addSystemCommand([_][]const u8{
|
||||
"gdb",
|
||||
"-ex",
|
||||
"symbol-file",
|
||||
});
|
||||
debug_cmd.addArtifactArg(exec);
|
||||
debug_cmd.addArgs([_][]const u8{
|
||||
"-ex",
|
||||
"target remote localhost:1234",
|
||||
});
|
||||
debug_step.dependOn(&debug_cmd.step);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue