Commit 777f7d08 authored by Drew's avatar Drew

Update to new API to atpkg

parent 73c3af87
Pipeline #943 passed with stage
...@@ -23,9 +23,9 @@ final public class TaskRunner { ...@@ -23,9 +23,9 @@ final public class TaskRunner {
private init() {} private init() {}
static public func runTask(task: Task, package: Package) { static public func runTask(task: Task, package: Package) {
print("Running task \(task.key)...") print("Running task \(task.qualifiedName)...")
let tool = toolByName(task.tool) let tool = toolByName(task.tool)
tool.run(task) tool.run(task)
print("Completed task \(task.key).") print("Completed task \(task.qualifiedName).")
} }
} }
\ No newline at end of file
...@@ -202,7 +202,7 @@ final class ATllbuild : Tool { ...@@ -202,7 +202,7 @@ final class ATllbuild : Tool {
"xctestStrict"] "xctestStrict"]
for key in task.allKeys { for key in task.allKeys {
if !knownOptions.contains(key) { if !knownOptions.contains(key) {
print("Warning: unknown option \(key) for task \(task.key)") print("Warning: unknown option \(key) for task \(task.qualifiedName)")
} }
} }
...@@ -255,7 +255,7 @@ final class ATllbuild : Tool { ...@@ -255,7 +255,7 @@ final class ATllbuild : Tool {
} }
guard let sourceDescriptions = task["source"]?.vector?.flatMap({$0.string}) else { fatalError("Can't find sources for atllbuild.") } guard let sourceDescriptions = task["source"]?.vector?.flatMap({$0.string}) else { fatalError("Can't find sources for atllbuild.") }
var sources = collectSources(sourceDescriptions, task: task) var sources = collectSources(sourceDescriptions, taskForCalculatingPath: task)
//xctestify //xctestify
if task["xctestify"]?.bool == true { if task["xctestify"]?.bool == true {
......
...@@ -16,7 +16,7 @@ if $ATBUILD 2&> /tmp/warnings.txt; then ...@@ -16,7 +16,7 @@ if $ATBUILD 2&> /tmp/warnings.txt; then
echo "No tool specified but passed anyway?" echo "No tool specified but passed anyway?"
exit 1 exit 1
fi fi
if ! grep "No tool for task default; did you forget to specify it?" /tmp/warnings.txt; then if ! grep "No tool for task agressive.default; did you forget to specify it?" /tmp/warnings.txt; then
echo "Got an error other than one prompting for the correct tool" echo "Got an error other than one prompting for the correct tool"
exit 1 exit 1
fi fi
......
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