Merge pull request #27 from Wasted-Audio/update/hvcc

update hvcc and add dpf-widgets

.github/workflows/run_script.yml

@@ -8,27 +8,32 @@ jobs:
     runs-on: macos-latest
     steps:
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
     - name: Install dependencies
       working-directory: ${{github.workspace}}
       run: brew install dfu-util
 
+    - name: Setup Python 3.11
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.11'
+
     - name: Run Packaging Script
       working-directory: ${{github.workspace}}
       run:
        CLEAR_INTL=1 ./build.sh
 
     - name: Archive Artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Heavy-MacOS-Universal
         path: ${{github.workspace}}/Heavy
 
     - name: Release Artifacts
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       if: startsWith(github.ref, 'refs/tags/')
       with:
         prerelease: true
@@ -42,23 +47,28 @@ jobs:
       - name: Install Packages
         run: choco install make -y
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
+      - name: Setup Python 3.11
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+
       - name: Run Packaging Script
         working-directory: ${{github.workspace}}
         run:
           ./build.bat
 
       - name: Archive Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Heavy-Win64
           path: ${{github.workspace}}/Heavy
 
       - name: Release Artifacts
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
           prerelease: true
@@ -70,27 +80,33 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - name: Install Dependencies (apt)
-      run: sudo add-apt-repository ppa:deadsnakes/ppa && sudo apt update && sudo apt install -y git binutils python3.11-full curl tar gzip xz-utils make patchelf libusb-dev build-essential rsync wget dfu-util
+      run: sudo apt update && sudo apt install -y git binutils curl tar gzip xz-utils make patchelf libusb-dev build-essential rsync wget dfu-util
       #deps for build-anywhere:  csh gawk autoconf automake autotools-dev wget m4 flex bison texinfo unzip help2man meson gperf lzip libtool-bin patch ninja-build libstdc++6 libncurses5-dev
-    - uses: actions/checkout@v3
+
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
       env:
         PATH: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
+    - name: Setup Python 3.11
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.11'
+
     - name: Run Packaging Script
       working-directory: ${{github.workspace}}
       run:
         bash ./build.sh
 
     - name: Archive Artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Heavy-Linux-x64
         path: ${{github.workspace}}/Heavy
 
     - name: Release Artifacts
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       if: startsWith(github.ref, 'refs/tags/')
       with:
         prerelease: true

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "dpf"]
 	path = dpf
 	url = https://github.com/DISTRHO/DPF.git
+[submodule "dpf-widgets"]
+	path = dpf-widgets
+	url = git@github.com:DISTRHO/DPF-Widgets.git

build.bat

@@ -26,21 +26,19 @@ cd ..
 
 xcopy /E /H /C /I libdaisy Heavy\usr\lib\libdaisy
 xcopy /E /H /C /I dpf Heavy\usr\lib\dpf
+xcopy /E /H /C /I dpf-widgets Heavy\usr\lib\dpf-widgets
 
 :: Package heavy using pyinstaller
 python -m ensurepip
-python -m pip install hvcc\.
-python -m pip install pyinstaller
+python -m pip install poetry poetry-pyinstaller-plugin
 
-FOR /F "tokens=*" %%g IN ('python -m site --user-site') do (SET PYTHON_SITE=%%g)
 
-python resources\run_pyinstaller.py -n Heavy --noconfirm  --windowed --paths %PYTHON_SITE% .\hvcc\hvcc\__init__.py --collect-data json2daisy --add-data=".\hvcc\hvcc\generators;.\generators" --add-data=".\hvcc\hvcc\core;.\hvcc\core" --add-data=".\hvcc\hvcc\generators;.\hvcc\generators" --add-data=".\hvcc\hvcc\interpreters;.\hvcc\interpreters"
+cd hvcc
+poetry build
+cd ..
 
-copy .\dist\Heavy\json2daisy\resources\component_defs.json .\dist\Heavy\json2daisy\resources\seed.json
-move .\dist\Heavy .\Heavy\usr\bin\
+mkdir .\Heavy\usr\bin\Heavy\
 
-del /s /q .\dist\*
-del /s /q .\build\*
-del /s /q .\__init__.spec
+move .\hvcc\dist\pyinstaller\win_amd64\Heavy.exe .\Heavy\usr\bin\Heavy\
 
 cp VERSION Heavy\VERSION

build.sh

@@ -152,24 +152,22 @@ popd
 
 cp -rf ./libdaisy ./Heavy/lib/libdaisy
 cp -rf ./dpf ./Heavy/lib/dpf
+cp -rf ./dpf-widgets ./Heavy/lib/dpf-widgets
 
 # Package Heavy with pyinstaller
 python3 -m ensurepip
-python3 -m pip install hvcc/.
-python3 -m pip install pyinstaller
+python3 -m pip install poetry poetry-pyinstaller-plugin
+
+pushd hvcc
+poetry build
+popd
+
+mkdir -p Heavy/bin/Heavy
 
 if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    python3 ./resources/run_pyinstaller.py -n Heavy --noconfirm --paths $(python3 -m site --user-site) ./hvcc/hvcc/__init__.py --collect-data json2daisy --add-data="./hvcc/hvcc/generators:./generators" --add-data="./hvcc/hvcc/core:./hvcc/core" --add-data="./hvcc/hvcc/generators:./hvcc/generators" --add-data="./hvcc/hvcc/interpreters:./hvcc/interpreters"
+    mv ./hvcc/dist/pyinstaller/manylinux_2_31_x86_64/Heavy Heavy/bin/Heavy/
 elif [[ "$OSTYPE" == "darwin"* ]]; then
-    python3 ./resources/run_pyinstaller.py -n Heavy --noconfirm --paths $(python3 -m site --user-site) --target-architecture x86_64 ./hvcc/hvcc/__init__.py --collect-data json2daisy --add-data="./hvcc/hvcc/generators:./generators" --add-data="./hvcc/hvcc/core:./hvcc/core" --add-data="./hvcc/hvcc/generators:./hvcc/generators" --add-data="./hvcc/hvcc/interpreters:./hvcc/interpreters"
+    mv ./hvcc/dist/pyinstaller/macosx_14_0_arm64/Heavy Heavy/bin/Heavy/
 fi
 
-cp ./dist/Heavy/json2daisy/resources/component_defs.json ./dist/Heavy/json2daisy/resources/seed.json
-
-mv ./dist/Heavy Heavy/bin/Heavy
-
-rm -rf ./dist
-rm -rf ./build
-rm -rf ./Heavy.spec
-
 cp VERSION ./Heavy/VERSION