From 355933215c152c8b965d0a431b5a39cc01389424 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sat, 20 Aug 2022 01:28:07 +0100
Subject: [PATCH] Package both jack and native standalones for linux

---
 .github/workflows/build.yml |  8 ++++----
 Makefile                    | 26 +++++++++++++++++---------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d1d51f1..29646c3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -80,7 +80,7 @@ jobs:
         run: echo "::set-output name=sha8::$(echo ${{ steps.slug1.outputs.sha8 || steps.slug2.outputs.sha8 }})"
       - name: Pack binaries
         run: |
-          tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-linux-arm64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz -C bin $(ls bin | grep -e lv2 -e vst) ../Cardinal
+          tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-linux-arm64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz -C bin $(ls bin | grep -e lv2 -e vst)  ../CardinalJACK ../CardinalNative
       - uses: actions/upload-artifact@v2
         with:
           name: ${{ github.event.repository.name }}-linux-arm64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
@@ -164,7 +164,7 @@ jobs:
         run: echo "::set-output name=sha8::$(echo ${{ steps.slug1.outputs.sha8 || steps.slug2.outputs.sha8 }})"
       - name: Pack binaries
         run: |
-          tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-linux-armhf-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz -C bin $(ls bin | grep -e lv2 -e vst) ../Cardinal
+          tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-linux-armhf-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz -C bin $(ls bin | grep -e lv2 -e vst)  ../CardinalJACK ../CardinalNative
       - uses: actions/upload-artifact@v2
         with:
           name: ${{ github.event.repository.name }}-linux-armhf-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
@@ -244,7 +244,7 @@ jobs:
         run: echo "::set-output name=sha8::$(echo ${{ steps.slug1.outputs.sha8 || steps.slug2.outputs.sha8 }})"
       - name: Pack binaries
         run: |
-          tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-linux-i686-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz -C bin $(ls bin | grep -e lv2 -e vst) ../Cardinal
+          tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-linux-i686-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz -C bin $(ls bin | grep -e lv2 -e vst) ../CardinalJACK ../CardinalNative
       - uses: actions/upload-artifact@v2
         with:
           name: ${{ github.event.repository.name }}-linux-i686-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
@@ -316,7 +316,7 @@ jobs:
         run: echo "::set-output name=sha8::$(echo ${{ steps.slug1.outputs.sha8 || steps.slug2.outputs.sha8 }})"
       - name: Pack binaries
         run: |
-          tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-linux-x86_64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz -C bin $(ls bin | grep -e lv2 -e vst) ../Cardinal
+          tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-linux-x86_64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz -C bin $(ls bin | grep -e lv2 -e vst)  ../CardinalJACK ../CardinalNative
       - uses: actions/upload-artifact@v2
         with:
           name: ${{ github.event.repository.name }}-linux-x86_64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
diff --git a/Makefile b/Makefile
index f343080..ebb7306 100644
--- a/Makefile
+++ b/Makefile
@@ -244,16 +244,24 @@ endif
 # --------------------------------------------------------------
 # Packaging standalone for CI
 
-unzipfx: deps/unzipfx/unzipfx2cat$(APP_EXT) Cardinal.zip
-	cat deps/unzipfx/unzipfx2cat$(APP_EXT) Cardinal.zip > Cardinal
-	chmod +x Cardinal
+unzipfx: deps/unzipfx/unzipfx2cat$(APP_EXT) CardinalJACK.zip CardinalNative.zip
+	cat deps/unzipfx/unzipfx2cat$(APP_EXT) CardinalJACK.zip > CardinalJACK
+	cat deps/unzipfx/unzipfx2cat$(APP_EXT) CardinalNative.zip > CardinalNative
+	chmod +x CardinalJACK CardinalNative
 
-Cardinal.zip: bin/Cardinal bin/CardinalFX.lv2/resources
-	mkdir -p build/unzipfx
-	ln -sf ../../bin/Cardinal build/unzipfx/Cardinal
-	ln -s ../../bin/CardinalFX.lv2/resources build/unzipfx/resources
-	cd build/unzipfx && \
-		zip -r -9 ../../Cardinal.zip Cardinal resources
+CardinalJACK.zip: bin/Cardinal bin/CardinalFX.lv2/resources
+	mkdir -p build/unzipfx-jack
+	ln -sf ../../bin/Cardinal build/unzipfx-jack/Cardinal
+	ln -s ../../bin/CardinalFX.lv2/resources build/unzipfx-jack/resources
+	cd build/unzipfx-jack && \
+		zip -r -9 ../../$@ Cardinal resources
+
+CardinalNative.zip: bin/CardinalNative bin/CardinalFX.lv2/resources
+	mkdir -p build/unzipfx-native
+	ln -sf ../../bin/CardinalNative build/unzipfx-native/Cardinal
+	ln -s ../../bin/CardinalFX.lv2/resources build/unzipfx-native/resources
+	cd build/unzipfx-native && \
+		zip -r -9 ../../$@ Cardinal resources
 
 deps/unzipfx/unzipfx2cat:
 	make -C deps/unzipfx -f Makefile.linux