From 251d7cae71c531679156dadd74e6fad4a730fe54 Mon Sep 17 00:00:00 2001
From: Andrew Alderwick <andrew@alderwick.co.uk>
Date: Sun, 23 Jan 2022 21:01:41 +0000
Subject: [PATCH] Build combined archives with starter packs.

---
 .build.yml | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/.build.yml b/.build.yml
index 9f4b5f3..592150f 100644
--- a/.build.yml
+++ b/.build.yml
@@ -18,8 +18,8 @@ sources:
     - https://git.sr.ht/~rabbits/uxn
 tasks:
     - prepare: |
-        rm -f out
-        mkdir -p out
+        rm -f out build
+        mkdir -p out build/linux-amd64 build/windows-64bit build/macos build/rompack/uxn
         umask 077
         mkdir -p ~/.ssh
         printf '%s\n' "${SSH_HOST_KEYS}" > ~/.ssh/known_hosts
@@ -27,9 +27,7 @@ tasks:
     - build-linux: |
         cd uxn
         ./build.sh --no-run
-        mv bin uxn
-        tar -czf ../out/uxn-linux-amd64.tar.gz uxn
-        cd ..
+        mv bin ../build/linux-amd64/uxn
     - build-rompack: |
         mkdir -p rompack/uxn
         for F in uxn/projects/software/calc.tal uxn/projects/software/launcher.tal uxn/projects/examples/demos/piano.tal uxn/projects/examples/demos/clock.tal catclock/src/main.tal dexe/src/main.tal donsol/src/main.tal left/src/main.tal nasu/src/main.tal noodle/src/main.tal orca-toy/src/main.tal:orca.rom turye/src/main.tal; do
@@ -43,17 +41,25 @@ tasks:
                 F="${F%:*}"
             fi
             [ -d "${PROJECT}" ] || git clone "https://git.sr.ht/~rabbits/${PROJECT}"
-            ( cd "${PROJECT}" && ../uxn/uxn/uxnasm "${F#*/}" "../rompack/uxn/${ROMNAME}" || rm -f "../rompack/uxn/${ROMNAME}" )
+            ( cd "${PROJECT}" && ../build/linux-amd64/uxn/uxnasm "${F#*/}" "../build/rompack/uxn/${ROMNAME}" || rm -f "../build/rompack/uxn/${ROMNAME}" )
         done
-        tar -czf out/uxn-rompack.tar.gz -C rompack uxn
-        ( cd rompack && zip -qr ../out/uxn-rompack.zip uxn )
         [ -e ~/.ssh/id_rsa ] || complete-build
     - build-windows: |
-        ssh win "rm -f uxn-windows-64bit.zip; export PATH=\"\${PATH}:/mingw64/bin\"; set -ex; cd uxn; git fetch; git checkout .; git clean -xfd; git checkout $(cd uxn && git rev-parse HEAD); MSYSTEM=MSYS ./build.sh --no-run; mv bin uxn; zip -qr ../uxn-windows-64bit.zip uxn"
-        rsync win:uxn-windows-64bit.zip out/
+        ssh win "rm -f uxn-windows-64bit.zip; export PATH=\"\${PATH}:/mingw64/bin\"; set -ex; cd uxn; git fetch; git checkout .; git clean -xfd; git checkout $(cd uxn && git rev-parse HEAD); MSYSTEM=MSYS ./build.sh --no-run"
+        rsync -rp win:uxn/bin/ build/windows-64bit/uxn/
     - build-macos: |
-        ssh mac "rm -f uxn-macos.tar.gz; export PATH=\"\${PATH}:/usr/local/bin\"; set -ex; cd uxn; git fetch; git checkout .; git clean -xfd; git checkout $(cd uxn && git rev-parse HEAD); ./build.sh --no-run; mv bin uxn; tar -zcf ../uxn-macos.tar.gz uxn"
-        rsync mac:uxn-macos.tar.gz out/
+        ssh mac "rm -f uxn-macos.tar.gz; export PATH=\"\${PATH}:/usr/local/bin\"; set -ex; cd uxn; git fetch; git checkout .; git clean -xfd; git checkout $(cd uxn && git rev-parse HEAD); ./build.sh --no-run"
+        rsync -rp mac:uxn/bin/ build/macos/uxn/
+    - archive: |
+        for PROJECT in linux-amd64 windows-64bit macos rompack; do
+            tar -czf "out/uxn-${PROJECT}.tar.gz" -C "build/${PROJECT}" uxn
+            ( cd "build/${PROJECT}" && zip -qr "../../out/uxn-${PROJECT}.zip" uxn )
+            if [ "${PROJECT}" != rompack ]; then
+                cp build/rompack/uxn/* "build/${PROJECT}/"
+                tar -czf "out/uxn-starter-${PROJECT}.tar.gz" -C "build/${PROJECT}" uxn
+                ( cd "build/${PROJECT}" && zip -qr "../../out/uxn-starter-${PROJECT}.zip" uxn )
+            fi
+        done
     - upload: |
         if [ "$(cd uxn && git rev-parse HEAD)" != "$(cd uxn && git rev-parse origin/main)" ]; then exit; fi
         ls -l out