Update dist.sh and GitHub action files for new distrib format

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>

Author: smunaut

.github/workflows/release.yml

@@ -36,8 +36,8 @@ jobs:
               with:
                 name: muacm-build
                 path: |
-                  build/muacm-*.ilang.bz2
-                  build/muacm-*.tar.bz2
+                  build/muacm-bin-*.tar.bz2
+                  build/muacm-example-*.tar.bz2
 
             - name: Release (as draft)
               uses: softprops/action-gh-release@v1
@@ -46,7 +46,7 @@ jobs:
                 tag_name: ${{ env.TAG }}
                 draft: true
                 files: |
-                  build/muacm-*.ilang.bz2
-                  build/muacm-*.tar.bz2
+                  build/muacm-bin-*.tar.bz2
+                  build/muacm-example-*.tar.bz2
               env:
                 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

dist.sh

@@ -3,30 +3,49 @@
 set -e
 
 TAG=`date +%Y%m%d`-`git rev-parse --short HEAD`
-DEST="build/muacm-${TAG}"
+DEST_BIN="build/muacm-bin-${TAG}"
+DEST_EXAMPLE="build/muacm-example-${TAG}"
 
 # Build gateware
 make -C gateware
 bzip2 -kf build/muacm.ilang
 bzip2 -kf build/muacm.v
 
-# Build dist directory
-mkdir -p "${DEST}"
-mkdir -p "${DEST}/ip"
+# Save tag
 echo -n "${TAG}" > "build/tag.txt"
 
-cp -a example/* "${DEST}"
-cp "build/muacm.ilang.bz2" "${DEST}/ip"
-cp "build/muacm.v.bz2" "${DEST}/ip"
+# Build 'bin' dist directory
+mkdir -p "${DEST_BIN}"
 
-cp "doc/LICENSE-CERN-OHL-P-2.0.txt" "${DEST}"
-cp "doc/LICENSE-MIT.txt" "${DEST}"
+cp "build/muacm.ilang" "${DEST_BIN}"
+cp "build/muacm.v" "${DEST_BIN}"
+cp "utils/muacm_customize.py" "${DEST_BIN}"
 
-# Create the tagged bz2
-cp "build/muacm.ilang.bz2" "build/muacm-${TAG}.ilang.bz2"
-cp "build/muacm.v.bz2" "build/muacm-${TAG}.v.bz2"
+cp "README.md" "${DEST_BIN}/README-core.md"
+cp "README-bin.md" "${DEST_BIN}/README.md"
+cp "doc/LICENSE-CERN-OHL-P-2.0.txt" "${DEST_BIN}"
+cp "doc/LICENSE-MIT.txt" "${DEST_BIN}"
+cp "gateware/cores/serv/LICENSE" "${DEST_BIN}/LICENSE-ISC-SERV.txt"
 
-# Create the archive
+# Build 'example' dist directory
+mkdir -p "${DEST_EXAMPLE}"
+mkdir -p "${DEST_EXAMPLE}/ip"
+mkdir -p "${DEST_EXAMPLE}/utils"
+
+cp -a example/* "${DEST_EXAMPLE}"
+
+cp "build/muacm.ilang.bz2" "${DEST_EXAMPLE}/ip"
+cp "build/muacm.v.bz2" "${DEST_EXAMPLE}/ip"
+
+cp "README.md" "${DEST_EXAMPLE}/README-core.md"
+cp "doc/LICENSE-CERN-OHL-P-2.0.txt" "${DEST_EXAMPLE}"
+cp "doc/LICENSE-MIT.txt" "${DEST_EXAMPLE}"
+cp "gateware/cores/serv/LICENSE" "${DEST_EXAMPLE}/LICENSE-ISC-SERV.txt"
+
+cp "utils/muacm_customize.py" "${DEST_EXAMPLE}/utils"
+
+# Create the archives
 pushd build
-tar -cjvf "muacm-${TAG}.tar.bz2" "muacm-${TAG}"
+tar -cjvf "muacm-bin-${TAG}.tar.bz2" "muacm-bin-${TAG}"
+tar -cjvf "muacm-example-${TAG}.tar.bz2" "muacm-example-${TAG}"
 popd