zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mach: build: cleanup and add notes

Browse source
This commit is contained in:
iddev5 2022-05-27 13:19:15 +05:30 • committed by Stephen Gutekanst
parent e7f7737cc8
commit 8b8ed4dc8f
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
build.zig
View file

@ -178,21 +178,21 @@ pub const App = struct {
// in case of wasm // in case of wasm
if (app.step.target.toTarget().cpu.arch == .wasm32) { if (app.step.target.toTarget().cpu.arch == .wasm32) {
// Set install directory to '{prefix}/www' // Set install directory to '{prefix}/www'
app.step.install_step.?.dest_dir = web_install_dir; app.getInstallStep().?.dest_dir = web_install_dir;
const install_mach_js = app.b.addInstallFileWithDir( const install_mach_js = app.b.addInstallFileWithDir(
.{ .path = thisDir() ++ "/src/mach.js" }, .{ .path = thisDir() ++ "/src/mach.js" },
web_install_dir, web_install_dir,
"mach.js", "mach.js",
); );
app.step.install_step.?.step.dependOn(&install_mach_js.step); app.getInstallStep().?.step.dependOn(&install_mach_js.step);
const install_template_html = app.b.addInstallFileWithDir( const install_template_html = app.b.addInstallFileWithDir(
.{ .path = thisDir() ++ "/www/template.html" }, .{ .path = thisDir() ++ "/www/template.html" },
web_install_dir, web_install_dir,
"application.html", "application.html",
); );
app.step.install_step.?.step.dependOn(&install_template_html.step); app.getInstallStep().?.step.dependOn(&install_template_html.step);
} }
} }
@ -218,12 +218,17 @@ pub const App = struct {
pub fn run(app: *const App) *std.build.RunStep { pub fn run(app: *const App) *std.build.RunStep {
if (app.step.target.toTarget().cpu.arch == .wasm32) { if (app.step.target.toTarget().cpu.arch == .wasm32) {
const http_server = app.b.addExecutable("http-server", "tools/http-server.zig"); const http_server = app.b.addExecutable("http-server", thisDir() ++ "/tools/http-server.zig");
http_server.addPackage(.{ http_server.addPackage(.{
.name = "apple_pie", .name = "apple_pie",
.path = .{ .path = "tools/libs/apple_pie/src/apple_pie.zig" }, .path = .{ .path = "tools/libs/apple_pie/src/apple_pie.zig" },
}); });
// NOTE: The launch actually takes place in reverse order. The browser is launched first
// and then the http-server.
// This is because running the server would block the process (a limitation of current
// RunStep). So we assume that (xdg-)open is a launcher and not a blocking process.
const launch = app.b.addSystemCommand(&.{ const launch = app.b.addSystemCommand(&.{
switch (builtin.os.tag) { switch (builtin.os.tag) {
.macos, .windows => "open", .macos, .windows => "open",
@ -232,7 +237,7 @@ pub const App = struct {
// TODO: use actual application name // TODO: use actual application name
"http://127.0.0.1:8000/application.html", "http://127.0.0.1:8000/application.html",
}); });
launch.step.dependOn(&app.step.install_step.?.step); launch.step.dependOn(&app.getInstallStep().?.step);
const serve = http_server.run(); const serve = http_server.run();
serve.addArg("application"); serve.addArg("application");