| author |  Andrew Kelley <andrew@ziglang.org> 2020-12-31 16:41:54-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2020-12-31 16:41:54-07:00 |
| log | 69da6ba14d2d1f19e2ab16ded47f8aa22658471e |
| tree | e534e9d9cd33c3bebb2af201836e56536e149ac0 |
| parent | fbf269cc47a0a0bc0b60676ad97d4c57fda645c6 |
| parent | d96d8639e592b4bb4b2e330c4bd7412256b297d2 |
Merge branch 'revert-semver'
Updating the download page is stuck because in all cases
`zig version` is outputting 0.8.0 rather than e.g.
0.8.0-dev.716+fbf269cc4.
See #64663 files changed, 30 insertions(+), 62 deletions(-)
CMakeLists.txt+8-21
| ... | @@ -25,8 +25,8 @@ project(zig C CXX) | ... | @@ -25,8 +25,8 @@ project(zig C CXX) |
| 25 | set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) | 25 | set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) |
| 26 | 26 | ||
| 27 | set(ZIG_VERSION_MAJOR 0) | 27 | set(ZIG_VERSION_MAJOR 0) |
| 28 | set(ZIG_VERSION_MINOR 8) | 28 | set(ZIG_VERSION_MINOR 7) |
| 29 | set(ZIG_VERSION_PATCH 0) | 29 | set(ZIG_VERSION_PATCH 1) |
| 30 | set(ZIG_VERSION "" CACHE STRING "Override Zig version string. Default is to find out with git.") | 30 | set(ZIG_VERSION "" CACHE STRING "Override Zig version string. Default is to find out with git.") |
| 31 | 31 | ||
| 32 | if("${ZIG_VERSION}" STREQUAL "") | 32 | if("${ZIG_VERSION}" STREQUAL "") |
| ... | @@ -34,31 +34,18 @@ if("${ZIG_VERSION}" STREQUAL "") | ... | @@ -34,31 +34,18 @@ if("${ZIG_VERSION}" STREQUAL "") |
| 34 | find_program(GIT_EXE NAMES git) | 34 | find_program(GIT_EXE NAMES git) |
| 35 | if(GIT_EXE) | 35 | if(GIT_EXE) |
| 36 | execute_process( | 36 | execute_process( |
| 37 | COMMAND ${GIT_EXE} -C ${CMAKE_SOURCE_DIR} describe --match *.*.* --tags | 37 | COMMAND ${GIT_EXE} -C ${CMAKE_SOURCE_DIR} name-rev HEAD --tags --name-only --no-undefined --always |
| 38 | RESULT_VARIABLE EXIT_STATUS | 38 | RESULT_VARIABLE EXIT_STATUS |
| 39 | OUTPUT_VARIABLE GIT_DESCRIBE | 39 | OUTPUT_VARIABLE ZIG_GIT_REV |
| 40 | OUTPUT_STRIP_TRAILING_WHITESPACE | 40 | OUTPUT_STRIP_TRAILING_WHITESPACE |
| 41 | ERROR_QUIET) | 41 | ERROR_QUIET) |
| 42 | if(EXIT_STATUS EQUAL "0") | 42 | if(EXIT_STATUS EQUAL "0") |
| 43 | if(GIT_DESCRIBE MATCHES "^v?([0-9]+\\.[0-9]+\\.[0-9]+)$") | 43 | if(ZIG_GIT_REV MATCHES "\\^0$") |
| 44 | # Tagged release version. | 44 | if(NOT("${ZIG_GIT_REV}" STREQUAL "${ZIG_VERSION}^0")) |
| 45 | set(GIT_TAG ${CMAKE_MATCH_1}) | 45 | message("WARNING: Tag does not match configured Zig version") |
| 46 | if(NOT GIT_TAG VERSION_EQUAL ZIG_VERSION) | ||
| 47 | message(SEND_ERROR "Zig version (${ZIG_VERSION}) does not match Git tag (${GIT_TAG}).") | ||
| 48 | endif() | 46 | endif() |
| 49 | elseif(GIT_DESCRIBE MATCHES "^v?([0-9]+\\.[0-9]+\\.[0-9]+)-([0-9]+)-g(.+)$") | ||
| 50 | # Untagged pre-release. The Zig version is updated to include the number of commits | ||
| 51 | # since the last tagged version and the commit hash. The version is formatted in | ||
| 52 | # accordance with the https://semver.org specification. | ||
| 53 | set(GIT_TAG ${CMAKE_MATCH_1}) | ||
| 54 | set(GIT_COMMITS_AFTER_TAG ${CMAKE_MATCH_2}) | ||
| 55 | set(GIT_COMMIT ${CMAKE_MATCH_3}) | ||
| 56 | if(NOT ZIG_VERSION VERSION_GREATER GIT_TAG) | ||
| 57 | message(SEND_ERROR "Zig version (${ZIG_VERSION}) must be greater than tagged ancestor (${GIT_TAG}).") | ||
| 58 | endif() | ||
| 59 | set(ZIG_VERSION "${ZIG_VERSION}-dev.${GIT_COMMITS_AFTER_TAG}+${GIT_COMMIT}") | ||
| 60 | else() | 47 | else() |
| 61 | message(WARNING "Failed to parse version from output of `git describe`.") | 48 | set(ZIG_VERSION "${ZIG_VERSION}+${ZIG_GIT_REV}") |
| 62 | endif() | 49 | endif() |
| 63 | endif() | 50 | endif() |
| 64 | endif() | 51 | endif() |
build.zig+16-40
| ... | @@ -11,7 +11,7 @@ const fs = std.fs; | ... | @@ -11,7 +11,7 @@ const fs = std.fs; |
| 11 | const InstallDirectoryOptions = std.build.InstallDirectoryOptions; | 11 | const InstallDirectoryOptions = std.build.InstallDirectoryOptions; |
| 12 | const assert = std.debug.assert; | 12 | const assert = std.debug.assert; |
| 13 | 13 | ||
| 14 | const zig_version = std.builtin.Version{ .major = 0, .minor = 8, .patch = 0 }; | 14 | const zig_version = std.builtin.Version{ .major = 0, .minor = 7, .patch = 1 }; |
| 15 | 15 | ||
| 16 | pub fn build(b: *Builder) !void { | 16 | pub fn build(b: *Builder) !void { |
| 17 | b.setPreferredReleaseMode(.ReleaseFast); | 17 | b.setPreferredReleaseMode(.ReleaseFast); |
| ... | @@ -227,48 +227,24 @@ pub fn build(b: *Builder) !void { | ... | @@ -227,48 +227,24 @@ pub fn build(b: *Builder) !void { |
| 227 | const version_string = b.fmt("{}.{}.{}", .{ zig_version.major, zig_version.minor, zig_version.patch }); | 227 | const version_string = b.fmt("{}.{}.{}", .{ zig_version.major, zig_version.minor, zig_version.patch }); |
| 228 | 228 | ||
| 229 | var code: u8 = undefined; | 229 | var code: u8 = undefined; |
| 230 | const git_describe_untrimmed = b.execAllowFail(&[_][]const u8{ | 230 | const git_sha_untrimmed = b.execAllowFail(&[_][]const u8{ |
| 231 | "git", "-C", b.build_root, "describe", "--match", "*.*.*", "--tags", | 231 | "git", "-C", b.build_root, "name-rev", "HEAD", |
| 232 | "--tags", "--name-only", "--no-undefined", "--always", | ||
| 232 | }, &code, .Ignore) catch { | 233 | }, &code, .Ignore) catch { |
| 233 | break :v version_string; | 234 | break :v version_string; |
| 234 | }; | 235 | }; |
| 235 | const git_describe = mem.trim(u8, git_describe_untrimmed, " \n\r"); | 236 | const git_sha_trimmed = mem.trim(u8, git_sha_untrimmed, " \n\r"); |
| 236 | 237 | ||
| 237 | switch (mem.count(u8, git_describe, "-")) { | 238 | // This will look like e.g. "0.7.0^0" for a tag commit. |
| 238 | 0 => { | 239 | if (mem.endsWith(u8, git_sha_trimmed, "^0")) { |
| 239 | // Tagged release version (e.g. 0.7.0). | 240 | const git_ver_string = git_sha_trimmed[0 .. git_sha_trimmed.len - 2]; |
| 240 | if (!mem.eql(u8, git_describe, version_string)) { | 241 | if (!mem.eql(u8, git_ver_string, version_string)) { |
| 241 | std.debug.print("Zig version '{}' does not match Git tag '{}'\n", .{ version_string, git_describe }); | 242 | std.debug.print("Expected git tag '{}', found '{}'\n", .{ version_string, git_ver_string }); |
| 242 | std.process.exit(1); | 243 | std.process.exit(1); |
| 243 | } | 244 | } |
| 244 | break :v version_string; | 245 | break :v b.fmt("{}", .{version_string}); |
| 245 | }, | 246 | } else { |
| 246 | 2 => { | 247 | break :v b.fmt("{}+{}", .{ version_string, git_sha_trimmed }); |
| 247 | // Untagged development build (e.g. 0.7.0-684-gbbe2cca1a). | ||
| 248 | var it = mem.split(git_describe, "-"); | ||
| 249 | const tagged_ancestor = it.next() orelse unreachable; | ||
| 250 | const commit_height = it.next() orelse unreachable; | ||
| 251 | const commit_id = it.next() orelse unreachable; | ||
| 252 | |||
| 253 | const ancestor_ver = try std.builtin.Version.parse(tagged_ancestor); | ||
| 254 | if (zig_version.order(ancestor_ver) != .gt) { | ||
| 255 | std.debug.print("Zig version '{}' must be greater than tagged ancestor '{}'\n", .{ zig_version, ancestor_ver }); | ||
| 256 | std.process.exit(1); | ||
| 257 | } | ||
| 258 | |||
| 259 | // Check that the commit hash is prefixed with a 'g' (a Git convention). | ||
| 260 | if (commit_id.len < 1 or commit_id[0] != 'g') { | ||
| 261 | std.debug.print("Unexpected `git describe` output: {}\n", .{git_describe}); | ||
| 262 | break :v version_string; | ||
| 263 | } | ||
| 264 | |||
| 265 | // The version is reformatted in accordance with the https://semver.org specification. | ||
| 266 | break :v b.fmt("{}-dev.{}+{}", .{ version_string, commit_height, commit_id[1..] }); | ||
| 267 | }, | ||
| 268 | else => { | ||
| 269 | std.debug.print("Unexpected `git describe` output: {}\n", .{git_describe}); | ||
| 270 | break :v version_string; | ||
| 271 | }, | ||
| 272 | } | 248 | } |
| 273 | }; | 249 | }; |
| 274 | exe.addBuildOption([:0]const u8, "version", try b.allocator.dupeZ(u8, version)); | 250 | exe.addBuildOption([:0]const u8, "version", try b.allocator.dupeZ(u8, version)); |
src/config.zig.in+6-1
| ... | @@ -1,6 +1,11 @@ | ... | @@ -1,6 +1,11 @@ |
| 1 | pub const have_llvm = true; | 1 | pub const have_llvm = true; |
| 2 | pub const version: [:0]const u8 = "@ZIG_VERSION@"; | 2 | pub const version: [:0]const u8 = "@ZIG_VERSION@"; |
| 3 | pub const semver = try @import("std").SemanticVersion.parse(version); | 3 | pub const semver: @import("std").SemanticVersion = .{ |
| 4 | .major = @ZIG_VERSION_MAJOR@, | ||
| 5 | .minor = @ZIG_VERSION_MINOR@, | ||
| 6 | .patch = @ZIG_VERSION_PATCH@, | ||
| 7 | .build = "@ZIG_GIT_REV@", | ||
| 8 | }; | ||
| 4 | pub const log_scopes: []const []const u8 = &[_][]const u8{}; | 9 | pub const log_scopes: []const []const u8 = &[_][]const u8{}; |
| 5 | pub const zir_dumps: []const []const u8 = &[_][]const u8{}; | 10 | pub const zir_dumps: []const []const u8 = &[_][]const u8{}; |
| 6 | pub const enable_tracy = false; | 11 | pub const enable_tracy = false; |