Develop

.github/scripts/package-Windows.sh

@@ -4,9 +4,9 @@ if [[ $1 == "x64" ]]; then
   X64BitMode="x64"
 fi
 
-VERSION=0.8.3
+VERSION=0.9.0
 
-rm -f ./plugdata.wxs 
+rm -f ./plugdata.wxs
 cat > ./plugdata.wxs <<-EOL
 <?xml version="1.0"?>
 <?define ProductVersion = "$VERSION" ?>
@@ -25,7 +25,7 @@ cat > ./plugdata.wxs <<-EOL
 <?endif ?>
 <Wix
 	xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="*" UpgradeCode="\$(var.ProductUpgradeCode)" 
+	<Product Id="*" UpgradeCode="\$(var.ProductUpgradeCode)"
             Name="plugdata" Version="\$(var.ProductVersion)" Manufacturer="Timothy Schoen" Language="1033">
 		<Package InstallerVersion="200" Compressed="yes" Comments="Windows Installer Package"/>
 		<Media Id="1" Cabinet="product.cab" EmbedCab="yes"/>
@@ -52,9 +52,9 @@ cat > ./plugdata.wxs <<-EOL
 			<Directory Id="ProgramMenuFolder">
 				<Directory Id="ProgramMenuSubfolder" Name="plugdata">
 					<Component Id="STANDALONE_SHORTCUTS" Guid="8f2ac8c2-b3bc-4d3c-8097-b62b5eed28ae">
-						<Shortcut Id="ApplicationShortcut1" Name="plugdata" Description="plugdata" 
+						<Shortcut Id="ApplicationShortcut1" Name="plugdata" Description="plugdata"
                             Target="[INSTALLDIR]plugdata.exe" WorkingDirectory="INSTALLDIR"/>
-						<RegistryValue Root="HKCU" Key="Software\plugdata\plugdata" 
+						<RegistryValue Root="HKCU" Key="Software\plugdata\plugdata"
                             Name="installed" Type="integer" Value="1" KeyPath="yes"/>
 						<RemoveFolder Id="ProgramMenuSubfolder" On="uninstall"/>
 					</Component>
@@ -170,12 +170,12 @@ EOL
 
 
 if [[ $X64BitMode == "x64" ]]; then
-"C:/Program Files (x86)/WiX Toolset v3.11/bin/candle" -arch x64 plugdata.wxs
-"C:/Program Files (x86)/WiX Toolset v3.11/bin/light" plugdata.wixobj -out plugdata-Installer.msi -ext WixUIExtension
+"C:/Program Files (x86)/WiX Toolset v3.14/bin/candle" -arch x64 plugdata.wxs
+"C:/Program Files (x86)/WiX Toolset v3.14/bin/light" plugdata.wixobj -out plugdata-Installer.msi -ext WixUIExtension
 cp ".\plugdata-Installer.msi" ".\plugdata-Win64.msi"
 else
-"C:/Program Files (x86)/WiX Toolset v3.11/bin/candle" plugdata.wxs
-"C:/Program Files (x86)/WiX Toolset v3.11/bin/light" plugdata.wixobj -out plugdata-Installer.msi -ext WixUIExtension
+"C:/Program Files (x86)/WiX Toolset v3.14/bin/candle" plugdata.wxs
+"C:/Program Files (x86)/WiX Toolset v3.14/bin/light" plugdata.wixobj -out plugdata-Installer.msi -ext WixUIExtension
 cp ".\plugdata-Installer.msi" ".\plugdata-Win32.msi"
 fi
 

.github/scripts/package-macOS.sh

@@ -40,7 +40,7 @@ build_flavor()
 
   mkdir -p $TMPDIR
   cp -a $flavorprod $TMPDIR
-  
+
   pkgbuild --analyze --root $TMPDIR ${PKG_DIR}/${PRODUCT_NAME}_${flavor}.plist
   plutil -replace BundleIsRelocatable -bool NO ${PKG_DIR}/${PRODUCT_NAME}_${flavor}.plist
   plutil -replace BundleIsVersionChecked -bool NO ${PKG_DIR}/${PRODUCT_NAME}_${flavor}.plist
@@ -155,14 +155,14 @@ rm -r $PKG_DIR
 if [ -z "$AC_USERNAME" ]; then
     echo "No user name, skipping sign/notarize"
     # pretend that we signed the package and bail out
-    mv ${PRODUCT_NAME}.pkg ${PRODUCT_NAME}-MacOS-Universal.pkg
+    mv ${PRODUCT_NAME}.pkg ${PRODUCT_NAME}-MacOS-$1.pkg
     exit 0
 fi
 
 # Sign installer
-productsign -s "Developer ID Installer: Timothy Schoen (7SV7JPRR2L)" ${PRODUCT_NAME}.pkg ${PRODUCT_NAME}-MacOS-Universal.pkg
+productsign -s "Developer ID Installer: Timothy Schoen (7SV7JPRR2L)" ${PRODUCT_NAME}.pkg ${PRODUCT_NAME}-MacOS-$1.pkg
 
 # Notarize installer
 xcrun notarytool store-credentials "notary_login" --apple-id ${AC_USERNAME} --password ${AC_PASSWORD} --team-id "7SV7JPRR2L"
-xcrun notarytool submit ./plugdata-MacOS-Universal.pkg --keychain-profile "notary_login" --wait
-xcrun stapler staple "plugdata-MacOS-Universal.pkg"
+xcrun notarytool submit ./plugdata-MacOS-$1.pkg --keychain-profile "notary_login" --wait
+xcrun stapler staple "plugdata-MacOS-$1.pkg"

.github/workflows/cmake.yml

@@ -23,11 +23,11 @@ jobs:
         key: macos
 
     - name: Create Build Environment
-      run: cmake -E make_directory ${{github.workspace}}/build        
+      run: cmake -E make_directory ${{github.workspace}}/build
 
     - name: Configure CMake
       working-directory: ${{github.workspace}}/build
-      run: cmake $GITHUB_WORKSPACE -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DBUILD_OFELIA=1
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
 
     - name: Check for Code-Signing secrets
       id: secret-check
@@ -42,7 +42,7 @@ jobs:
     - name: Import Code-Signing Certificates
       uses: figleafteam/import-codesign-certs@v2
       if: ${{ steps.secret-check.outputs.available == 'true' }}
-      with: 
+      with:
         p12-file-base64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
         p12-password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}
 
@@ -55,7 +55,7 @@ jobs:
       env:
         AC_USERNAME: ${{ secrets.AC_USERNAME }}
         AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
-      run: ./.github/scripts/package-macOS.sh
+      run: ./.github/scripts/package-macOS.sh Universal
 
     - name: Upload to server
       env:
@@ -78,6 +78,76 @@ jobs:
         draft: true
         files: plugdata-macOS-Universal
 
+  macos-legacy-build:
+    runs-on: macos-12
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+        fetch-depth: 0
+
+    - name: ccache
+      uses: hendrikmuhs/ccache-action@v1.2
+      with:
+        key: macos
+
+    - name: Create Build Environment
+      run: cmake -E make_directory ${{github.workspace}}/build
+
+    - name: Configure CMake
+      working-directory: ${{github.workspace}}/build
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DNANOVG_METAL_IMPLEMENTATION=0 -DMACOS_LEGACY=1
+
+    - name: Check for Code-Signing secrets
+      id: secret-check
+      shell: bash
+      run: |
+        if [ "${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}" != '' ]; then
+          echo "available=true" >> $GITHUB_OUTPUT;
+        else
+          echo "available=false" >> $GITHUB_OUTPUT;
+        fi
+
+    - name: Import Code-Signing Certificates
+      uses: figleafteam/import-codesign-certs@v2
+      if: ${{ steps.secret-check.outputs.available == 'true' }}
+      with:
+        p12-file-base64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
+        p12-password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}
+
+    - name: Build
+      working-directory: ${{github.workspace}}/build
+      run: cmake --build . --config $BUILD_TYPE
+
+    - name: Creating Installer
+      working-directory: ${{github.workspace}}
+      env:
+        AC_USERNAME: ${{ secrets.AC_USERNAME }}
+        AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
+      run: ./.github/scripts/package-macOS.sh Legacy
+
+    - name: Upload to server
+      env:
+        FTP_USERNAME: ${{ secrets.FTP_USERNAME }}
+        FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }}
+        GIT_HASH: ${{ github.sha }}
+      run: ./.github/scripts/upload-ftp.sh plugdata-macOS-Legacy.pkg
+
+    - name: Archive Artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: plugdata-macOS-Legacy
+        path: plugdata-macOS-Legacy.pkg
+
+    - name: Release Artifacts
+      uses: softprops/action-gh-release@v1
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        prerelease: true
+        draft: true
+        files: plugdata-macOS-Legacy
+
   windows-64-build:
     runs-on: windows-2022
     steps:
@@ -87,12 +157,12 @@ jobs:
         fetch-depth: 0
 
     - name: Create Build Environment
-      run: cmake -E make_directory ${{github.workspace}}/build 
+      run: cmake -E make_directory ${{github.workspace}}/build
 
     - name: Configure CMake
       shell: bash
       working-directory: ${{github.workspace}}/build
-      run: cmake $GITHUB_WORKSPACE -G "Visual Studio 17 2022" -A x64 -DENABLE_TESTING=0 -DBUILD_OFELIA=1
+      run: cmake $GITHUB_WORKSPACE -G "Visual Studio 17 2022" -A x64
 
     - name: Build
       shell: bash
@@ -142,7 +212,7 @@ jobs:
     - name: Configure CMake
       shell: bash
       working-directory: ${{github.workspace}}/build
-      run: cmake $GITHUB_WORKSPACE -G "Visual Studio 17 2022" -A Win32 -DENABLE_TESTING=0 -DBUILD_OFELIA=1
+      run: cmake $GITHUB_WORKSPACE -G "Visual Studio 17 2022" -A Win32
 
     - name: Build
       shell: bash
@@ -215,19 +285,19 @@ jobs:
       steps:
         - name: Install Dependencies (dnf)
           if: ${{ matrix.pacman == 'dnf' }}
-          run: dnf install -y git cmake alsa-lib-devel libXinerama-devel freetype-devel curl libcurl-devel wget bzip2 gcc-c++ libXi-devel libXcomposite-devel freeglut-devel libXrandr-devel libXcursor-devel xz ccache python python3-pip
+          run: dnf install -y git cmake alsa-lib-devel libXinerama-devel freetype-devel curl libcurl-devel wget bzip2 gcc-c++ libXi-devel libXcomposite-devel freeglut-devel libXrandr-devel libXcursor-devel xz ccache python python3-pip jack-audio-connection-kit-devel
 
         - name: Install Dependencies (apt)
           if: ${{ matrix.pacman == 'apt' }}
-          run: apt update && DEBIAN_FRONTEND=noninteractive TZ="Europe/Amsterdam" apt install -y cmake git wget bzip2 build-essential libasound2-dev libjack-jackd2-dev curl libcurl4-openssl-dev libfreetype6-dev libx11-dev libxi-dev libxcomposite-dev libxcursor-dev libxcursor-dev libxext-dev libxrandr-dev libxinerama-dev ccache python3 python3-pip
+          run: apt update && DEBIAN_FRONTEND=noninteractive TZ="Europe/Amsterdam" apt install -y cmake git wget bzip2 build-essential libasound2-dev libjack-jackd2-dev curl libcurl4-openssl-dev libfreetype6-dev libx11-dev libxi-dev libxcomposite-dev libxcursor-dev libxcursor-dev libxext-dev libxrandr-dev libxinerama-dev ccache python3 python3-pip freeglut3-dev
 
         - name: Install Dependencies (zypper)
           if: ${{ matrix.pacman == 'zypper' }}
           run: zypper refresh && zypper install -y git rsync wget bzip2 xz tar gzip cmake alsa-lib-devel libXinerama-devel libXi-devel freetype-devel libcurl-devel libXcomposite-devel freeglut-devel libXrandr-devel libXcursor-devel freetype2-devel gcc gcc-c++ curl ccache python python3-pip
 
         - name: Install Dependencies (pacman)
           if: ${{ matrix.pacman == 'pacman' }}
-          run: pacman -Sy && pacman -S --noconfirm cmake wget bzip2 git alsa-lib freetype2 libx11 libxcursor libxi libxext libxinerama libxrandr libxrender webkit2gtk cmake make gcc pkgconf python python-pip curl ccache && pacman --noconfirm -Syu
+          run: pacman -Sy && pacman -S --noconfirm cmake wget bzip2 git alsa-lib freetype2 libx11 libxcursor libxi libxext libxinerama libxrandr libxrender webkit2gtk cmake make gcc pkgconf python python-pip curl ccache freeglut mesa glfw-x11 glew jack2 openssl && pacman --noconfirm -Syu
 
         - uses: actions/checkout@v3
           with:
@@ -245,7 +315,7 @@ jobs:
 
         - name: Configure
           working-directory: ${{github.workspace}}
-          run: mkdir build && cd build && CXX=g++ cmake -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DENABLE_TESTING=0 -DBUILD_OFELIA=1 .. -G "Unix Makefiles"
+          run: mkdir build && cd build && CXX=g++ cmake -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache .. -G "Unix Makefiles"
 
         - name: Build
           working-directory: ${{github.workspace}}/build
@@ -274,4 +344,4 @@ jobs:
           with:
               prerelease: true
               draft: true
-              files: plugdata-${{ matrix.name }}
+              files: plugdata-${{ matrix.name }}

.gitmodules

@@ -1,12 +1,9 @@
 [submodule "JUCE"]
 	path = Libraries/JUCE
-	url = https://github.com/juce-framework/JUCE.git
+	url = https://github.com/plugdata-team/JUCE.git
 [submodule "Libraries/pure-data"]
 	path = Libraries/pure-data
 	url = https://github.com/plugdata-team/plugdata-pd
-[submodule "Libraries/Catch2"]
-	path = Libraries/Catch2
-	url = https://github.com/catchorg/Catch2.git
 [submodule "Libraries/heavylib"]
 	path = Libraries/heavylib
 	url = https://github.com/Wasted-Audio/heavylib.git
@@ -16,23 +13,12 @@
 [submodule "Libraries/clap-juce-extensions"]
 	path = Libraries/clap-juce-extensions
 	url = https://github.com/free-audio/clap-juce-extensions.git
-[submodule "Libraries/filesystem"]
-	path = Libraries/filesystem
-	url = https://github.com/boostorg/filesystem.git
-[submodule "Libraries/cpath"]
-	path = Libraries/cpath
-	url = https://github.com/BraedonWooding/cpath
-[submodule "Libraries/plugdata-ofelia"]
-	path = Libraries/plugdata-ofelia
-	url = https://github.com/plugdata-team/plugdata-ofelia
 [submodule "Libraries/pd-else"]
 	path = Libraries/pd-else
 	url = https://github.com/timothyschoen/pd-else.git
 [submodule "Libraries/juce-raw-keyboard-input-module"]
 	path = Libraries/juce-raw-keyboard-input-module
 	url = https://github.com/izzyreal/juce-raw-keyboard-input-module.git
-[submodule "./JUCE"]
-	url = https://github.com/plugdata-team/JUCE.git
 [submodule "Libraries/readerwriterqueue"]
 	path = Libraries/readerwriterqueue
 	url = https://github.com/cameron314/readerwriterqueue.git
@@ -42,3 +28,18 @@
 [submodule "Libraries/melatonin_blur"]
 	path = Libraries/melatonin_blur
 	url = https://github.com/sudara/melatonin_blur.git
+[submodule "Libraries/Gem"]
+	path = Libraries/Gem
+	url = https://github.com/plugdata-team/plugdata-gem.git
+[submodule "Libraries/ghc_filesystem"]
+	path = Libraries/ghc_filesystem
+	url = https://github.com/gulrak/filesystem.git
+[submodule "Libraries/nanovg"]
+	path = Libraries/nanovg
+	url = https://github.com/timothyschoen/nanovg.git
+[submodule "Libraries/plf_stack"]
+	path = Libraries/plf_stack
+	url = https://github.com/mattreecebentley/plf_stack.git
+[submodule "Libraries/pd-cyclone"]
+	path = Libraries/pd-cyclone
+	url = https://github.com/timothyschoen/pd-cyclone