more fixups

- clarify comments
- `NativeTargetInfo.detect()` propagate macOS errors
- `macos.detect()` drop `std.log` usage
This commit is contained in:
Michael Dusan
2021-01-11 20:54:31 -05:00
parent f2be1fb23e
commit 4c3de99253
2 changed files with 6 additions and 10 deletions

View File

@@ -222,6 +222,7 @@ pub const NativeTargetInfo = struct {
ProcessFdQuotaExceeded,
SystemFdQuotaExceeded,
DeviceBusy,
OSVersionDetectionFail,
};
/// Given a `CrossTarget`, which specifies in detail which parts of the target should be detected
@@ -254,7 +255,7 @@ pub const NativeTargetInfo = struct {
os.version_range.windows.min = detected_version;
os.version_range.windows.max = detected_version;
},
.macos => macos.detect(&os) catch {}, // valid to ignore any error and keep os defaults
.macos => try macos.detect(&os),
.freebsd => {
var osreldate: u32 = undefined;
var len: usize = undefined;

View File

@@ -9,7 +9,7 @@ const mem = std.mem;
const testing = std.testing;
/// Detect macOS version.
/// On error `os` will not be modified.
/// `os` is not modified in case of error.
pub fn detect(os: *std.Target.Os) !void {
// Drop use of osproductversion sysctl because:
// 1. only available 10.13.4 High Sierra and later
@@ -22,9 +22,8 @@ pub fn detect(os: *std.Target.Os) !void {
// NOTE: Historically `SystemVersion.plist` first appeared circa '2003
// with the release of Mac OS X 10.3.0 Panther.
//
// and if it contains a `10.16` value where the `16` is `>= 16` then it is a red herring
// and is discarded, and move on to next step. Otherwise we accept this is the
// canonical file for versioning.
// and if it contains a `10.16` value where the `16` is `>= 16` then it is non-canonical,
// discarded, and we move on to next step. Otherwise we accept the version.
//
// BACKGROUND: `10.(16+)` is not a proper version and does not have enough fidelity to
// indicate minor/point version of Big Sur and later. It is a context-sensitive result
@@ -49,8 +48,6 @@ pub fn detect(os: *std.Target.Os) !void {
// such that I am comfortable with implementing a minimalistic parser.
// Things like string and general escapes are not supported.
const prefixSlash = "/System/Library/CoreServices/";
const format_failure = "macOS detect: failed to {s} '{s}': {}";
const paths = [_][]const u8{
prefixSlash ++ "SystemVersion.plist",
prefixSlash ++ ".SystemVersionPlatform.plist",
@@ -61,7 +58,7 @@ pub fn detect(os: *std.Target.Os) !void {
if (std.fs.cwd().readFile(path, &buf)) |bytes| {
if (parseSystemVersion(bytes)) |ver| {
// never return red herring
// never return non-canonical `10.(16+)`
if (!(ver.major == 10 and ver.minor >= 16)) {
os.version_range.semver.min = ver;
os.version_range.semver.max = ver;
@@ -69,11 +66,9 @@ pub fn detect(os: *std.Target.Os) !void {
}
continue;
} else |err| {
std.log.err(format_failure, .{ "parse", path, err });
return error.OSVersionDetectionFail;
}
} else |err| {
std.log.err(format_failure, .{ "read", path, err });
return error.OSVersionDetectionFail;
}
}