Skip to content

Commit

Permalink
Use upstream facil.io instead of in-source copy
Browse files Browse the repository at this point in the history
  • Loading branch information
sea-grass committed Nov 22, 2024
1 parent 17cd9ed commit 39c4936
Show file tree
Hide file tree
Showing 97 changed files with 71 additions and 51,071 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
zig-out/
zig-cache/
.zig-cache/
*.tar.gz
flake.lock.bak
tmp/
Expand Down
9 changes: 6 additions & 3 deletions build.zig
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
const std = @import("std");
const build_facilio = @import("facil.io/build.zig").build_facilio;

pub fn build(b: *std.Build) !void {
const target = b.standardTargetOptions(.{});
Expand All @@ -20,14 +19,18 @@ pub fn build(b: *std.Build) !void {
break :blk false;
};

const facilio = try build_facilio("facil.io", b, target, optimize, use_openssl);
const facilio = b.dependency("facil.io", .{
.target = target,
.optimize = optimize,
.use_openssl = use_openssl,
});

const zap_module = b.addModule("zap", .{
.root_source_file = b.path("src/zap.zig"),
.target = target,
.optimize = optimize,
});
zap_module.linkLibrary(facilio);
zap_module.linkLibrary(facilio.artifact("facil.io"));

const all_step = b.step("all", "build all examples");

Expand Down
5 changes: 5 additions & 0 deletions build.zig.zon
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
.{
.name = "zap",
.version = "0.8.0",
.dependencies = .{
.@"facil.io" = .{
.path = "./facil.io",
},
},
.paths = .{
"build.zig",
"build.zig.zon",
Expand Down
20 changes: 0 additions & 20 deletions facil.io/.clang_complete

This file was deleted.

17 changes: 0 additions & 17 deletions facil.io/.travis.yml

This file was deleted.

1,111 changes: 0 additions & 1,111 deletions facil.io/CHANGELOG.md

This file was deleted.

43 changes: 0 additions & 43 deletions facil.io/CMakeLists.txt

This file was deleted.

160 changes: 0 additions & 160 deletions facil.io/CONTRIBUTING.md

This file was deleted.

Loading

0 comments on commit 39c4936

Please sign in to comment.