From 178b63b95162f7eab6205f6df9744bad5da8b16e Mon Sep 17 00:00:00 2001
From: Andrew Alderwick <andrew@alderwick.co.uk>
Date: Sun, 23 Jan 2022 21:39:43 +0000
Subject: [PATCH] Rename build outputs.

---
 .build.yml | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/.build.yml b/.build.yml
index be06538..4848527 100644
--- a/.build.yml
+++ b/.build.yml
@@ -19,7 +19,7 @@ sources:
 tasks:
     - prepare: |
         rm -f out build
-        mkdir -p out build/linux-amd64 build/windows-64bit build/macos build/rompack/uxn
+        mkdir -p out build/uxn-lin64 build/uxn-win64 build/uxn-mac64 build/essentials/uxn
         umask 077
         mkdir -p ~/.ssh
         printf '%s\n' "${SSH_HOST_KEYS}" > ~/.ssh/known_hosts
@@ -27,9 +27,8 @@ tasks:
     - build-linux: |
         cd uxn
         ./build.sh --no-run
-        mv bin ../build/linux-amd64/uxn
-    - build-rompack: |
-        mkdir -p rompack/uxn
+        mv bin ../build/uxn-lin64/uxn
+    - build-essentials: |
         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
             PROJECT="${F%%/*}"
             if [ "${F}" = "${F%:*}" ]; then
@@ -41,26 +40,23 @@ tasks:
                 F="${F%:*}"
             fi
             [ -d "${PROJECT}" ] || git clone "https://git.sr.ht/~rabbits/${PROJECT}"
-            ( cd "${PROJECT}" && ../build/linux-amd64/uxn/uxnasm "${F#*/}" "../build/rompack/uxn/${ROMNAME}" || rm -f "../build/rompack/uxn/${ROMNAME}" )
+            ( cd "${PROJECT}" && ../build/uxn-lin64/uxn/uxnasm "${F#*/}" "../build/essentials/uxn/${ROMNAME}" || rm -f "../build/essentials/uxn/${ROMNAME}" )
         done
         [ -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"
-        rsync -rp win:uxn/bin/ build/windows-64bit/uxn/
+        ssh win "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/uxn-win64/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"
-        rsync -rp mac:uxn/bin/ build/macos/uxn/
+        ssh mac "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/uxn-mac64/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 "out/uxn-${PROJECT}.tar.gz" out/uxn-essentials.tar.gz
-                cp "out/uxn-${PROJECT}.zip" out/uxn-essentials.zip
-            else
-                cp build/rompack/uxn/* "build/${PROJECT}/uxn/"
-                tar -czf "out/uxn-essentials-${PROJECT}.tar.gz" -C "build/${PROJECT}" uxn
-                ( cd "build/${PROJECT}" && zip -qr "../../out/uxn-essentials-${PROJECT}.zip" uxn )
+        for PROJECT in uxn-lin64 uxn-win64 uxn-mac64 essentials; do
+            tar -czf "out/${PROJECT}.tar.gz" -C "build/${PROJECT}" uxn
+            ( cd "build/${PROJECT}" && zip -qr "../../out/${PROJECT}.zip" uxn )
+            if [ "${PROJECT}" != essentials ]; then
+                cp build/essentials/uxn/* "build/${PROJECT}/uxn/"
+                tar -czf "out/uxn-essentials-${PROJECT#uxn-}.tar.gz" -C "build/${PROJECT}" uxn
+                ( cd "build/${PROJECT}" && zip -qr "../../out/uxn-essentials-${PROJECT#uxn-}.zip" uxn )
             fi
         done
     - upload: |