diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a44e992..f659a9c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,7 +82,7 @@ jobs: run: cargo bundle --release --features desktop --bin cagire-desktop --target ${{ matrix.target }} - name: Bundle CLAP plugin - run: cargo xtask bundle cagire-clap --release --target ${{ matrix.target }} + run: cargo xtask bundle cagire-plugins --release --target ${{ matrix.target }} - name: Zip macOS app bundle if: runner.os == 'macOS' @@ -129,13 +129,13 @@ jobs: uses: actions/upload-artifact@v4 with: name: ${{ matrix.artifact }}-clap - path: target/bundled/cagire-clap.clap + path: target/bundled/cagire-plugins.clap - name: Upload VST3 artifact uses: actions/upload-artifact@v4 with: name: ${{ matrix.artifact }}-vst3 - path: target/bundled/cagire-clap.vst3 + path: target/bundled/cagire-plugins.vst3 universal-macos: needs: build @@ -176,31 +176,31 @@ jobs: - name: Create universal CLAP plugin run: | - mkdir -p cagire-clap.clap/Contents/MacOS - cp artifacts/cagire-macos-aarch64-clap/cagire-clap.clap/Contents/Info.plist \ - cagire-clap.clap/Contents/ 2>/dev/null || true - cp artifacts/cagire-macos-aarch64-clap/cagire-clap.clap/Contents/PkgInfo \ - cagire-clap.clap/Contents/ 2>/dev/null || true + mkdir -p cagire-plugins.clap/Contents/MacOS + cp artifacts/cagire-macos-aarch64-clap/cagire-plugins.clap/Contents/Info.plist \ + cagire-plugins.clap/Contents/ 2>/dev/null || true + cp artifacts/cagire-macos-aarch64-clap/cagire-plugins.clap/Contents/PkgInfo \ + cagire-plugins.clap/Contents/ 2>/dev/null || true lipo -create \ - artifacts/cagire-macos-x86_64-clap/cagire-clap.clap/Contents/MacOS/cagire-clap \ - artifacts/cagire-macos-aarch64-clap/cagire-clap.clap/Contents/MacOS/cagire-clap \ - -output cagire-clap.clap/Contents/MacOS/cagire-clap - lipo -info cagire-clap.clap/Contents/MacOS/cagire-clap + artifacts/cagire-macos-x86_64-clap/cagire-plugins.clap/Contents/MacOS/cagire-plugins \ + artifacts/cagire-macos-aarch64-clap/cagire-plugins.clap/Contents/MacOS/cagire-plugins \ + -output cagire-plugins.clap/Contents/MacOS/cagire-plugins + lipo -info cagire-plugins.clap/Contents/MacOS/cagire-plugins - name: Create universal VST3 plugin run: | - mkdir -p cagire-clap.vst3/Contents/MacOS - cp -R artifacts/cagire-macos-aarch64-vst3/cagire-clap.vst3/Contents/Info.plist \ - cagire-clap.vst3/Contents/ 2>/dev/null || true - cp artifacts/cagire-macos-aarch64-vst3/cagire-clap.vst3/Contents/PkgInfo \ - cagire-clap.vst3/Contents/ 2>/dev/null || true - cp -R artifacts/cagire-macos-aarch64-vst3/cagire-clap.vst3/Contents/Resources \ - cagire-clap.vst3/Contents/ 2>/dev/null || true + mkdir -p cagire-plugins.vst3/Contents/MacOS + cp -R artifacts/cagire-macos-aarch64-vst3/cagire-plugins.vst3/Contents/Info.plist \ + cagire-plugins.vst3/Contents/ 2>/dev/null || true + cp artifacts/cagire-macos-aarch64-vst3/cagire-plugins.vst3/Contents/PkgInfo \ + cagire-plugins.vst3/Contents/ 2>/dev/null || true + cp -R artifacts/cagire-macos-aarch64-vst3/cagire-plugins.vst3/Contents/Resources \ + cagire-plugins.vst3/Contents/ 2>/dev/null || true lipo -create \ - artifacts/cagire-macos-x86_64-vst3/cagire-clap.vst3/Contents/MacOS/cagire-clap \ - artifacts/cagire-macos-aarch64-vst3/cagire-clap.vst3/Contents/MacOS/cagire-clap \ - -output cagire-clap.vst3/Contents/MacOS/cagire-clap - lipo -info cagire-clap.vst3/Contents/MacOS/cagire-clap + artifacts/cagire-macos-x86_64-vst3/cagire-plugins.vst3/Contents/MacOS/cagire-plugins \ + artifacts/cagire-macos-aarch64-vst3/cagire-plugins.vst3/Contents/MacOS/cagire-plugins \ + -output cagire-plugins.vst3/Contents/MacOS/cagire-plugins + lipo -info cagire-plugins.vst3/Contents/MacOS/cagire-plugins - name: Build .pkg installer run: | @@ -231,13 +231,13 @@ jobs: uses: actions/upload-artifact@v4 with: name: cagire-macos-universal-clap - path: cagire-clap.clap + path: cagire-plugins.clap - name: Upload universal VST3 plugin uses: actions/upload-artifact@v4 with: name: cagire-macos-universal-vst3 - path: cagire-clap.vst3 + path: cagire-plugins.vst3 - name: Upload .pkg installer uses: actions/upload-artifact@v4 @@ -271,15 +271,15 @@ jobs: elif [[ "$name" == "cagire-macos-universal" ]]; then cp "$dir/cagire" "release/cagire-macos-universal" elif [[ "$name" == "cagire-macos-universal-clap" ]]; then - cd "$dir" && zip -r "../../release/cagire-macos-universal-clap.zip" cagire-clap.clap && cd ../.. + cd "$dir" && zip -r "../../release/cagire-macos-universal-clap.zip" cagire-plugins.clap && cd ../.. elif [[ "$name" == "cagire-macos-universal-vst3" ]]; then - cd "$dir" && zip -r "../../release/cagire-macos-universal-vst3.zip" cagire-clap.vst3 && cd ../.. + cd "$dir" && zip -r "../../release/cagire-macos-universal-vst3.zip" cagire-plugins.vst3 && cd ../.. elif [[ "$name" == *-clap ]]; then base="${name%-clap}" - cd "$dir" && zip -r "../../release/${base}-clap.zip" cagire-clap.clap && cd ../.. + cd "$dir" && zip -r "../../release/${base}-clap.zip" cagire-plugins.clap && cd ../.. elif [[ "$name" == *-vst3 ]]; then base="${name%-vst3}" - cd "$dir" && zip -r "../../release/${base}-vst3.zip" cagire-clap.vst3 && cd ../.. + cd "$dir" && zip -r "../../release/${base}-vst3.zip" cagire-plugins.vst3 && cd ../.. elif [[ "$name" == *-desktop ]]; then base="${name%-desktop}" if ls "$dir"/*.deb 1>/dev/null 2>&1; then diff --git a/Cargo.toml b/Cargo.toml index 7ac8363..c200177 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -members = ["crates/forth", "crates/markdown", "crates/project", "crates/ratatui", "crates/clap", "crates/baseview", "crates/egui-baseview", "xtask"] +members = ["crates/forth", "crates/markdown", "crates/project", "crates/ratatui", "crates/plugins", "crates/baseview", "crates/egui-baseview", "xtask"] [workspace.package] version = "0.0.9" diff --git a/crates/clap/Cargo.toml b/crates/plugins/Cargo.toml similarity index 91% rename from crates/clap/Cargo.toml rename to crates/plugins/Cargo.toml index 2e88d74..a4392c0 100644 --- a/crates/clap/Cargo.toml +++ b/crates/plugins/Cargo.toml @@ -1,10 +1,10 @@ [package] -name = "cagire-clap" +name = "cagire-plugins" version.workspace = true edition.workspace = true authors.workspace = true license.workspace = true -description = "Cagire as a CLAP audio plugin" +description = "Cagire as a CLAP/VST3 audio plugin" [lib] crate-type = ["cdylib", "lib"] diff --git a/crates/clap/src/editor.rs b/crates/plugins/src/editor.rs similarity index 100% rename from crates/clap/src/editor.rs rename to crates/plugins/src/editor.rs diff --git a/crates/clap/src/input_egui.rs b/crates/plugins/src/input_egui.rs similarity index 100% rename from crates/clap/src/input_egui.rs rename to crates/plugins/src/input_egui.rs diff --git a/crates/clap/src/lib.rs b/crates/plugins/src/lib.rs similarity index 100% rename from crates/clap/src/lib.rs rename to crates/plugins/src/lib.rs diff --git a/crates/clap/src/main.rs b/crates/plugins/src/main.rs similarity index 93% rename from crates/clap/src/main.rs rename to crates/plugins/src/main.rs index a811ab8..7f1d8ff 100644 --- a/crates/clap/src/main.rs +++ b/crates/plugins/src/main.rs @@ -1,4 +1,4 @@ -use cagire_clap::CagirePlugin; +use cagire_plugins::CagirePlugin; use nih_plug::prelude::*; fn main() { diff --git a/crates/clap/src/params.rs b/crates/plugins/src/params.rs similarity index 100% rename from crates/clap/src/params.rs rename to crates/plugins/src/params.rs