Skip to content

don't install header files into subdirectory to match upstream #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Techatrix merged 2 commits into from
May 4, 2025
Merged

don't install header files into subdirectory to match upstream #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5814f8d
don't install header files into subdirectory to match upstream
Techatrix May 3, 2025
884f471
CI: run zig build run-all-tests
Techatrix May 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ jobs:

- name: Build
run: zig build --summary all

- name: Test
run: zig build run-all-tests --summary all
7 changes: 5 additions & 2 deletions build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ pub fn build(b: *std.Build) void {
});
b.installArtifact(capstone);
capstone.addIncludePath(upstream.path("include"));
capstone.installHeadersDirectory(upstream.path("include/capstone"), "capstone", .{});
capstone.installHeader(upstream.path("include/platform.h"), "capstone/platform.h");
// The header files should be installed in a 'capstone' subdirectory in capstone v6.
capstone.installHeadersDirectory(upstream.path("include/capstone"), "", .{});
capstone.installHeader(upstream.path("include/platform.h"), "platform.h");
capstone.addCSourceFiles(.{ .root = upstream.path(""), .files = common_sources });

if (build_diet) capstone.root_module.addCMacro("CAPSTONE_DIET", "");
Expand Down Expand Up @@ -81,6 +82,7 @@ pub fn build(b: *std.Build) void {
.strip = strip,
.link_libc = true,
});
cstool.addIncludePath(upstream.path("include")); // remove this in capstone v6
cstool.linkLibrary(capstone);
cstool.addCSourceFiles(.{ .root = upstream.path("cstool"), .files = cstool_sources });
cstool.addCSourceFile(.{ .file = upstream.path("cstool/getopt.c") });
Expand Down Expand Up @@ -116,6 +118,7 @@ pub fn build(b: *std.Build) void {
.strip = strip,
.link_libc = true,
});
exe.addIncludePath(upstream.path("include")); // remove this in capstone v6
exe.linkLibrary(capstone);
exe.addCSourceFile(.{ .file = upstream.path("tests").path(b, file) });

Expand Down
Loading