Commit d46cecf6 authored by David Owens II's avatar David Owens II

Labels now follow the rules outlines in issue #39.

parent ed20b04e
Pipeline #996 passed with stage
......@@ -19,7 +19,7 @@ import atpkg
import attools
enum Options: String {
case Overlay = "--overlay"
case Overlay = "--use-overlay"
case CustomFile = "-f"
static var allOptions : [Options] { return [Overlay, CustomFile] }
......
Subproject commit 80ca30adf95c2e94d6050ad0e6c797a1c2900837
Subproject commit 9439d100d35ccbb5a8ce5483e8046858fb55e9db
......@@ -16,7 +16,7 @@ import Foundation
class XCTestRun : Tool {
func run(task: Task) {
guard let testExecutable = task["testExecutable"]?.string else {
guard let testExecutable = task["test-executable"]?.string else {
fatalError("No testExecutable for XCTestRun")
}
#if os(OSX)
......
......@@ -187,18 +187,18 @@ final class ATllbuild : Tool {
case Tool = "tool"
case Name = "name"
case Dependencies = "dependencies"
case OutputType = "outputType"
case Source = "source"
case BootstrapOnly = "bootstrapOnly"
case OutputType = "output-type"
case Source = "sources"
case BootstrapOnly = "bootstrap-only"
case llBuildYaml = "llbuildyaml"
case CompileOptions = "compileOptions"
case LinkOptions = "linkOptions"
case LinkSDK = "linkSDK"
case LinkWithProduct = "linkWithProduct"
case SwiftCPath = "swiftCPath"
case CompileOptions = "compile-options"
case LinkOptions = "link-options"
case LinkSDK = "link-sdk"
case LinkWithProduct = "link-with"
case SwiftCPath = "swiftc-path"
case XCTestify = "xctestify"
case XCTestStrict = "xctestStrict"
case PublishProduct = "publishProduct"
case XCTestStrict = "xctest-strict"
case PublishProduct = "publish-product"
static var allOptions : [Options] {
return [
......
......@@ -16,57 +16,57 @@
(package
:name "atbuild"
:import ["atpkg/build.atpkg"]
:import-packages ["atpkg/build.atpkg"]
:tasks {
:atbuild {
:tool "atllbuild"
:source ["atbuild/src/**.swift"]
:name "atbuild"
:outputType "executable"
:linkWithProduct ["attools.a" "atpkg.a"]
:dependencies ["attools" "atpkg.atpkg"]
:atbuild {
:tool "atllbuild"
:sources ["atbuild/src/**.swift"]
:name "atbuild"
:output-type "executable"
:link-with ["attools.a" "atpkg.a"]
:dependencies ["attools" "atpkg.atpkg"]
:overlays {
:bootstrap-osx {
:bootstrapOnly true
:llbuildyaml "bootstrap/bootstrap-macosx.swift-build"
}
:bootstrap-linux {
:bootstrapOnly true
:swiftCPath "/usr/local/bin/swiftc"
:linkSDK false
:llbuildyaml "bootstrap/bootstrap-linux.swift-build"
}
}
}
:attools {
:tool "atllbuild"
:source ["attools/src/**.swift"]
:name "attools"
:outputType "static-library"
:dependencies ["atpkg.atpkg"]
:linkWithProduct ["atpkg.a"]
:overlays {
:bootstrap-osx {
:bootstrapOnly true
:llbuildyaml "bootstrap/bootstrap-macosx-attools.swift-build"
}
:bootstrap-linux {
:bootstrapOnly true
:swiftCPath "/usr/local/bin/swiftc"
:linkSDK false
:llbuildyaml "bootstrap/bootstrap-linux-attools.swift-build"
}
}
}
:overlays {
:bootstrap-osx {
:bootstrap-only true
:llbuildyaml "bootstrap/bootstrap-macosx.swift-build"
}
:bootstrap-linux {
:bootstrap-only true
:swiftc-path "/usr/local/bin/swiftc"
:link-sdk false
:llbuildyaml "bootstrap/bootstrap-linux.swift-build"
}
}
}
:attools {
:tool "atllbuild"
:sources ["attools/src/**.swift"]
:name "attools"
:output-type "static-library"
:dependencies ["atpkg.atpkg"]
:link-with ["atpkg.a"]
:overlays {
:bootstrap-osx {
:bootstrap-only true
:llbuildyaml "bootstrap/bootstrap-macosx-attools.swift-build"
}
:bootstrap-linux {
:bootstrap-only true
:swiftc-path "/usr/local/bin/swiftc"
:link-sdk false
:llbuildyaml "bootstrap/bootstrap-linux-attools.swift-build"
}
}
}
:check {
:tool "shell"
:script "./tests/test.sh"
:dependencies ["atbuild"]
}
:check {
:tool "shell"
:script "./tests/test.sh"
:dependencies ["atbuild"]
}
}
)
Subproject commit eb840f9ded74e393aa6ee002284acaaa5dfd49c8
Subproject commit 3a80085d1e23e240d0d3eaff9f9a8defb79a90d6
(package
:name "NaOH"
:import ["remote.atpkg"]
:import-packages ["remote.atpkg"]
:tasks {
:default {
......
......@@ -17,18 +17,18 @@
:overlays {
:got-overlay {
:compileOptions ["-D" "GOT_OVERLAY"]
:compile-options ["-D" "GOT_OVERLAY"]
}
}
:tasks {
:default {
:tool "atllbuild"
:source ["src/**.swift"]
:sources ["src/**.swift"]
:name "overlay"
:outputType "static-library"
:output-type "static-library"
:germany "awesome"
:compileOptions []
:compile-options []
}
}
)
\ No newline at end of file
......@@ -4,17 +4,17 @@
:tasks {
:executable {
:tool "atllbuild"
:outputType "executable"
:output-type "executable"
:name "executable"
:source ["main.swift"]
:publishProduct true
:sources ["main.swift"]
:publish-product true
}
:library {
:tool "atllbuild"
:outputType "static-library"
:output-type "static-library"
:name "library"
:source ["lib.swift"]
:publishProduct true
:sources ["lib.swift"]
:publish-product true
}
:default {
:tool "nop"
......
......@@ -5,10 +5,10 @@
:tasks {
:default {
:tool "atllbuild"
:outputType "static-library"
:output-type "static-library"
:name "test"
:germany "invalid"
:source ["Foo.swift"]
:sources ["Foo.swift"]
}
}
)
\ No newline at end of file
......@@ -4,24 +4,24 @@
:tasks {
:build-lib {
:tool "atllbuild"
:source ["src/**.swift"]
:outputType "static-library"
:sources ["src/**.swift"]
:output-type "static-library"
:name "Foo"
:compileOptions ["-enable-testing"]
:compile-options ["-enable-testing"]
}
:build-tests {
:tool "atllbuild"
:source ["test/**.swift"]
:outputType "executable"
:sources ["test/**.swift"]
:output-type "executable"
:name "footests"
:dependencies ["build-lib"]
:xctestify true
:xctestStrict true
:linkWithProduct["Foo.a"]
:xctest-strict true
:link-with ["Foo.a"]
}
:run-tests {
:tool "xctestrun"
:testExecutable ".atllbuild/products/footests"
:test-executable ".atllbuild/products/footests"
:dependencies ["build-tests"]
}
}
......
......@@ -5,23 +5,23 @@
:build-lib {
:tool "atllbuild"
:source ["src/**.swift"]
:outputType "static-library"
:output-type "static-library"
:name "Foo"
:compileOptions ["-enable-testing"]
:compile-options ["-enable-testing"]
}
:build-tests {
:tool "atllbuild"
:source ["test/**.swift"]
:outputType "executable"
:output-type "executable"
:name "footests"
:dependencies ["build-lib"]
:xctestify true
:xctestStrict true
:linkWithProduct["Foo.a"]
:xctest-strict true
:link-with ["Foo.a"]
}
:run-tests {
:tool "xctestrun"
:testExecutable ".atllbuild/products/footests"
:test-executable ".atllbuild/products/footests"
:dependencies ["build-tests"]
}
}
......
......@@ -4,24 +4,24 @@
:tasks {
:build-lib {
:tool "atllbuild"
:source ["src/**.swift"]
:outputType "static-library"
:sources ["src/**.swift"]
:output-type "static-library"
:name "Foo"
:compileOptions ["-enable-testing"]
:compile-options ["-enable-testing"]
}
:build-tests {
:tool "atllbuild"
:source ["test/**.swift"]
:outputType "executable"
:sources ["test/**.swift"]
:output-type "executable"
:name "footests"
:dependencies ["build-lib"]
:xctestify true
:xctestStrict true
:linkWithProduct["Foo.a"]
:xctest-strict true
:link-with ["Foo.a"]
}
:run-tests {
:tool "xctestrun"
:testExecutable ".atllbuild/products/footests"
:test-executable ".atllbuild/products/footests"
:dependencies ["build-tests"]
}
}
......
......@@ -104,10 +104,10 @@ if $ATBUILD; then
exit 1
fi
$ATBUILD --overlay got-overlay
$ATBUILD --use-overlay got-overlay
cd $DIR/tests/fixtures/overlay_default
if $ATBUILD --overlay foo; then
if $ATBUILD --use-overlay foo; then
echo "Expected a failure in overlay"
exit 1
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