Imbus/pluto
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #305 from ZystemOS/bugfix/user-install-path

Browse source 
Use install_path everywhere
This commit is contained in:
Sam Tebbs 2021-05-06 18:59:31 +01:00 committed by GitHub
commit a992a28166
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
build.zig
View file

@ -59,7 +59,7 @@ pub fn build(b: *Builder) !void {
const disable_display = b.option(bool, "disable-display", "Disable the qemu window") orelse false; const disable_display = b.option(bool, "disable-display", "Disable the qemu window") orelse false;
const exec = b.addExecutable("pluto.elf", main_src); const exec = b.addExecutable("pluto.elf", main_src);
exec.setOutputDir(b.cache_root); exec.setOutputDir(b.install_path);
exec.addBuildOption(TestMode, "test_mode", test_mode); exec.addBuildOption(TestMode, "test_mode", test_mode);
exec.setBuildMode(build_mode); exec.setBuildMode(build_mode);
exec.setLinkerScriptPath(linker_script_path); exec.setLinkerScriptPath(linker_script_path);
@ -84,14 +84,16 @@ pub fn build(b: *Builder) !void {
} else if (test_mode == .Scheduler) { } else if (test_mode == .Scheduler) {
// Add some test files for the user mode runtime tests // Add some test files for the user mode runtime tests
const user_program = b.addAssemble("user_program", "test/user_program.s"); const user_program = b.addAssemble("user_program", "test/user_program.s");
user_program.setOutputDir(b.cache_root); user_program.setOutputDir(b.install_path);
user_program.setTarget(target); user_program.setTarget(target);
user_program.setBuildMode(build_mode); user_program.setBuildMode(build_mode);
user_program.strip = true; user_program.strip = true;
const copy_user_program = b.addSystemCommand(&[_][]const u8{ "objcopy", "-O", "binary", "zig-cache/user_program.o", "zig-cache/user_program" }); const user_program_path = try std.mem.join(b.allocator, "/", &[_][]const u8{ b.install_path, "user_program" });
const user_program_obj_path = try std.mem.join(b.allocator, "/", &[_][]const u8{ b.install_path, "user_program.o" });
const copy_user_program = b.addSystemCommand(&[_][]const u8{ "objcopy", "-O", "binary", user_program_obj_path, user_program_path });
copy_user_program.step.dependOn(&user_program.step); copy_user_program.step.dependOn(&user_program.step);
try ramdisk_files_al.append("zig-cache/user_program"); try ramdisk_files_al.append(user_program_path);
exec.step.dependOn(&copy_user_program.step); exec.step.dependOn(&copy_user_program.step);
} }