chore: import upstream snapshot with attribution
container project - merge build / Invoke build (push) Successful in 1s
container project - merge build / Invoke build (push) Successful in 1s
This commit is contained in:
@@ -0,0 +1,46 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
// Copyright © 2025-2026 Apple Inc. and the container project authors.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// https://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
import Darwin
|
||||
import Foundation
|
||||
import SystemPackage
|
||||
|
||||
extension Bundle {
|
||||
/// Retrieves the application bundle for a path that refers to a macOS executable.
|
||||
///
|
||||
/// Resolves symlinks in `executablePath`, then walks up the standard macOS bundle layout
|
||||
/// (`MacOS/` → `Contents/` → `Foo.app/`) and verifies the `.app` extension.
|
||||
///
|
||||
/// - Parameter executablePath: The path to a macOS executable inside a bundle.
|
||||
/// - Returns: The ``Bundle`` at the resolved `.app` directory, or `nil` if the executable
|
||||
/// is not inside a valid macOS application bundle.
|
||||
public static func appBundle(executablePath: FilePath) -> Bundle? {
|
||||
let resolvedPath =
|
||||
executablePath.withPlatformString { cPath in
|
||||
Darwin.realpath(cPath, nil).map { ptr -> FilePath in
|
||||
defer { free(ptr) }
|
||||
return FilePath(platformString: ptr)
|
||||
}
|
||||
} ?? executablePath
|
||||
let bundlePath =
|
||||
resolvedPath
|
||||
.removingLastComponent() // MacOS/
|
||||
.removingLastComponent() // Contents/
|
||||
.removingLastComponent() // Foo.app/
|
||||
guard bundlePath.lastComponent?.extension == "app" else { return nil }
|
||||
return Bundle(url: URL(fileURLWithPath: bundlePath.string))
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
// Copyright © 2025-2026 Apple Inc. and the container project authors.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// https://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
import Foundation
|
||||
import SystemPackage
|
||||
|
||||
extension CommandLine {
|
||||
/// The path of the running executable.
|
||||
///
|
||||
/// Obtained via `_NSGetExecutablePath`, which returns an absolute, lexically normalized path
|
||||
/// (no `.` or `..` components). Symlinks are not resolved, so the path is not canonical.
|
||||
public static var executablePath: FilePath {
|
||||
/// _NSGetExecutablePath with a zero-length buffer returns the needed buffer length
|
||||
var bufferSize: Int32 = 0
|
||||
var buffer = [CChar](repeating: 0, count: Int(bufferSize))
|
||||
_ = _NSGetExecutablePath(&buffer, &bufferSize)
|
||||
|
||||
/// Create the buffer and get the path
|
||||
buffer = [CChar](repeating: 0, count: Int(bufferSize))
|
||||
guard _NSGetExecutablePath(&buffer, &bufferSize) == 0 else {
|
||||
fatalError("unexpected: failed to get executable path")
|
||||
}
|
||||
|
||||
/// Return the path with the executable file component removed the last component and
|
||||
let executablePath = String(cString: &buffer)
|
||||
return FilePath(executablePath)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
// Copyright © 2025-2026 Apple Inc. and the container project authors.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// https://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
import CVersion
|
||||
import Foundation
|
||||
|
||||
public struct ReleaseVersion {
|
||||
public static func singleLine(appName: String) -> String {
|
||||
var versionDetails: [String: String] = ["build": buildType()]
|
||||
versionDetails["commit"] = gitCommit().map { String($0.prefix(7)) } ?? "unspecified"
|
||||
let extras: String = versionDetails.map { "\($0): \($1)" }.sorted().joined(separator: ", ")
|
||||
|
||||
return "\(appName) version \(version()) (\(extras))"
|
||||
}
|
||||
|
||||
public static func buildType() -> String {
|
||||
#if DEBUG
|
||||
return "debug"
|
||||
#else
|
||||
return "release"
|
||||
#endif
|
||||
}
|
||||
|
||||
public static func version() -> String {
|
||||
let appBundle = Bundle.appBundle(executablePath: CommandLine.executablePath)
|
||||
let bundleVersion = appBundle?.infoDictionary?["CFBundleShortVersionString"] as? String
|
||||
return bundleVersion ?? get_release_version().map { String(cString: $0) } ?? "0.0.0"
|
||||
}
|
||||
|
||||
public static func gitCommit() -> String? {
|
||||
get_git_commit().map { String(cString: $0) }
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user