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

7
build.zig
View file

@ -10,7 +10,8 @@ const earcut = @import("libs/earcut/build.zig");
const gamemode = @import("libs/gamemode/build.zig");
const model3d = @import("libs/model3d/build.zig");
const dusk = @import("libs/dusk/build.zig");
const wasmserve = @import("tools/wasmserve/wasmserve.zig");
// TODO: get wasmserve working
// const wasmserve = @import("tools/wasmserve/wasmserve.zig");
pub const gpu_dawn = @import("libs/gpu-dawn/sdk.zig").Sdk(.{
.glfw_include_dir = sdkPath("/libs/glfw/upstream/glfw/include"),
.system_sdk = system_sdk,
@ -27,7 +28,8 @@ const core = @import("libs/core/sdk.zig").Sdk(.{
.gpu_dawn = gpu_dawn,
.glfw = glfw,
.gamemode = gamemode,
.wasmserve = wasmserve,
// TODO: get wasmserve working
// .wasmserve = wasmserve,
.sysjs = sysjs,
});
@ -120,7 +122,6 @@ pub fn build(b: *std.Build) !void {
fn testStep(b: *std.Build, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *std.build.RunStep {
const main_tests = b.addTest(.{
.name = "mach-tests",
.kind = .test_exe,
.root_source_file = .{ .path = "src/main.zig" },
.target = target,
.optimize = optimize,

1
libs/basisu/build.zig
View file

@ -39,7 +39,6 @@ pub fn build(b: *Build) void {
pub fn testStep(b: *Build, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *std.build.RunStep {
const main_tests = b.addTest(.{
.name = "basisu-tests",
.kind = .test_exe,
.root_source_file = .{ .path = sdkPath("/src/main.zig") },
.target = target,
.optimize = optimize,

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;
}

1
libs/dusk/build.zig
View file

@ -21,7 +21,6 @@ pub fn module(b: *std.Build) *std.build.Module {
pub fn testStep(b: *std.Build, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *std.build.RunStep {
const main_tests = b.addTest(.{
.name = "dusk-tests",
.kind = .test_exe,
.root_source_file = .{ .path = sdkPath("/test/main.zig") },
.target = target,
.optimize = optimize,

1
libs/ecs/build.zig
View file

@ -20,7 +20,6 @@ pub fn build(b: *std.Build) void {
pub fn testStep(b: *std.Build, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *std.build.RunStep {
const main_tests = b.addTest(.{
.name = "ecs-tests",
.kind = .test_exe,
.root_source_file = .{ .path = sdkPath("/src/main.zig") },
.target = target,
.optimize = optimize,

2
libs/freetype/build.zig
View file

@ -87,7 +87,6 @@ pub fn build(b: *std.Build) !void {
pub fn testStep(b: *Build, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *std.build.RunStep {
const main_tests = b.addTest(.{
.name = "freetype-tests",
.kind = .test_exe,
.root_source_file = .{ .path = sdkPath("/src/main.zig") },
.target = target,
.optimize = optimize,
@ -104,7 +103,6 @@ pub fn testStep(b: *Build, optimize: std.builtin.OptimizeMode, target: std.zig.C
const harfbuzz_tests = b.addTest(.{
.name = "harfbuzz-tests",
.kind = .test_exe,
.root_source_file = .{ .path = sdkPath("/src/harfbuzz/main.zig") },
.target = target,
.optimize = optimize,

1
libs/model3d/build.zig
View file

@ -20,7 +20,6 @@ pub fn build(b: *std.Build) void {
pub fn testStep(b: *std.Build, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *std.build.RunStep {
const main_tests = b.addTest(.{
.name = "model3d-tests",
.kind = .test_exe,
.root_source_file = .{ .path = sdkPath("/src/main.zig") },
.target = target,
.optimize = optimize,

1
libs/sysaudio/sdk.zig
View file

@ -25,7 +25,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 = "sysaudio-tests",
.kind = .test_exe,
.root_source_file = .{ .path = sdkPath("/src/main.zig") },
.target = target,
.optimize = optimize,

10
tools/wasmserve/wasmserve.zig
View file

@ -27,20 +27,20 @@ pub const Options = struct {
pub const Error = error{CannotOpenDirectory} || mem.Allocator.Error;
pub fn serve(step: *build.CompileStep, options: Options) Error!*Wasmserve {
const self = try step.builder.allocator.create(Wasmserve);
const self = try step.step.owner.allocator.create(Wasmserve);
const install_dir = options.install_dir orelse build.InstallDir{ .lib = {} };
const install_dir_iter = fs.cwd().makeOpenPathIterable(step.builder.getInstallPath(install_dir, ""), .{}) catch
const install_dir_iter = fs.cwd().makeOpenPathIterable(step.step.owner.getInstallPath(install_dir, ""), .{}) catch
return error.CannotOpenDirectory;
self.* = Wasmserve{
.step = build.Step.init(.run, "wasmserve", step.builder.allocator, Wasmserve.make),
.b = step.builder,
.step = build.Step.init(.run, "wasmserve", step.step.owner.allocator, Wasmserve.make),
.b = step.step.owner,
.exe_step = step,
.install_dir = install_dir,
.install_dir_iter = install_dir_iter,
.address = options.listen_address orelse net.Address.initIp4([4]u8{ 127, 0, 0, 1 }, 8080),
.subscriber = null,
.watch_paths = options.watch_paths orelse &.{step.root_src.?.path},
.mtimes = std.AutoHashMap(fs.File.INode, i128).init(step.builder.allocator),
.mtimes = std.AutoHashMap(fs.File.INode, i128).init(step.step.owner.allocator),
.notify_msg = null,
};
return self;