Sync VCC Plus 3.7.1 build 67 source
Refresh reviewed MCP output export, four-drive owned playtests, bounded BASIC readiness, and pinned CMOC 0.1.101 source/patches. Preserve independent source-edition identity, empty libraries, notices and privacy boundaries. Validated 74 export/privacy checks, pinned dependency sources, and an independent unsigned universal Release build. A subsequent documentation-only correction removes an excluded qualification link; all build inputs remain identical.
This commit is contained in:
1 parent
4abc194001
commit
5534005799
54 files changed
+2950
-435
No files matched your search
@@ -3,6 +3,17 @@ import XCTest
|
||||
import AppKit
|
||||
import SwiftUI
|
||||
|
||||
/// Explicit test-only input keeps compiler qualification away from normal app staging.
|
||||
/// Xcode forwards TEST_RUNNER_VCC_TEST_TOOLCHAIN_DIR to this environment variable.
|
||||
func vccQualificationToolchain(_ fallback: URL) -> URL {
|
||||
guard let path = ProcessInfo.processInfo.environment["VCC_TEST_TOOLCHAIN_DIR"] else { return fallback }
|
||||
XCTAssertTrue(path.hasPrefix("/"), "Compiler qualification requires an absolute runtime path")
|
||||
let candidate = URL(fileURLWithPath: path, isDirectory: true)
|
||||
XCTAssertTrue(FileManager.default.isExecutableFile(atPath: candidate.appendingPathComponent("bin/cmoc").path),
|
||||
"Explicit compiler qualification input is unavailable; do not silently use another runtime")
|
||||
return candidate
|
||||
}
|
||||
|
||||
final class CMOCBuildServiceTests: XCTestCase {
|
||||
private var folder: URL!
|
||||
override func setUpWithError() throws {
|
||||
@@ -146,8 +157,8 @@ final class CMOCBuildServiceTests: XCTestCase {
|
||||
}
|
||||
|
||||
func testAssistantBuildsOrdinarySourcesWithOnlyItsOwnRecipe() async throws {
|
||||
let runtime = URL(fileURLWithPath: #filePath).deletingLastPathComponent().deletingLastPathComponent()
|
||||
.appendingPathComponent("LocalResources/ToolchainBundle")
|
||||
let runtime = vccQualificationToolchain(URL(fileURLWithPath: #filePath).deletingLastPathComponent().deletingLastPathComponent()
|
||||
.appendingPathComponent("LocalResources/ToolchainBundle"))
|
||||
guard FileManager.default.isExecutableFile(atPath: runtime.appendingPathComponent("bin/cmoc").path) else {
|
||||
throw XCTSkip("Stage the bundled CMOC tools")
|
||||
}
|
||||
@@ -609,7 +620,7 @@ final class CMOCBuildServiceTests: XCTestCase {
|
||||
}
|
||||
|
||||
func testRealBundledToolsExposeCompilerAssemblerLinkerAndMakeFailures() async throws {
|
||||
let runtime = URL(fileURLWithPath: #filePath).deletingLastPathComponent().deletingLastPathComponent().appendingPathComponent("LocalResources/ToolchainBundle")
|
||||
let runtime = vccQualificationToolchain(URL(fileURLWithPath: #filePath).deletingLastPathComponent().deletingLastPathComponent().appendingPathComponent("LocalResources/ToolchainBundle"))
|
||||
try XCTSkipUnless(CMOCBuildService.requiredExecutables.allSatisfy {
|
||||
FileManager.default.isExecutableFile(atPath: runtime.appendingPathComponent("bin/" + $0).path)
|
||||
}, "Stage the bundled CMOC/LWTools/Make runtime")
|
||||
@@ -1205,7 +1216,7 @@ final class CMOCBuildServiceTests: XCTestCase {
|
||||
|
||||
func testBundledLibrariesBuildUnmodifiedCoCoLettersMakefile() async throws {
|
||||
let repo = URL(fileURLWithPath: #filePath).deletingLastPathComponent().deletingLastPathComponent().deletingLastPathComponent().deletingLastPathComponent()
|
||||
let runtime = repo.appendingPathComponent("platforms/macos/LocalResources/ToolchainBundle")
|
||||
let runtime = vccQualificationToolchain(repo.appendingPathComponent("platforms/macos/LocalResources/ToolchainBundle"))
|
||||
try XCTSkipUnless(FileManager.default.fileExists(atPath: runtime.appendingPathComponent("share/cmoc/lib/libdskcon-standalone.a").path), "Stage the optional standalone disk library")
|
||||
let root = folder.appendingPathComponent("CoCo Letters")
|
||||
try FileManager.default.copyItem(at: repo.appendingPathComponent("third_party/examples/coco-letters"), to: root)
|
||||
@@ -1418,7 +1429,7 @@ final class CMOCBuildServiceTests: XCTestCase {
|
||||
XCTAssertEqual(artifact.sources["main.c"], Data(CMOCProject.starterSource.utf8))
|
||||
}
|
||||
func testGeneratedMakefileBuildsMultipleCFilesDependenciesResourcesAndDiskWithBundledTools() async throws {
|
||||
let runtime = URL(fileURLWithPath: #filePath).deletingLastPathComponent().deletingLastPathComponent().appendingPathComponent("LocalResources/ToolchainBundle")
|
||||
let runtime = vccQualificationToolchain(URL(fileURLWithPath: #filePath).deletingLastPathComponent().deletingLastPathComponent().appendingPathComponent("LocalResources/ToolchainBundle"))
|
||||
guard FileManager.default.isExecutableFile(atPath: runtime.appendingPathComponent("bin/perl").path) else { throw XCTSkip("Stage the complete bundled compiler and Perl runtime") }
|
||||
var generated = CMOCMakefileSettings()
|
||||
generated.sources = ["main.c", "src/game.c", "generated/data.c"]
|
||||
|
||||
Reference in new issue
Block a user