mirrors/ly
1
0
Fork 0
mirror of https://github.com/fairyglade/ly.git synced 2026-09-22 03:50:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of codeberg.org:fairyglade/ly into zig-0.17

Browse Source 
Signed-off-by: AnErrupTion <anerruption@disroot.org>
This commit is contained in:
AnErrupTion
2026-08-25 23:13:21 +02:00
parent 3dcd883c10 d10df78886
commit f52baa7f79
25 changed files with 1248 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
build.zig
View File

@@ -28,7 +28,7 @@ comptime {
}
}
const ly_version = std.SemanticVersion{ .major = 1, .minor = 5, .patch = 0 };
const ly_version = std.SemanticVersion{ .major = 1, .minor = 6, .patch = 0 };
fn InstallStep(
b: *std.Build,
@@ -102,13 +102,6 @@ pub fn build(b: *std.Build) !void {
}),
});
const zlua = b.dependency("zlua", .{
.target = target,
.optimize = optimize,
.lang = .luajit,
});
exe.root_module.addImport("zlua", zlua.module("zlua"));
const ly_ui = b.dependency("ly_ui", .{
.target = target,
.optimize = optimize,
@@ -214,6 +207,20 @@ fn getVersionStr(b: *std.Build, name: []const u8, version: std.SemanticVersion)
}
return version_str;
},
1 => {
// Release candidate build (e.g. v1.5.0-rc1)
var it = std.mem.splitScalar(u8, git_describe, '-');
const tagged_ancestor = std.mem.trimStart(u8, it.first(), "v");
const ancestor_ver = try std.SemanticVersion.parse(tagged_ancestor);
if (version.order(ancestor_ver) != .gt) {
std.debug.print("{s} version '{f}' must be greater than tagged ancestor '{f}'\n", .{ name, version, ancestor_ver });
std.process.exit(1);
}
// The version is reformatted in accordance with the https://semver.org specification.
return version_str;
},
2 => {
// Untagged development build (e.g. 0.10.0-dev.2025+ecf0050a9).
var it = std.mem.splitScalar(u8, git_describe, '-');
@@ -236,6 +243,29 @@ fn getVersionStr(b: *std.Build, name: []const u8, version: std.SemanticVersion)
// The version is reformatted in accordance with the https://semver.org specification.
return b.fmt("{s}-dev.{s}+{s}", .{ version_str, commit_height, commit_id[1..] });
},
3 => {
// Untagged development build (e.g. 0.10.0-dev.2025+ecf0050a9).
var it = std.mem.splitScalar(u8, git_describe, '-');
const tagged_ancestor = std.mem.trimStart(u8, it.first(), "v");
_ = it.next().?;
const commit_height = it.next().?;
const commit_id = it.next().?;
const ancestor_ver = try std.SemanticVersion.parse(tagged_ancestor);
if (version.order(ancestor_ver) != .gt) {
std.debug.print("{s} version '{f}' must be greater than tagged ancestor '{f}'\n", .{ name, version, ancestor_ver });
std.process.exit(1);
}
// Check that the commit hash is prefixed with a 'g' (a Git convention).
if (commit_id.len < 1 or commit_id[0] != 'g') {
std.debug.print("Unexpected `git describe` output: {s}\n", .{git_describe});
return version_str;
}
// The version is reformatted in accordance with the https://semver.org specification.
return b.fmt("{s}-dev.{s}+{s}", .{ version_str, commit_height, commit_id[1..] });
},
else => {
std.debug.print("Unexpected `git describe` output: {s}\n", .{git_describe});
return version_str;