Commit 4baf18d7 authored by Drew's avatar Drew

Remove platform hax

We enabled some hax to get a self-hosted atbuild on 1.1.  However, since 1.2 is released, these hacks are no longer required.

* Use version field from build.atpkg
* Use only-platforms to segregate linux/osx packaging behavior
* Use `package` noptask as an alias for the platform packager

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