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

all: build: update to zig version 0.11.0-dev.6883+da0509750

Browse source
This commit is contained in:
Ali Chraghi 2023-03-16 20:50:53 +03:30 • committed by Stephen Gutekanst
parent 624ab118db
commit edd2117174
9 changed files with 24 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

29
libs/core/sdk.zig
View file

@ -31,7 +31,6 @@ pub fn Sdk(comptime deps: anytype) type {
pub fn testStep(b: *std.Build, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) !*std.build.RunStep {
const main_tests = b.addTest(.{
.name = "core-tests",
.kind = .test_exe,
.root_source_file = .{ .path = sdkPath("/src/main.zig") },
.target = target,
.optimize = optimize,
@ -92,7 +91,7 @@ pub fn Sdk(comptime deps: anytype) type {
pub const LinkError = deps.glfw.LinkError;
pub const RunError = error{
ParsingIpFailed,
} || deps.wasmserve.Error || std.fmt.ParseIntError;
} || std.fmt.ParseIntError;
pub const Platform = enum {
native,
@ -219,18 +218,20 @@ pub fn Sdk(comptime deps: anytype) type {
pub fn run(app: *const App) RunError!*std.build.Step {
if (app.platform == .web) {
const address = std.process.getEnvVarOwned(app.b.allocator, "MACH_ADDRESS") catch try app.b.allocator.dupe(u8, "127.0.0.1");
const port = std.process.getEnvVarOwned(app.b.allocator, "MACH_PORT") catch try app.b.allocator.dupe(u8, "8080");
const address_parsed = std.net.Address.parseIp4(address, try std.fmt.parseInt(u16, port, 10)) catch return error.ParsingIpFailed;
const serve_step = try deps.wasmserve.serve(
app.step,
.{
.install_dir = web_install_dir,
.watch_paths = app.watch_paths,
.listen_address = address_parsed,
},
);
return &serve_step.step;
@panic("TODO: wasmserve is broken! sorry");
// TODO: get wasmserve working
// const address = std.process.getEnvVarOwned(app.b.allocator, "MACH_ADDRESS") catch try app.b.allocator.dupe(u8, "127.0.0.1");
// const port = std.process.getEnvVarOwned(app.b.allocator, "MACH_PORT") catch try app.b.allocator.dupe(u8, "8080");
// const address_parsed = std.net.Address.parseIp4(address, try std.fmt.parseInt(u16, port, 10)) catch return error.ParsingIpFailed;
// const serve_step = try deps.wasmserve.serve(
// app.step,
// .{
// .install_dir = web_install_dir,
// .watch_paths = app.watch_paths,
// .listen_address = address_parsed,
// },
// );
// return &serve_step.step;
} else {
return &app.step.run().step;
}