From 2d93c615c8cba6b9cfbfae3e49948fe1b903e8e8 Mon Sep 17 00:00:00 2001
From: Martin Pulec <martin.pulec@cesnet.cz>
Date: Thu, 9 Apr 2020 10:33:31 +0200
Subject: [PATCH] Build: fixed JACK [Win]

---
 .github/scripts/Windows/install_jack.ps1 | 11 +++++++++++
 .github/scripts/Windows/prepare_msys.sh  |  1 +
 .github/workflows/ccpp.yml               |  6 +++---
 .github/workflows/nightly.yml            |  6 +++---
 4 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 .github/scripts/Windows/install_jack.ps1

diff --git a/.github/scripts/Windows/install_jack.ps1 b/.github/scripts/Windows/install_jack.ps1
new file mode 100644
index 000000000..07c828614
--- /dev/null
+++ b/.github/scripts/Windows/install_jack.ps1
@@ -0,0 +1,11 @@
+#Set-PSDebug -Trace 1
+
+choco install -y --no-progress jack
+
+# The lib is moved to the JACK library for 2 reasons:
+# 1. it will be cached here
+# 2. if it were in a Windows directory, it won't be bundled with UltraGrid
+#    (also make sure to remove from the Windows directory)
+New-Item -Type Directory 'C:\Program Files (x86)\Jack\bin'
+Move-Item 'C:\Windows\libjack64.dll' 'C:\Program Files (x86)\Jack\bin'
+
diff --git a/.github/scripts/Windows/prepare_msys.sh b/.github/scripts/Windows/prepare_msys.sh
index eeff35d7d..cfe17c740 100644
--- a/.github/scripts/Windows/prepare_msys.sh
+++ b/.github/scripts/Windows/prepare_msys.sh
@@ -22,6 +22,7 @@ fi
 
 JACK_D=/c/Program\ Files\ \(x86\)/Jack
 if test -d "$JACK_D"; then
+        export PATH=$PATH:$JACK_D/bin
         export CPATH=$CPATH:$JACK_D/includes
         export LIBRARY_PATH=$LIBRARY_PATH:$JACK_D/lib
 fi
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index cde8875b1..4102a1bdd 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -160,16 +160,16 @@ jobs:
       uses: actions/cache@v1
       with:
         path: 'C:\Program Files (x86)\Jack'
-        key: cache-jack
+        key: cache-jack-2
     - name: Install JACK
       if: steps.cache-jack.outputs.cache-hit != 'true'
-      run: choco install -y --no-progress jack
+      run: .github/scripts/Windows/install_jack.ps1
     - name: Cache MSYS2
       id: cache-msys2
       uses: actions/cache@v1
       with:
         path: C:\msys64
-        key: cache-msys2-3
+        key: cache-msys2-4
     - name: bootsrap MSYS2
       if: steps.cache-msys2.outputs.cache-hit != 'true'
       run: |
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 37fe3e74e..1c109a428 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -141,16 +141,16 @@ jobs:
       uses: actions/cache@v1
       with:
         path: 'C:\Program Files (x86)\Jack'
-        key: cache-jack
+        key: cache-jack-2
     - name: Install JACK
       if: steps.cache-jack.outputs.cache-hit != 'true'
-      run: choco install -y --no-progress jack
+      run: .github/scripts/Windows/install_jack.ps1
     - name: Cache MSYS2
       id: cache-msys2
       uses: actions/cache@v1
       with:
         path: C:\msys64
-        key: cache-msys2-3
+        key: cache-msys2-4
     - name: bootsrap MSYS2
       if: steps.cache-msys2.outputs.cache-hit != 'true'
       run: |