Commit 5d3deec9 authored by Drew's avatar Drew

Fix OSX building

* Use ATBUILD_BIN_PATH
* we have to move off official atbuild since the release version doesn't support this yet
* Use xcode toolchain as part of tests
parent d6c52342
......@@ -21,8 +21,6 @@
:branch "master"
}]
:import-packages ["tests/osx/build.atpkg"]
:tasks {
:default {
:tool "atllbuild"
......@@ -40,7 +38,6 @@
:name "package_framework"
:atllbuild-task "default"
:platforms ["all"]
:dependencies ["default"]
}
:package {
......@@ -50,8 +47,13 @@
:dependencies ["atbin"]
}
:osxcheck {
:tool "shell"
:script "cd tests/osx && ~/Code/AnarchyTools/atbuild/bin/atbuild --toolchain xcode check"
}
:check {
:dependencies ["default" "osxframework.check"]
:dependencies ["default" "osxcheck"]
:tool "nop"
}
}
......
......@@ -70,11 +70,13 @@ class PackageFramework {
try! FS.createDirectory(path: AVersionPath, intermediate: true)
//'current' (produces code signing failures if absent)
try! FS.symlinkItem(from: Path("A"), to: frameworkPath + "Versions/Current")
//copy payload
//atbin path
let atbinPath = Path("bin").appending("\(name).atbin")
let atbinPath = Path(env("ATBUILD_BIN_PATH")!).appending("\(name).atbin")
let payloadPath = atbinPath.appending(name + ".dylib")
try! FS.copyItem(from: payloadPath, to: AVersionPath.appending(name))
try! FS.symlinkItem(from: relativeAVersionPath.appending(name), to: frameworkPath.appending(name))
//copy modules
......@@ -85,6 +87,7 @@ class PackageFramework {
if FS.fileExists(path: swiftModulePath) {
try! FS.copyItem(from: swiftModulePath, to: modulePath.appending("\(architecture).swiftmodule"))
}
let swiftDocPath = atbinPath.appending("\(platform).swiftdoc")
if FS.fileExists(path: swiftDocPath) {
try! FS.copyItem(from: swiftDocPath, to: modulePath.appending("\(architecture).swiftdoc"))
......
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3A9D10DD1CE15EAD003BE144"
BuildableName = "UseOSXFramework.app"
BlueprintName = "UseOSXFramework"
ReferencedContainer = "container:UseOSXFramework.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3A9D10EC1CE15EAD003BE144"
BuildableName = "UseOSXFrameworkTests.xctest"
BlueprintName = "UseOSXFrameworkTests"
ReferencedContainer = "container:UseOSXFramework.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3A9D10DD1CE15EAD003BE144"
BuildableName = "UseOSXFramework.app"
BlueprintName = "UseOSXFramework"
ReferencedContainer = "container:UseOSXFramework.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3A9D10DD1CE15EAD003BE144"
BuildableName = "UseOSXFramework.app"
BlueprintName = "UseOSXFramework"
ReferencedContainer = "container:UseOSXFramework.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3A9D10DD1CE15EAD003BE144"
BuildableName = "UseOSXFramework.app"
BlueprintName = "UseOSXFramework"
ReferencedContainer = "container:UseOSXFramework.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment