Merge remote-tracking branch 'upstream/master'

Meantime, 6 new commits were released in ''asb2m10/dexed:master, all of them are merged now.
asb2m10 · Apr 8, 2024 · bd2266d · bd2266d
2 parents 20f0c07 + 7e6063c
commit bd2266d
Show file tree

Hide file tree

Showing 3 changed files with 112 additions and 76 deletions.
diff --git a/.github/workflows/project-pipeline.yml b/.github/workflows/project-pipeline.yml
@@ -3,99 +3,133 @@ name: dexed-pipeline
 on:
   push:
     branches: [ master ]
+    tags:
+      - '*'
   pull_request:
     branches: [ master ]
 
-env:
-  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-  BUILD_TYPE: Debug
-
 jobs:
-  build-linux:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Install Dexed Dependencies
-      if: runner.os == 'Linux'
-      run: |
-        sudo apt-get update && sudo apt install libasound2-dev libx11-dev libxinerama-dev libxext-dev libfreetype6-dev libwebkit2gtk-4.0-dev libglu1-mesa-dev ccache xvfb libjack-dev
-        sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 10
-        sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 10
-
-    - uses: actions/checkout@v3
-      with:
-         submodules: recursive
-
-    - name: Configure CMake
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
-
-    - name: Build
-      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
-
-    - name: Show
-      run: ls -lR ${{github.workspace}}/build
-
-    - name: Upload
-      uses: actions/upload-artifact@v3
-      with:
-        name: linux-bin
-        path: |
-          ${{github.workspace}}/build/Source/*_artefacts/${{env.BUILD_TYPE}}/VST3/*.vst3/**
-          ${{github.workspace}}/build/Source/*_artefacts/${{env.BUILD_TYPE}}/CLAP/*.clap/**
-          ${{github.workspace}}/build/Source/*_artefacts/${{env.BUILD_TYPE}}/Standalone/*
-
-  build-macos:
-    runs-on: macos-latest
-
-    steps:
-    - uses: actions/checkout@v3
-      with:
-         submodules: recursive
-
-    - name: Configure CMake
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
-
-    - name: Build
-      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
-
-    - name: Show
-      run: ls -lR ${{github.workspace}}/build
-
-    - name: Upload
-      uses: actions/upload-artifact@v3
-      with:
-        name: macos-bin
-        path: |
-          ${{github.workspace}}/build/Source/*_artefacts/${{env.BUILD_TYPE}}/VST3/*.vst3/**
-          ${{github.workspace}}/build/Source/*_artefacts/${{env.BUILD_TYPE}}/CLAP/*.clap/**
-          ${{github.workspace}}/build/Source/*_artefacts/${{env.BUILD_TYPE}}/AU/*.component/**
-          ${{github.workspace}}/build/Source/*_artefacts/${{env.BUILD_TYPE}}/Standalone/*.app/**
+  # build-linux:
+  #   runs-on: ubuntu-latest
+
+  #   steps:
+  #   - name: Install Dexed Dependencies
+  #     if: runner.os == 'Linux'
+  #     run: |
+  #       sudo apt-get update && sudo apt install libasound2-dev libx11-dev libxinerama-dev libxext-dev libfreetype6-dev libwebkit2gtk-4.0-dev libglu1-mesa-dev ccache xvfb libjack-dev
+  #       sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 10
+  #       sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 10
+
+  #   - uses: actions/checkout@v4
+  #     with:
+  #        submodules: recursive
+
+  #   - name: Set build type
+  #     shell: bash
+  #     run: |
+  #       if [ "$GITHUB_REF_TYPE" == "tag" ]; then
+  #           echo "BUILD_TYPE=Release" >> "$GITHUB_ENV"
+  #           echo "BUILD_VERSION=${GITHUB_REF_NAME:1}" >> "$GITHUB_ENV"
+  #       else
+  #           echo "BUILD_TYPE=Debug" >> "$GITHUB_ENV"
+  #           echo "BUILD_VERSION=DEVBUILD" >> "$GITHUB_ENV"
+  #       fi
+  #       echo "BUILD PARM =========="
+  #       cat $GITHUB_ENV
+
+  #   - name: Build
+  #     run: |
+  #         cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DDEXED_ID=${{ env.BUILD_VERSION }}
+  #         cmake --build ${{github.workspace}}/build --config ${{ env.BUILD_TYPE }}
+
+  #   - name: Show
+  #     run: ls -lR ${{github.workspace}}/build
+
+  #   - name: Upload
+  #     uses: actions/upload-artifact@v4
+  #     with:
+  #       name: linux-bin
+  #       path: |
+  #         ${{github.workspace}}/build/Source/*_artefacts/${{env.BUILD_TYPE}}/VST3/*.vst3/**
+  #         ${{github.workspace}}/build/Source/*_artefacts/${{env.BUILD_TYPE}}/CLAP/*.clap/**
+  #         ${{github.workspace}}/build/Source/*_artefacts/${{env.BUILD_TYPE}}/Standalone/*
+
+  # build-macos:
+  #   runs-on: macos-latest
+
+  #   steps:
+  #   - uses: actions/checkout@v4
+  #     with:
+  #        submodules: recursive
+
+  #   - name: Set build type
+  #     shell: bash
+  #     run: |
+  #       if [ "$GITHUB_REF_TYPE" == "tag" ]; then
+  #           echo "BUILD_TYPE=Release" >> "$GITHUB_ENV"
+  #           echo "BUILD_VERSION=${GITHUB_REF_NAME:1}" >> "$GITHUB_ENV"
+  #       else
+  #           echo "BUILD_TYPE=Debug" >> "$GITHUB_ENV"
+  #           echo "BUILD_VERSION=DEVBUILD" >> "$GITHUB_ENV"
+  #       fi
+  #       echo "BUILD PARM =========="
+  #       cat $GITHUB_ENV
+
+  #   - name: Build
+  #     run: |
+  #         cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DDEXED_ID=${{ env.BUILD_VERSION }}
+  #         cmake --build ${{github.workspace}}/build --config ${{ env.BUILD_TYPE }}
+
+  #   - name: Show
+  #     run: ls -lR ${{github.workspace}}/build
+
+  #   - name: Upload
+  #     uses: actions/upload-artifact@v4
+  #     with:
+  #       name: macos-bin
+  #       path: |
+  #         ${{github.workspace}}/build/Source/*_artefacts/${{env.BUILD_TYPE}}/VST3/*.vst3/**
+  #         ${{github.workspace}}/build/Source/*_artefacts/${{env.BUILD_TYPE}}/CLAP/*.clap/**
+  #         ${{github.workspace}}/build/Source/*_artefacts/${{env.BUILD_TYPE}}/AU/*.component/**
+  #         ${{github.workspace}}/build/Source/*_artefacts/${{env.BUILD_TYPE}}/Standalone/*.app/**
 
   build-windows:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
-         submodules: recursive
+          submodules: recursive
 
-    - name: Configure CMake
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+    - name: Set build type
+      shell: bash
+      run: |
+        if [ "$GITHUB_REF_TYPE" == "tag" ]; then
+            echo "BUILD_TYPE=Release" >> "$GITHUB_ENV"
+            echo "BUILD_VERSION=${GITHUB_REF_NAME:1}" >> "$GITHUB_ENV"
+        else
+            echo "BUILD_TYPE=Debug" >> "$GITHUB_ENV"
+            echo "BUILD_VERSION=$GITHUB_REF_NAME" >> "$GITHUB_ENV"
+            echo "CMAKE_CXX_FLAGS='-D DEXED_ID=\"$BUILD_VERSION\"'" >> "$GITHUB_ENV"
+
+        fi
+        echo "BUILD PARM =========="
+        cat $GITHUB_ENV
 
     - name: Build
-      # Build your program with the given configuration
-      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+      run: |
+          cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}
+          cmake --build ${{github.workspace}}/build --config ${{ env.BUILD_TYPE }}
 
     - name: Show
       shell: cmd
       run: dir /s ${{github.workspace}}\build
 
     - name: Upload
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: windows-bin
         path: |
-          ${{github.workspace}}/build/Source/*_artefacts/${{env.BUILD_TYPE}}/VST3/**
-          ${{github.workspace}}/build/Source/*_artefacts/${{env.BUILD_TYPE}}/CLAP/*.clap/**
-          ${{github.workspace}}/build/Source/*_artefacts/${{env.BUILD_TYPE}}/Standalone/*
-
+          ${{github.workspace}}/build/Source/*_artefacts/${{ env.BUILD_TYPE }}/VST3/*.vst3/**
+          ${{github.workspace}}/build/Source/*_artefacts/${{ env.BUILD_TYPE }}/CLAP/*.clap/**
+          ${{github.workspace}}/build/Source/*_artefacts/${{ env.BUILD_TYPE }}/Standalone/*.exe
diff --git a/Source/Dexed.h b/Source/Dexed.h
@@ -23,7 +23,9 @@
 
 void dexed_trace(const char *source, const char *fmt, ...);
 
-#define DEXED_ID "DEVBUILD"
+#ifndef DEXED_ID
+    #define DEXED_ID "DEVBUILD"
+#endif
 
 #ifdef DEBUG
     #define DEXED_VERSION DEXED_ID " DEBUG"

diff --git a/libs/JUCE b/libs/JUCE