move buildrunner source into subdirectory

Author: dasimmet

build.zig

@@ -1,6 +1,6 @@
 const std = @import("std");
 // const zon = @import("build.zig.zon");
-const Serialize = @import("src/BuildSerialize.zig");
+const Serialize = @import("src/buildrunner/BuildSerialize.zig");
 
 pub fn build(b: *std.Build) void {
     const update_bsb = b.addUpdateSourceFiles();

src/BuildRunnerTmp.zig

@@ -1,15 +1,17 @@
 const std = @import("std");
 pub const TempFile = @import("TempFile.zig");
 pub const EmbedRunnerSources = struct {
-    pub const @"BuildSerialize.zig" = @embedFile("BuildSerialize.zig");
-    pub const @"Manifest.zig" = @embedFile("Manifest.zig");
-    pub const @"runner-dot.zig" = @embedFile("runner-dot.zig");
-    pub const @"runner-zig-master.zig" = @embedFile("runner-zig-master.zig");
-    pub const @"runner-zig-0.15.X.zig" = @embedFile("runner-zig-0.15.X.zig");
-    pub const @"runner-zig.zig" = @embedFile("runner-zig.zig");
-    pub const @"runner-zon.zig" = @embedFile("runner-zon.zig");
-    pub const @"zonparse-master.zig" = @embedFile("zonparse-master.zig");
-    pub const @"zonparse.zig" = @embedFile("zonparse.zig");
+    pub const @"BuildSerialize.zig" = @embedFile("buildrunner/BuildSerialize.zig");
+    pub const @"Manifest.zig" = @embedFile("buildrunner/Manifest.zig");
+    pub const @"runner-dot.zig" = @embedFile("buildrunner/runner-dot.zig");
+    pub const @"runner-zig-0.14.X.zig" = @embedFile("buildrunner/runner-zig-0.14.X.zig");
+    pub const @"runner-zig-0.15.X.zig" = @embedFile("buildrunner/runner-zig-0.15.X.zig");
+    pub const @"runner-zig-master.zig" = @embedFile("buildrunner/runner-zig-master.zig");
+    pub const @"runner-zig.zig" = @embedFile("buildrunner/runner-zig.zig");
+    pub const @"runner-zon.zig" = @embedFile("buildrunner/runner-zon.zig");
+    pub const @"zonparse-0.14.X.zig" = @embedFile("buildrunner/zonparse-0.14.X.zig");
+    pub const @"zonparse-master.zig" = @embedFile("buildrunner/zonparse-master.zig");
+    pub const @"zonparse.zig" = @embedFile("buildrunner/zonparse.zig");
 };
 pub const Embedded = BuildRunnerTmp(EmbedRunnerSources);
 

src/BuildSerialize.zig src/buildrunner/BuildSerialize.zigsrc/BuildSerialize.zig renamed to src/buildrunner/BuildSerialize.zig

@@ -321,12 +321,21 @@ pub const TypeId = enum {
     lazy_path_list,
 };
 
+const zig_15_or_later = builtin.zig_version.order(std.SemanticVersion.parse("0.14.99") catch unreachable) == .gt;
+pub const align_one = if (zig_15_or_later)
+    std.mem.Alignment.@"1"
+else
+    1;
+
 pub fn minimumZigVersion(b: *Build) !?[]const u8 {
     const zon_path = try std.fs.path.join(b.allocator, &.{ b.build_root.path.?, "build.zig.zon" });
-    const zon_file = Manifest.cwdReadFileAllocZ(
-        zon_path,
+    const zon_file = std.fs.cwd().readFileAllocOptions(
         b.allocator,
+        zon_path,
         std.math.maxInt(u32),
+        null,
+        align_one,
+        0,
     ) catch |err| switch (err) {
         error.FileNotFound => return null,
         else => return err,

src/Manifest.zig src/buildrunner/Manifest.zigsrc/Manifest.zig renamed to src/buildrunner/Manifest.zig

@@ -23,7 +23,7 @@ pub fn fromSliceAlloc(
     source: [:0]const u8,
     zonStatus: ?*ZonDiag,
 ) !Manifest {
-    return zonparse.fromSliceAlloc(
+    return @import("zonparse.zig").fromSliceAlloc(
         Manifest,
         allocator,
         source,

src/runner-dot.zig src/buildrunner/runner-dot.zigsrc/runner-dot.zig renamed to src/buildrunner/runner-dot.zig

@@ -1,6 +1,14 @@
 const std = @import("std");
 const builtin = @import("builtin");
 
+// changes to readFileAllocOptions after this
+const later_than_zig_14 = std.mem.containsAtLeastScalar(std.math.Order, &.{
+    .gt,
+    .eq,
+}, 1, builtin.zig_version.order(
+    std.SemanticVersion.parse("0.15.0") catch unreachable,
+));
+
 // changes to readFileAllocOptions after this
 const later_than_zig_15 = std.mem.containsAtLeastScalar(std.math.Order, &.{
     .gt,
@@ -10,7 +18,8 @@ const later_than_zig_15 = std.mem.containsAtLeastScalar(std.math.Order, &.{
 ));
 
 pub const runner = if (later_than_zig_15)
-    // 0.16.0-dev.1354+94e98bfe8
     @import("runner-zig-master.zig")
+else if (later_than_zig_14)
+    @import("runner-zig-0.15.X.zig")
 else
-    @import("runner-zig-0.15.X.zig");
+    @import("runner-zig-0.14.X.zig");