From 5c07dcd22a6730401347fcff887dc9eaf1a5cbc7 Mon Sep 17 00:00:00 2001 From: Jae B Date: Wed, 4 Feb 2026 15:13:51 +1100 Subject: [PATCH] update various make steps to use getPath4 --- src/androidbuild/DirectoryFileInput.zig | 5 ++++- src/androidbuild/builtin_options_update.zig | 5 ++++- src/androidbuild/d8glob.zig | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/androidbuild/DirectoryFileInput.zig b/src/androidbuild/DirectoryFileInput.zig index d9ee847..9715575 100644 --- a/src/androidbuild/DirectoryFileInput.zig +++ b/src/androidbuild/DirectoryFileInput.zig @@ -44,7 +44,10 @@ fn make(step: *Step, _: Build.Step.MakeOptions) !void { const self: *DirectoryFileInput = @fieldParentPtr("step", step); const run = self.run; - const dir_path = self.dir.getPath3(b, step); + const dir_path = if (builtin.zig_version.major == 0 and builtin.zig_version.minor <= 15) + self.dir.getPath3(b, step) + else + try self.dir.getPath4(b, step); // NOTE(jae): 2025-07-23 // As of Zig 0.15.0-dev.1092+d772c0627, package_name_path.openDir("") is not possible as it assumes you're appending a sub-path diff --git a/src/androidbuild/builtin_options_update.zig b/src/androidbuild/builtin_options_update.zig index 7d1b54b..d54fea5 100644 --- a/src/androidbuild/builtin_options_update.zig +++ b/src/androidbuild/builtin_options_update.zig @@ -41,7 +41,10 @@ fn make(step: *Step, _: Build.Step.MakeOptions) !void { const builtin_options_update: *BuiltinOptionsUpdate = @fieldParentPtr("step", step); const options = builtin_options_update.options; - const package_name_path = builtin_options_update.package_name_stdout.getPath3(b, step); + const package_name_path = if (builtin.zig_version.major == 0 and builtin.zig_version.minor <= 15) + builtin_options_update.package_name_stdout.getPath3(b, step) + else + try builtin_options_update.package_name_stdout.getPath4(b, step); // Read package name from stdout and strip line feed / carriage return // ie. "com.zig.sdl2\n\r" diff --git a/src/androidbuild/d8glob.zig b/src/androidbuild/d8glob.zig index 20015a6..ed04767 100644 --- a/src/androidbuild/d8glob.zig +++ b/src/androidbuild/d8glob.zig @@ -48,7 +48,10 @@ fn make(step: *Step, _: Build.Step.MakeOptions) !void { const glob: *@This() = @fieldParentPtr("step", step); const d8 = glob.run; - const search_dir = glob.dir.getPath3(b, step); + const search_dir = if (builtin.zig_version.major == 0 and builtin.zig_version.minor <= 15) + glob.dir.getPath3(b, step) + else + try glob.dir.getPath4(b, step); // NOTE(jae): 2024-09-22 // Change current working directory to where the Java classes are