mirror of
https://github.com/zigzap/zap.git
synced 2025-10-20 15:14:08 +00:00
Merge branch 'qbradley-module'
This commit is contained in:
Rene Schallner
commit
db6496cd7a
2 changed files with 29 additions and 163 deletions
181
build.zig
181
build.zig
|
|
@ -6,8 +6,21 @@ pub fn build(b: *std.build.Builder) !void {
|
|||
// between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall.
|
||||
const optimize = b.standardOptimizeOption(.{});
|
||||
|
||||
var ensure_step = b.step("deps", "ensure external dependencies");
|
||||
ensure_step.makeFn = ensureDeps;
|
||||
const facil_dep = b.dependency("facil.io", .{
|
||||
.target = target,
|
||||
.optimize = optimize,
|
||||
});
|
||||
|
||||
// create a module to be used internally.
|
||||
var zap_module = b.createModule(.{
|
||||
.source_file = .{ .path = "src/zap.zig" },
|
||||
});
|
||||
|
||||
// register the module so it can be referenced
|
||||
// using the package manager.
|
||||
// TODO: How to automatically integrate the
|
||||
// facil.io dependency with the module?
|
||||
try b.modules.put(b.dupe("zap"), zap_module);
|
||||
|
||||
inline for ([_]struct {
|
||||
name: []const u8,
|
||||
|
|
@ -47,174 +60,16 @@ pub fn build(b: *std.build.Builder) !void {
|
|||
.target = target,
|
||||
.optimize = optimize,
|
||||
});
|
||||
const zap_module = b.createModule(.{ .source_file = .{ .path = "src/zap.zig" } });
|
||||
|
||||
example.linkLibrary(facil_dep.artifact("facil.io"));
|
||||
|
||||
example.addModule("zap", zap_module);
|
||||
try addFacilio(example, "./");
|
||||
|
||||
const example_run = example.run();
|
||||
example_run_step.dependOn(&example_run.step);
|
||||
|
||||
// install the artifact - depending on the "example"
|
||||
// only after the ensure step
|
||||
// the step invoked via `zig build example` on the installed exe which
|
||||
// itself depends on the "ensure" step
|
||||
const example_build_step = b.addInstallArtifact(example);
|
||||
example.step.dependOn(ensure_step);
|
||||
example_step.dependOn(&example_build_step.step);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn ensureDeps(step: *std.build.Step) !void {
|
||||
_ = step;
|
||||
const allocator = std.heap.page_allocator;
|
||||
ensureGit(allocator);
|
||||
ensureGitHook(allocator);
|
||||
try ensureSubmodule(allocator, "src/deps/facilio");
|
||||
try ensurePatch(allocator, "src/deps/facilio", "../0001-microsecond-logging.patch");
|
||||
ensureMake(allocator);
|
||||
try makeFacilioLibdump(allocator);
|
||||
}
|
||||
|
||||
pub fn addFacilio(exe: *std.build.CompileStep, comptime p: [*]const u8) !void {
|
||||
exe.linkLibC();
|
||||
|
||||
// Generate flags
|
||||
var flags = std.ArrayList([]const u8).init(std.heap.page_allocator);
|
||||
if (exe.optimize != .Debug) try flags.append("-Os");
|
||||
try flags.append("-Wno-return-type-c-linkage");
|
||||
try flags.append("-fno-sanitize=undefined");
|
||||
try flags.append("-DFIO_OVERRIDE_MALLOC");
|
||||
try flags.append("-DFIO_HTTP_EXACT_LOGGING");
|
||||
exe.addIncludePath(p ++ "src/deps/facilio/libdump/all");
|
||||
|
||||
// Add C
|
||||
exe.addCSourceFiles(&.{
|
||||
p ++ "src/deps/facilio/libdump/all/http.c",
|
||||
p ++ "src/deps/facilio/libdump/all/fiobj_numbers.c",
|
||||
p ++ "src/deps/facilio/libdump/all/fio_siphash.c",
|
||||
p ++ "src/deps/facilio/libdump/all/fiobj_str.c",
|
||||
p ++ "src/deps/facilio/libdump/all/http1.c",
|
||||
p ++ "src/deps/facilio/libdump/all/fiobj_ary.c",
|
||||
p ++ "src/deps/facilio/libdump/all/fiobj_data.c",
|
||||
p ++ "src/deps/facilio/libdump/all/fiobj_hash.c",
|
||||
p ++ "src/deps/facilio/libdump/all/websockets.c",
|
||||
p ++ "src/deps/facilio/libdump/all/fiobj_json.c",
|
||||
p ++ "src/deps/facilio/libdump/all/fio.c",
|
||||
p ++ "src/deps/facilio/libdump/all/fiobject.c",
|
||||
p ++ "src/deps/facilio/libdump/all/http_internal.c",
|
||||
p ++ "src/deps/facilio/libdump/all/fiobj_mustache.c",
|
||||
}, flags.items);
|
||||
}
|
||||
|
||||
pub fn addZap(exe: *std.build.CompileStep, comptime p: [*]const u8) !void {
|
||||
try addFacilio(exe, p);
|
||||
var b = exe.builder;
|
||||
var ensure_step = b.step("zap-deps", "ensure zap's dependencies");
|
||||
ensure_step.makeFn = ensureDeps;
|
||||
exe.step.dependOn(ensure_step);
|
||||
}
|
||||
|
||||
fn sdkPath(comptime suffix: []const u8) []const u8 {
|
||||
if (suffix[0] != '/') @compileError("suffix must be an absolute path");
|
||||
return comptime blk: {
|
||||
const root_dir = std.fs.path.dirname(@src().file) orelse ".";
|
||||
break :blk root_dir ++ suffix;
|
||||
};
|
||||
}
|
||||
|
||||
fn ensureGit(allocator: std.mem.Allocator) void {
|
||||
const result = std.ChildProcess.exec(.{
|
||||
.allocator = allocator,
|
||||
.argv = &.{ "git", "--version" },
|
||||
}) catch { // e.g. FileNotFound
|
||||
std.log.err("error: 'git --version' failed. Is git not installed?", .{});
|
||||
std.process.exit(1);
|
||||
};
|
||||
defer {
|
||||
allocator.free(result.stderr);
|
||||
allocator.free(result.stdout);
|
||||
}
|
||||
if (result.term.Exited != 0) {
|
||||
std.log.err("error: 'git --version' failed. Is git not installed?", .{});
|
||||
std.process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn ensureGitHook(allocator: std.mem.Allocator) void {
|
||||
// only check if we ourselves are not part of a submodule
|
||||
var cwd = std.fs.cwd().openDir(sdkPath("/"), .{}) catch return;
|
||||
defer cwd.close();
|
||||
const dotgit = cwd.statFile(".git") catch return;
|
||||
if (dotgit.kind == .File) {
|
||||
// we are checked out as a submodule. No point in trying to install
|
||||
// a hook
|
||||
return;
|
||||
}
|
||||
|
||||
var child = std.ChildProcess.init(
|
||||
&.{ "cp", "precommit-hook.sh", ".git/hooks/pre-commit" },
|
||||
allocator,
|
||||
);
|
||||
child.cwd = sdkPath("/");
|
||||
child.stderr = std.io.getStdErr();
|
||||
child.stdout = std.io.getStdOut();
|
||||
_ = child.spawnAndWait() catch {
|
||||
std.log.err("Warning: unable to install git precommit-hook ", .{});
|
||||
return;
|
||||
};
|
||||
}
|
||||
|
||||
fn ensureSubmodule(allocator: std.mem.Allocator, path: []const u8) !void {
|
||||
if (std.process.getEnvVarOwned(allocator, "NO_ENSURE_SUBMODULES")) |no_ensure_submodules| {
|
||||
defer allocator.free(no_ensure_submodules);
|
||||
if (std.mem.eql(u8, no_ensure_submodules, "true")) return;
|
||||
} else |_| {}
|
||||
var child = std.ChildProcess.init(&.{ "git", "submodule", "update", "--init", path }, allocator);
|
||||
child.cwd = sdkPath("/");
|
||||
child.stderr = std.io.getStdErr();
|
||||
child.stdout = std.io.getStdOut();
|
||||
_ = try child.spawnAndWait();
|
||||
}
|
||||
|
||||
fn ensurePatch(allocator: std.mem.Allocator, path: []const u8, patch: []const u8) !void {
|
||||
if (std.process.getEnvVarOwned(allocator, "NO_ENSURE_SUBMODULES")) |no_ensure_submodules| {
|
||||
defer allocator.free(no_ensure_submodules);
|
||||
if (std.mem.eql(u8, no_ensure_submodules, "true")) return;
|
||||
} else |_| {}
|
||||
var child = std.ChildProcess.init(&.{ "git", "-C", path, "am", "-3", patch }, allocator);
|
||||
child.cwd = sdkPath("/");
|
||||
child.stderr = std.io.getStdErr();
|
||||
child.stdout = std.io.getStdOut();
|
||||
_ = try child.spawnAndWait();
|
||||
}
|
||||
|
||||
fn ensureMake(allocator: std.mem.Allocator) void {
|
||||
const result = std.ChildProcess.exec(.{
|
||||
.allocator = allocator,
|
||||
.argv = &.{ "make", "--version" },
|
||||
}) catch { // e.g. FileNotFound
|
||||
std.log.err("error: 'make --version' failed. Is make not installed?", .{});
|
||||
std.process.exit(1);
|
||||
};
|
||||
defer {
|
||||
allocator.free(result.stderr);
|
||||
allocator.free(result.stdout);
|
||||
}
|
||||
if (result.term.Exited != 0) {
|
||||
std.log.err("error: 'make --version' failed. Is make not installed?", .{});
|
||||
std.process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
fn makeFacilioLibdump(allocator: std.mem.Allocator) !void {
|
||||
var child = std.ChildProcess.init(&.{
|
||||
"make",
|
||||
"-C",
|
||||
"./src/deps/facilio",
|
||||
"libdump",
|
||||
}, allocator);
|
||||
child.cwd = sdkPath("/");
|
||||
child.stderr = std.io.getStdErr();
|
||||
child.stdout = std.io.getStdOut();
|
||||
_ = try child.spawnAndWait();
|
||||
}
|
||||
|
|
|
|||
11
build.zig.zon
Normal file
11
build.zig.zon
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
.{
|
||||
.name = "zap",
|
||||
.version = "0.0.1",
|
||||
|
||||
.dependencies = .{
|
||||
.@"facil.io" = .{
|
||||
.url = "https://github.com/renerocksai/facil.io/archive/2c04cd1949328dd62fe5d262b9cc930e54392ab8.tar.gz",
|
||||
.hash = "12209d3b552145f24431e5a2e6a4ad59ceaa9656f7fba8af7a8aa704a8784a79f55d",
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue