Commit 20703c64 authored by Drew's avatar Drew

Merge pull request #98 from AnarchyTools/platform-hax

Remove platform hax
parents d724974a 4baf18d7
Pipeline #1904 passed with stage
......@@ -17,7 +17,7 @@
(package
:name "atbuild"
:import-packages ["atpkg/build.atpkg"]
:version "1.3"
:tasks {
:atbuild {
:tool "atllbuild"
......@@ -86,12 +86,18 @@
:dependencies ["atbin"]
:recommends "xz-utils"
:suggests "package-deb"
:only-platforms ["linux"]
}
:package-osx {
:tool "package-homebrew.attool"
:name "atbuild"
:github-project "AnarchyTools/atbuild"
:dependencies ["atbin"]
:only-platforms ["osx"]
}
:package {
:tool "nop"
:dependencies ["package-osx" "package-linux"]
}
}
......
......@@ -10,19 +10,11 @@ ATBUILD="`pwd`/.atllbuild/products/atbuild"
pwd
echo "****************SELF-HOSTING TEST**************"
export ATBUILD_PACKAGE_VERSION="1.2"
echo "Remove this line after releasing 1.2"
if [ "$UNAME" == "Darwin" ]; then
PLATFORM_SPECIFIC_PACKAGE="package-osx"
else
PLATFORM_SPECIFIC_PACKAGE="package-linux"
fi
if ! $ATBUILD $PLATFORM_SPECIFIC_PACKAGE --use-overlay static; then
if ! $ATBUILD package --use-overlay static; then
echo "Self-host failed; maybe you're not running CaffeinatedSwift?"
echo "Retrying with non-static build"
$ATBUILD $PLATFORM_SPECIFIC_PACKAGE
$ATBUILD package
fi
echo "****************ONLY-PLATFORMS TEST**************"
......
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