From 5814f8db5693423064793781adb533916027cdef Mon Sep 17 00:00:00 2001 From: Techatrix Date: Sat, 3 May 2025 21:33:50 +0200 Subject: [PATCH 1/2] don't install header files into subdirectory to match upstream --- build.zig | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build.zig b/build.zig index f9ae666..334f4a7 100644 --- a/build.zig +++ b/build.zig @@ -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", ""); @@ -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") }); @@ -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) }); From 884f471e9119b08e2883d463c3fac8968956de21 Mon Sep 17 00:00:00 2001 From: Techatrix Date: Sat, 3 May 2025 21:35:10 +0200 Subject: [PATCH 2/2] CI: run zig build run-all-tests --- .github/workflows/ci.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9956ce0..75311e3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -36,3 +36,6 @@ jobs: - name: Build run: zig build --summary all + + - name: Test + run: zig build run-all-tests --summary all