Commit 249cede1 authored by Drew's avatar Drew Committed by GitHub

Merge pull request #108 from AnarchyTools/beta-xcode

Support for xcode-beta toolchain
parents b0ebf730 ac6693ca
Pipeline #2154 passed with stage
in 4 minutes and 51 seconds
......@@ -63,6 +63,9 @@ for (i, x) in Process.arguments.enumerated() {
if toolchain == "xcode" {
toolchain = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain"
}
else if toolchain == "xcode-beta" {
toolchain = "/Applications/Xcode-beta.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain"
}
}
if x == Options.Platform.rawValue {
let platformString = Process.arguments[i+1]
......@@ -96,7 +99,7 @@ func usage() {
print("© 2016 Anarchy Tools Contributors.")
print("")
print("Usage:")
print("atbuild [--toolchain (/toolchain/path | xcode)] [-f packagefile] [task] [--clean]")
print("atbuild [--toolchain (/toolchain/path | xcode | xcode-beta )] [-f packagefile] [task] [--clean]")
if let p = package {
print("tasks:")
......
......@@ -8,7 +8,14 @@
:name "hello"
:output-type "executable"
:publish-product true
}
}
:swiftthree {
:tool "atllbuild"
:sources ["test-3.swift"]
:name "hello"
:output-type "executable"
:publish-product true
}
}
)
......@@ -370,6 +370,13 @@ else
echo "Xcode is not installed; skipping test"
fi
if [ -e "/Applications/Xcode-beta.app" ]; then
cd $DIR/tests/fixtures/xcode_toolchain
$ATBUILD swiftthree --toolchain xcode-beta
else
echo "Xcode beta toolchain is not installed; skipping test"
fi
echo "****************PACKAGE FRAMEWORK TESTS**************"
UNAME=`uname`
if [ "$UNAME" == "Darwin" ]; then
......
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