Commit ad42c8b4 authored by Drew's avatar Drew

Merge branch 'master' into module_map

parents bb524e11 98e03c9d
......@@ -59,8 +59,8 @@ How do we build a Swift project? There's a built-in tool called `atllbuild`, wh
:tasks {
:build {
:tool "atllbuild"
:source ["src/**.swift"] ;;walk the src directory, looking for Swift files
:outputType "executable"
:sources ["src/**.swift"] ;;walk the src directory, looking for Swift files
:output-type "executable"
:name "example"
}
}
......
Subproject commit 8538d78375eab505219ee4be570428ba9c927589
Subproject commit e3037b4c5a38db2350564c07d17acadc32ff19fa
......@@ -266,7 +266,7 @@ final class ATllbuild : Tool {
outputType = .Executable
}
else {
fatalError("Unknown outputType \(task["outputType"])")
fatalError("Unknown \(Options.OutputType.rawValue) \(task["outputType"])")
}
var compileOptions: [String] = []
......@@ -289,7 +289,7 @@ final class ATllbuild : Tool {
//xctestify
if task[Options.XCTestify.rawValue]?.bool == true {
precondition(outputType == .Executable, "You must use outputType: executable with xctestify.")
precondition(outputType == .Executable, "You must use :\(Options.OutputType.rawValue) executable with xctestify.")
//inject platform-specific flags
#if os(OSX)
compileOptions.appendContentsOf(["-F", "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/Library/Frameworks/"])
......
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