From 00e334d56cd9135cc1d930af5e6df9a140a46037 Mon Sep 17 00:00:00 2001 From: Michael Willis Date: Thu, 12 May 2022 22:10:55 -0600 Subject: [PATCH 1/7] Add MacOS build to github build.yml --- .github/workflows/build.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f07f250e5..14dc81851 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -98,6 +98,29 @@ jobs: name: Linux tarball path: ${{runner.workspace}}/build/${{env.install_name}}.tar.gz + build_for_macos: + runs-on: macos-10.15 + steps: + - name: Set install name + run: | + echo "install_ref=${GITHUB_REF##*/}" >> "$GITHUB_ENV" + echo "install_name=sfizz-${GITHUB_REF##*/}-linux" >> "$GITHUB_ENV" + - uses: actions/checkout@v2 + with: + submodules: recursive + - name: Build mac universal + run: | + mkdir build + cd build + cmake .. + make + cd .. + - uses: actions/upload-artifact@v2 + with: + name: MacOS build + path: | + build/sfizz.* + build_for_mod: runs-on: ubuntu-18.04 container: From f1fed9462e6bd25beedb1f1bd1793ef717e18e59 Mon Sep 17 00:00:00 2001 From: Michael Willis Date: Thu, 19 May 2022 21:20:58 -0600 Subject: [PATCH 2/7] Build MacOS installer --- .github/workflows/build.yml | 47 +++++++++++++++++++++++++++------- scripts/package-osx-bundles.sh | 40 +++++++++++++++++++++++++++++ scripts/plugin.pkg/package.xml | 22 ++++++++++++++++ scripts/plugin.pkg/welcome.txt | 3 +++ 4 files changed, 103 insertions(+), 9 deletions(-) create mode 100755 scripts/package-osx-bundles.sh create mode 100644 scripts/plugin.pkg/package.xml create mode 100644 scripts/plugin.pkg/welcome.txt diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 14dc81851..967141ff3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -104,22 +104,51 @@ jobs: - name: Set install name run: | echo "install_ref=${GITHUB_REF##*/}" >> "$GITHUB_ENV" - echo "install_name=sfizz-${GITHUB_REF##*/}-linux" >> "$GITHUB_ENV" + echo "install_name=sfizz-${GITHUB_REF##*/}-macos" >> "$GITHUB_ENV" - uses: actions/checkout@v2 with: submodules: recursive - - name: Build mac universal + - name: Create Build Environment + shell: bash + working-directory: ${{runner.workspace}} + run: cmake -E make_directory build + - name: Configure CMake + shell: bash + working-directory: ${{runner.workspace}}/build + run: | + cmake "$GITHUB_WORKSPACE" \ + -DCMAKE_BUILD_TYPE=Release \ + -DSFIZZ_AU=ON \ + -DSFIZZ_LV2=ON \ + -DSFIZZ_LV2_UI=ON \ + -DSFIZZ_VST=ON \ + -DSFIZZ_JACK=OFF \ + -DSFIZZ_TESTS=OFF \ + -DSFIZZ_SHARED=OFF \ + -DSFIZZ_STATIC_DEPENDENCIES=OFF + - name: Build plugins + shell: bash + working-directory: ${{runner.workspace}}/build + run: cmake --build . --config "Release" -j 2 + - name: Package OSX bundles + shell: bash + working-directory: ${{runner.workspace}} + run: ./sfizz/scripts/package-osx-bundles.sh + - name: Create OSX installer + shell: bash + working-directory: ${{runner.workspace}}/build run: | - mkdir build - cd build - cmake .. - make - cd .. + productbuild \ + --distribution $GITHUB_WORKSPACE/scripts/plugin.pkg/package.xml \ + --identifier "sfz.tools.sfizz" \ + --package-path "${{runner.workspace}}/build" \ + --version 0 \ + ${{env.install_name}}.pkg - uses: actions/upload-artifact@v2 with: - name: MacOS build + name: MacOS installer path: | - build/sfizz.* + ${{runner.workspace}}/build/${{env.install_name}}.pkg build_for_mod: runs-on: ubuntu-18.04 diff --git a/scripts/package-osx-bundles.sh b/scripts/package-osx-bundles.sh new file mode 100755 index 000000000..8d24bf37f --- /dev/null +++ b/scripts/package-osx-bundles.sh @@ -0,0 +1,40 @@ +#!/bin/bash +# Adapted from Distrho's package-osx-bundles.sh script + +set -e + +if [ -d build ]; then + cd build +else + echo "Please run this script from the root folder" + exit +fi + +rm -rf au +rm -rf lv2 +rm -rf vst3 + +mkdir au lv2 vst3 +mv sfizz.component au/ +mv sfizz.lv2 lv2/ +mv sfizz.vst3 vst3/ + +pkgbuild \ + --identifier "sfz.tools.sfizz.au.bundle" \ + --install-location "/Library/Audio/Plug-Ins/Component/" \ + --root "${PWD}/au/" \ + sfz-tools-sfizz-au-bundle.pkg + +pkgbuild \ + --identifier "sfz.tools.sfizz.lv2.bundle" \ + --install-location "/Library/Audio/Plug-Ins/LV2/" \ + --root "${PWD}/lv2/" \ + sfz-tools-sfizz-lv2-bundle.pkg + +pkgbuild \ + --identifier "sfz.tools.sfizz.vst3.bundle" \ + --install-location "/Library/Audio/Plug-Ins/VST3/" \ + --root "${PWD}/vst3/" \ + sfz-tools-sfizz-vst3-bundle.pkg + +cd .. \ No newline at end of file diff --git a/scripts/plugin.pkg/package.xml b/scripts/plugin.pkg/package.xml new file mode 100644 index 000000000..51e64e99e --- /dev/null +++ b/scripts/plugin.pkg/package.xml @@ -0,0 +1,22 @@ + + + sfizz + + + + + + sfz-tools-sfizz-au-bundle.pkg + + + sfz-tools-sfizz-lv2-bundle.pkg + + + sfz-tools-sfizz-vst3-bundle.pkg + + + + + + + diff --git a/scripts/plugin.pkg/welcome.txt b/scripts/plugin.pkg/welcome.txt new file mode 100644 index 000000000..2db111519 --- /dev/null +++ b/scripts/plugin.pkg/welcome.txt @@ -0,0 +1,3 @@ +OSX installer for sfizz + +sfizz is a sample-based musical synthesizer. \ No newline at end of file From 9cd56f90b90701b158bfaddf554dd39f3cd533fa Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Mon, 25 Jul 2022 10:26:35 +0200 Subject: [PATCH 3/7] Retire travis and appveyor --- .appveyor.yml | 65 --------------------------- .travis.yml | 68 ----------------------------- .travis/discord_webhook.sh | 8 ---- .travis/download_cmake.sh | 13 ------ .travis/download_static_libs.sh | 6 --- .travis/prepare_tarball.sh | 14 ------ .travis/script_library.sh | 11 ----- .travis/script_plugins.sh | 14 ------ .travis/script_test_and_build.sh | 21 --------- README.md | 3 +- scripts/appveyor/after_build.sh | 75 -------------------------------- scripts/appveyor/before_build.sh | 19 -------- scripts/appveyor/install.sh | 47 -------------------- 13 files changed, 1 insertion(+), 363 deletions(-) delete mode 100644 .appveyor.yml delete mode 100644 .travis.yml delete mode 100755 .travis/discord_webhook.sh delete mode 100755 .travis/download_cmake.sh delete mode 100755 .travis/download_static_libs.sh delete mode 100755 .travis/prepare_tarball.sh delete mode 100755 .travis/script_library.sh delete mode 100755 .travis/script_plugins.sh delete mode 100755 .travis/script_test_and_build.sh delete mode 100755 scripts/appveyor/after_build.sh delete mode 100644 scripts/appveyor/before_build.sh delete mode 100644 scripts/appveyor/install.sh diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index cf383f9d3..000000000 --- a/.appveyor.yml +++ /dev/null @@ -1,65 +0,0 @@ -version: build-{build} -configuration: Release - -environment: - matrix: - - job_name: macOS - appveyor_build_worker_image: macos - INSTALL_DIR: sfizz-$(APPVEYOR_REPO_TAG_NAME)-macos - - # Apple Developer identity - CODESIGN_IDENTITY: "Apple Development: Paul Ferrand (6N2PMAKWGG)" - CODESIGN_P12: - secure: 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 - CODESIGN_PASSWORD: - secure: UHxmHC5WLuA44nAJDWbQmyDx5PObQmOagRKHZesx/vTgaTcyij8N38iVRicmldYdL9CwKjfnkqMMFtHwGkPT2aSBnTeF4M34w4iPiPpSvvQ= - SFZTOOLS_CRT: - secure: VkG8KA5WsGtoxVsfcJ8NXneNncbXOFgQRV78IjLhJRRPOhIOF3SJN5DsZ2efJczwDs4hsu4IGHaZLYaIjDXlLR8VQmORa1DK2DBtedrCvcc7v5VTGkVIvLp4WjaMXLu9QSV/6X5VGMLKC7rLFkBSxSdPpNTrbcq+yl2lwKUykBFERMOsmhaOu4tqgDlqbh3o8veXSoxGxyMP+lQdLTcO4R24VRDsPqg7/Ol14eOlsV/t9/Aq4eUYScAnItXT1uP6vSpEfHXPstgUBwOWqNgZpMHzJNkpBnLhoeqd8EKCtAqwQ4+fJNR0QcH6Nv9x2ke0kZhi/WiVfIsPwe76UDzOc2u9kn2MtNNUa8oPAG8hjpqndv3Wluq3nWwD2rb/nuBR4PVZ+J3sCQ6SiyuN+K8GC0EN7Et8bJxinq9H+RZE1ZIThXyPmv4354+sgRA1GhWJ4vHQjWBsZx3H+z2gL0ReClIMgX8UoA7GZG6Zkb3eQKKNlHmNCqOCgoAZgfTlmH2gG4fQwUZsHJXTRYdKNeCsrlxhJ0iKY7T5gKVQy7ALvxf6EkBQJAL8f3vxazQc4Jjzx1rUgb1mQvx1p/WYtJcsmFqGAIPk/YQg/0iDZvS7QElKuOnIVD436CQwDqgU5EeZDLYraFQr8xWfm0hpqrknzvenlQz2/+wsCrq4IjgXVrJ2OTVOa5uxPdFVKNFBzkWYwNQYUvul8csc+w1XjVK1wp83kz64fSUXK1dPCxxj9wg4aSY6N3AudxnlOl20kqxig3CzyYDAofaE17xSHN3+wbA3ZRk3qoj0z/BQqus5U6sen6sjo7m4iex5yG1U7xBd6Dab/k7BWlaASa2blKd7tP4S3YnQQ6R6YnUJQ8TT3LtJ8hqiD+gpfcaK8bObTN3oBcewQwxLqgR1yks9pDEyRKVnI1HdtOVSLjIgGr7+MsdM/ox6K4kYgxHtozFyyfOhwOK3kshrnct4SMWc5AK2lm6IYXtXM94cb5Qv/nvLojKy7T6XFor2Wbp0KL60rkxHFoyfyT+qR7CAGet+NZvWRBzZXg0egIeLrTYgyppqu7yZkFMhXwBOyAD6Wyn3hbyIfPXqJCcHkeBaqd44erd8x/Shikrms7atu6CdnHYafEQiq5ZoQ3KfwQV88/nuCJU1lTjEzW5sv8HmcVq0TFMB7qUTo2LKNR8S797NJ/WLs3eqs4E+ird8ZFQ+z1L0WaD5Ci+EQN7uwznKYjNYTwQ7ftnr6Ua9Sm7FTOsKmhmuiugWJ6+ezKWUCIa9VhzLzwE+QvaF6PhvjW8afNhF+qcR8Omca6PIM5TkFMLgUKP19hO2ZMBj5tyk5zXQe/S40/v1WlcN2sWwFYq36TAiQhZTZYA1pM97/fGk4OdvGQwZ0coQ+OHhBIpEq2yoyTf8Icx7U0ODdb+JsKu4wQ5RfrooIi/ELbAO5IdZ14wZVNAej1tNzvEMs8zuhfkb1ixGbU4Zo+zQw8Z0o7v5idaW35ksk/EGoQKVillqblFg+fAs4Ksa+cKruux9CcDjbANYOwkFXNeLLPgSDbtIfRPGc0B45l/u4j2iLYuDUG0WPQeqF53SMS8lAIUbgAHgrZ8/iD01O23ik2qNAXuxeenppYZtxNIGI4vj1HvJY+yQu2dJVFZnNOOzoFhR+k8cTvU8MgBqaEKbhv/GDqioyKx+BBqfRUlUuHB85q1cXKRKdACfyrOn4jtPeYFZu8eTtgQvl7tH+eIA+8uAsK343/CSbc6ct4xNEaluYUSfH+wWtPw2+7rS/PEc2+rIYMjjO8PX0dffc6S2+LaU7Z9FgBnWPo920DIuwvG3n1uBhhGAAvTp1OsgFzVC1Z+Ktk8htmmS1XyVRURTpMumO6FdvmcUPOBoF37MsGDT4ZvNCM1Nn9tnt/iCGT+IUACX3RXkvVqIFrGnpDAluhwadg34o8/V4b50AJfpBSdNA13kViDGuwiSQTsDUvvRehOVpEuXAtg5mTx5 - - # Self-signed identity, with https://github.com/sfztools/code-signing - #CODESIGN_IDENTITY: codesign.sfz.tools - #CODESIGN_P12: - # secure: 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 - #CODESIGN_PASSWORD: - # secure: MdBjjykL0JHVnXeh3KbZ+8S1YtSi5rYz3tOxrlot3/FQrw7LeuISY8T+K/Xf1kZB4oQH/k8ht1DNxJOQ+k84AulqtHhWfuMYOHK4rm5RTho= - #SFZTOOLS_CRT: - # secure: OWNh97s3+yJBO6NfaF82v8fZzhw4cBLVEneVOS7Vab6kGaUcRs1E2VdYPzxKvnZmgLxWWbV9SCiHFpyJ4TFk35A1PVrEO9zzvVHJ0c9lfaJ3O1O57kgjwVMZErEiDbbU2MvaBIji43+L66sLYabBZpeIdM//J+MUGF0jw7ouujTT7bMGawKnkCzxsCH9BtAtRUyTMCC521CKcGqg+PeOfIxjoM3oW6KigZPCs7H+gOZ/PxeI3/VMcz3Ab4iDuDdof+rwuEO0NIKo9d1BFyW4OPp1/8vYJvv57X1w4mp4XWUt/4UUtrvKhkFg/k4ZmpTsYY99mAnGtmBCt8VNx5wxMXikHjP8/oPsGatAXYa5Yw0k0ZP0Vp41EItNsGoW1mX8/5Cr7Mk29LMkONnupTw//aeNIf/OXuiKvLSbBzhpIhbKacZlKLXix2ri9N7RudY1eJZQQD9YY3j/SzXnb6x/OGtS3EyR/VUcb5enL2G3Tp3JDVYGWyShuwjc8jBk1WthPAk+EEz4CaJQ3IM/I3tGPuiHvV6zOOIvza3yDS8s5EHlrszpvMsuL++BPNfhNV02vwAxT0eiQd2FNnV0lP93e63qRcw/Zl4x43p91jEKB1BxfeKfWUsQsczdrpTtmNV7IC1dUyAkBFFXfb3yxoJDU35e6f3Ile33PFVcs8rp04Tbv8aQxftEXbiiWtQ8wgbtBS4NyRWk4BoiaufIxqC6fqlq0sL6y2L32b1U3C2Yrpt/CcifUMS52sR9gvV43LYjlnU6KKZAz7Eb8jY6/VAnuwLjGjVFz5Ecr71oDnVRfDDsBSEuLUtFKx0mvkOvuPcYp9y24WLwjN6s1kUhZxLS6TAP3Ipt5pYpQC379IflIE8wiRjWcvf5rhWBw51hPP+G3iJ6C5aW2SBBo2GjzwY0uNPfJ2FOb/85bHVIe2XjW2Krwfc7EfOxdFCPW3lDLOt42+M3eMQxXzZjLVZ+W0wJu5apLj9cJKqNXJBZ7LPcAq3Y2enG49UT3Dbx3XX3GpPMVff++LmX9E+e5JkNzfD4bhYJQYI5QpjJEaJ9AW8F8c3e/Gm+C4z14JGU/kTWycJnm5KnoaR2mrmzZ5StL84nYLhKkyX7qvnQ0bARgxggoqu0aM1sy1TPzGbpb+9NnR3I7KtRz5d9NNjVvZja4jfq56e6GlEaPYpM098QuwW3HM6Q61Gv/F5cci00kcZda7i3QRjyjdMtsaukynfxvrZFHocsKF+37pFbhjrSz5JQbFGSYRlRlhwfz94wQy4BGQLz5WvQj/y5cwjPQ5bc30PFrcwa8w4qN8cgprV4fp0DavyjkeKWswh1s5vyccdO/WXJcmCRP7mh/+MF5Xq9o1qS9oTqZjxFHkwMWvlNrwAKYKZsyPGGaWS9axe8R+6b79YUIE8a48EUv8kGA4HW3LXW2oGiykULo3jY+VnTeDCfuAxmr0U7tiB7UUom2dYpH9aY7FbZUQq5pSpE5CPXSzF0QfFET57Kf3Y1MS4LAn50LNkaWhVSW5nlIIu2hiIpE6TRDXYaDZ2L+UWLrUwGjwyc/wXJmK4+nyzfSuAq06blDJmn8ODkk0ZKml2J4ovBUfIzkIAQeLtteXRQSxAaAGk9QKJmy//MiPRE098x109fTKNwnvDphKRZATBzrDyp0P3Grza8tynVYqUNzFZhLWUEg8VjVMrmW5LklWo3W1SQYDTT6LZS1uBs/Q5M0rz0+AZeHB9yP9PCkBN+KIOxTTtqxRBH3/OBG5SCuaSVi7z4WBSrfpgG/9M2Ll+Tx/OpKZAaloWI/0oJqVLhod4+BdTXGYz2D25PB/qKJtGMvBntsOzerXQjbHEZ9nXtZNZ3RqgsWFwuhd3Ej/5NixJBT3HuDw== - -for: -- matrix: - only: - - job_name: macOS - init: - - system_profiler SPSoftwareDataType - - cmake --version - - gcc -v - - xcodebuild -version - install: - - chmod +x ${APPVEYOR_BUILD_FOLDER}/scripts/appveyor/install.sh - - ${APPVEYOR_BUILD_FOLDER}/scripts/appveyor/install.sh - before_build: - - chmod +x ${APPVEYOR_BUILD_FOLDER}/scripts/appveyor/before_build.sh - - ${APPVEYOR_BUILD_FOLDER}/scripts/appveyor/before_build.sh - build_script: - - cd build - - cmake --build . -j2 --target sfizz_tests - - tests/sfizz_tests - - cmake --build . -j2 - after_build: - - chmod +x ${APPVEYOR_BUILD_FOLDER}/scripts/appveyor/after_build.sh - - ${APPVEYOR_BUILD_FOLDER}/scripts/appveyor/after_build.sh - test: off - artifacts: - - name: macOS DMG - path: "sfizz-*.dmg" - -deploy: -- provider: GitHub - auth_token: - secure: xOugGAynvnZdc0DXaL3rlgMf4CICFLkdO8JxoRfLQMKJhkj/kZ4d8h7NCFneDzXG - artifact: macOS DMG - draft: false - prerelease: false - force_update: true - on: - APPVEYOR_REPO_TAG: true diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 2ddb256c6..000000000 --- a/.travis.yml +++ /dev/null @@ -1,68 +0,0 @@ -language: cpp -os: linux -dist: bionic - -cache: - directories: - - vst/download/ - -jobs: - include: - - name: "Linux arm64 test and build" - arch: arm64-graviton2 - group: edge - virt: lxd - addons: - apt: - packages: - - libjack-jackd2-dev - - libsndfile1-dev - - libcairo2-dev - - libfontconfig1-dev - - libx11-xcb-dev - - libxcb-util-dev - - libxcb-cursor-dev - - libxcb-xkb-dev - - libxkbcommon-dev - - libxkbcommon-x11-dev - - libxcb-keysyms1-dev - install: .travis/download_cmake.sh - script: .travis/script_test_and_build.sh - - - name: "Linux arm64 static plugins" - arch: arm64-graviton2 - group: edge - virt: lxd - env: - - INSTALL_DIR="sfizz-plugins-${TRAVIS_BRANCH}-${TRAVIS_OS_NAME}-${TRAVIS_CPU_ARCH}" - - ENABLE_VST_PLUGIN=OFF - - ENABLE_LV2_UI=OFF - addons: - apt: - packages: - - libjack-jackd2-dev - - libsndfile1-dev - install: - - .travis/download_cmake.sh - - .travis/download_static_libs.sh - script: .travis/script_plugins.sh - after_success: .travis/prepare_tarball.sh - - - name: "Discord Webhook" - install: skip - script: bash ${TRAVIS_BUILD_DIR}/.travis/discord_webhook.sh success - -# Signal discord on failure -after_failure: -- bash ${TRAVIS_BUILD_DIR}/.travis/discord_webhook.sh failure - -deploy: - edge: true - provider: releases - file: "${INSTALL_DIR}.tar.gz" - token: - secure: jBIMWMPva8OazC8Wnqc2vqATa3exjvGDGvejEu6fgwt/BMDkgJCsJ7gS3ITpYFuO0HoHtLGfTVrFcZIE+agGVRdRGRni5xZRp5Vuf9hvLf8hCTaxkS/HYoliYYPp9FLY6J4yq9mp/R/QyGrwgssQEjhYlI2GL4+lJzt750AcmYibnQo2AMe5SSOp3q8KdLBG1vca1o1BZWBhW/S7l2hA1aJ7y1ytwm0ETIdrTZHxgfz7bqdqQcw/Ytqjm1rgzty6iQKX3B/InaZNB6CqXy6FoGLf771lery8nWJbjTjKYD4QK2NelExldyp1vrdHGvknWguFk+8vlQ16Dt0+R7Byr/LOPRLTCf/T+IehMQGtVA9/gjrkH8LqHy9oVFB+33p11gGu3h6hvg7yB6z3sSck0u4FHjrlpNd5XmmCsKQVQ9vI1cPPkVkbMHIewc7uOu+bD6cmotFj1vJ9UYesvN6n4siyCiPOIhgV9++bjcyiLqX3DWP5UWyZ9/VT8bz5VcxUdJnEYtdNPx4x5pRW4081VUjIf2EmHhQTrjb1iz6FAGwNU/fpefA8x+bBxXP9MkFFgU0tbCDKw2y6o0GOXX82mZr/IB0/DIBg7UllTzCBKTuiJQV1prFPlZLc6V22H5ozAXHgu3E+qNjvHoMsoYjGssX3+AYHwu8isBINo/gGo6Y= - on: - repo: "sfztools/sfizz" - tags: true - condition: ${TRAVIS_TAG} =~ ^v?[0-9] diff --git a/.travis/discord_webhook.sh b/.travis/discord_webhook.sh deleted file mode 100755 index 6931fba26..000000000 --- a/.travis/discord_webhook.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -set -ex - -# Travis Webhook -wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh -chmod +x send.sh -./send.sh ${1} ${WEBHOOK_URL} diff --git a/.travis/download_cmake.sh b/.travis/download_cmake.sh deleted file mode 100755 index 742e5c9bf..000000000 --- a/.travis/download_cmake.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -set -ex - -cmake_dir="cmake-3.13.0-${TRAVIS_OS_NAME}-${TRAVIS_CPU_ARCH}" -cmake_arc="${cmake_dir}.tar.gz" -cmake_url="https://github.com/sfztools/cmake/releases/download/${TRAVIS_OS_NAME}/${cmake_arc}" - -wget -q ${cmake_url} -tar xzf ${cmake_arc} -cd ${TRAVIS_BUILD_DIR}/${cmake_dir} -sudo cp bin/* /usr/local/bin/ -sudo cp -r share/* /usr/local/share/ diff --git a/.travis/download_static_libs.sh b/.travis/download_static_libs.sh deleted file mode 100755 index bb5115652..000000000 --- a/.travis/download_static_libs.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -ex - -wget -q https://github.com/sfztools/sndfile-libraries/releases/download/${TRAVIS_OS_NAME}/sndfile-libraries-${TRAVIS_OS_NAME}-${TRAVIS_CPU_ARCH}.tar.gz -tar xf sndfile-libraries-${TRAVIS_OS_NAME}-${TRAVIS_CPU_ARCH}.tar.gz -sudo cp -R sndfile-libraries-${TRAVIS_OS_NAME}-${TRAVIS_CPU_ARCH}/usr / diff --git a/.travis/prepare_tarball.sh b/.travis/prepare_tarball.sh deleted file mode 100755 index d19ce65d9..000000000 --- a/.travis/prepare_tarball.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -set -ex - -cd build -make DESTDIR=${PWD}/${INSTALL_DIR} install -tar -zcvf "${INSTALL_DIR}.tar.gz" ${INSTALL_DIR} - -# Only release a tarball if there is a tag -if [[ ${TRAVIS_TAG} != "" ]] && [[ ${DEPLOY_BUILD} ]]; then - mv "${INSTALL_DIR}.tar.gz" ${TRAVIS_BUILD_DIR} -fi - -cd .. diff --git a/.travis/script_library.sh b/.travis/script_library.sh deleted file mode 100755 index 20449edc4..000000000 --- a/.travis/script_library.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -set -ex - -mkdir -p build/${INSTALL_DIR} && cd build -cmake -DCMAKE_BUILD_TYPE=Release \ - -DSFIZZ_LV2=OFF \ - -DSFIZZ_VST=OFF \ - -DSFIZZ_TESTS=OFF \ - -DCMAKE_CXX_STANDARD=17 \ - .. -make -j2 diff --git a/.travis/script_plugins.sh b/.travis/script_plugins.sh deleted file mode 100755 index 5f84a42c3..000000000 --- a/.travis/script_plugins.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -set -ex - -mkdir -p build/${INSTALL_DIR} && cd build -cmake -DCMAKE_BUILD_TYPE=Release \ - -DSFIZZ_JACK=OFF \ - -DSFIZZ_VST="$ENABLE_VST_PLUGIN" \ - -DSFIZZ_LV2_UI="$ENABLE_LV2_UI" \ - -DSFIZZ_TESTS=OFF \ - -DSFIZZ_SHARED=OFF \ - -DSFIZZ_STATIC_DEPENDENCIES=ON \ - -DCMAKE_CXX_STANDARD=17 \ - .. -make -j2 diff --git a/.travis/script_test_and_build.sh b/.travis/script_test_and_build.sh deleted file mode 100755 index d7b3d6c70..000000000 --- a/.travis/script_test_and_build.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -set -ex - -mkdir build && cd build -cmake -DCMAKE_BUILD_TYPE=Release \ - -DSFIZZ_JACK=ON \ - -DSFIZZ_VST=ON \ - -DSFIZZ_LV2_UI=ON \ - -DSFIZZ_TESTS=ON \ - -DSFIZZ_SHARED=OFF \ - -DSFIZZ_STATIC_DEPENDENCIES=OFF \ - -DSFIZZ_LV2=ON \ - -DCMAKE_CXX_STANDARD=17 \ - .. -make -j2 sfizz_tests -tests/sfizz_tests -make -j2 sfizz_jack -make -j2 sfizz_render -make -j2 sfizz_lv2 -make -j2 sfizz_lv2_ui -make -j2 sfizz_vst3 diff --git a/README.md b/README.md index 97c7b0606..dfbe897a2 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # sfizz -[![Travis Build Status]](https://travis-ci.com/sfztools/sfizz) -[![AppVeyor Build Status]](https://ci.appveyor.com/project/sfztools/sfizz) +![build](https://github.com/sfztools/sfizz/actions/workflows/build.yml/badge.svg) [![Discord Badge Image]](https://discord.gg/3ArE9Mw) [![SFZv1 Status Image]](https://sfz.tools/sfizz/development/status/opcodes/?v=1) diff --git a/scripts/appveyor/after_build.sh b/scripts/appveyor/after_build.sh deleted file mode 100755 index 27718a3f1..000000000 --- a/scripts/appveyor/after_build.sh +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/bash -set -ex - -make DESTDIR=${PWD}/${INSTALL_DIR} install - -# Set bundle icons -# Note: disabled, rejected by the code-sign step -if false; then - bundle_icns=/System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/KEXT.icns - for bundle in sfizz.vst3 sfizz.component sfizz.lv2; do - fileicon set "${INSTALL_DIR}"/"$bundle" "$bundle_icns" - done -fi - -# Perform code-signing -if test -z "${CODESIGN_PASSWORD}"; then - echo "! Secrets not available, skip code-signing" -else - # unlock the keychain - security unlock-keychain -p dummypasswd build.keychain - # code-sign VST3 and dylibs - codesign --sign "${CODESIGN_IDENTITY}" --deep --keychain build.keychain --force --verbose \ - "${INSTALL_DIR}"/sfizz.vst3 - # code-sign AudioUnit and dylibs - codesign --sign "${CODESIGN_IDENTITY}" --deep --keychain build.keychain --force --verbose \ - "${INSTALL_DIR}"/sfizz.component - # code-sign LV2 and dylibs (note: manual, LV2 are not real bundles) - codesign --sign "${CODESIGN_IDENTITY}" --keychain build.keychain --force --verbose \ - "${INSTALL_DIR}"/sfizz.lv2/Contents/Binary/*.so - if ls "${INSTALL_DIR}"/sfizz.lv2/Contents/Frameworks/*.dylib &> /dev/null; then - codesign --sign "${CODESIGN_IDENTITY}" --keychain build.keychain --force --verbose \ - "${INSTALL_DIR}"/sfizz.lv2/Contents/Frameworks/*.dylib - fi - # code-sign Puredata and dylibs - codesign --sign "${CODESIGN_IDENTITY}" --keychain build.keychain --force --verbose \ - "${INSTALL_DIR}"/Puredata/*/*.pd_darwin - if ls "${INSTALL_DIR}"/Puredata/*/*.dylib &> /dev/null; then - codesign --sign "${CODESIGN_IDENTITY}" --keychain build.keychain --force --verbose \ - "${INSTALL_DIR}"/Puredata/*/*.dylib - fi -fi - -# Create the DMG -cat > sfizz-dmg.json << EOF -{ - "title": "sfizz", - "background": "${APPVEYOR_BUILD_FOLDER}/mac/dmg-back.png", - "window": { - "size": { "width": 650, "height": 500 } - }, - "contents": [ - { "x": 100, "y": 50, "type": "file", "path": "${INSTALL_DIR}/sfizz.vst3" }, - { "x": 250, "y": 50, "type": "file", "path": "${INSTALL_DIR}/sfizz.component" }, - { "x": 400, "y": 50, "type": "file", "path": "${INSTALL_DIR}/sfizz.lv2" }, - { "x": 550, "y": 50, "type": "file", "path": "${INSTALL_DIR}/Puredata" }, - { "x": 100, "y": 400, "type": "link", "path": "/Library/Audio/Plug-Ins/VST3" }, - { "x": 250, "y": 400, "type": "link", "path": "/Library/Audio/Plug-Ins/Components" }, - { "x": 400, "y": 400, "type": "link", "path": "/Library/Audio/Plug-Ins/LV2" } - ] -} -EOF -~/node_modules/appdmg/bin/appdmg.js sfizz-dmg.json "${INSTALL_DIR}.dmg" - -# Code-sign the DMG -if test ! -z "${CODESIGN_PASSWORD}"; then - security unlock-keychain -p dummypasswd build.keychain - codesign --sign "${CODESIGN_IDENTITY}" --keychain build.keychain --force --verbose "${INSTALL_DIR}.dmg" -fi - -# Only release a tarball if there is a tag -if [[ ${APPVEYOR_REPO_TAG} ]]; then - mv "${INSTALL_DIR}.dmg" ${APPVEYOR_BUILD_FOLDER} -fi - -cd ${APPVEYOR_BUILD_FOLDER} diff --git a/scripts/appveyor/before_build.sh b/scripts/appveyor/before_build.sh deleted file mode 100644 index 479b10181..000000000 --- a/scripts/appveyor/before_build.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -set -ex - -git submodule update --init --recursive -mkdir -p build/${INSTALL_DIR} && cd build -cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \ - -DSFIZZ_VST=ON \ - -DSFIZZ_AU=ON \ - -DSFIZZ_PUREDATA=ON \ - -DSFIZZ_RENDER=OFF \ - -DSFIZZ_SHARED=OFF \ - -DSFIZZ_TESTS=ON \ - -DCMAKE_CXX_STANDARD=14 \ - -DLV2PLUGIN_INSTALL_DIR=/ \ - -DVSTPLUGIN_INSTALL_DIR=/ \ - -DAUPLUGIN_INSTALL_DIR=/ \ - -DPDPLUGIN_INSTALL_DIR=/Puredata \ - .. diff --git a/scripts/appveyor/install.sh b/scripts/appveyor/install.sh deleted file mode 100644 index 308db4bfb..000000000 --- a/scripts/appveyor/install.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -set -e -# do not `set -x` until after processing the secrets - -# -- secret -- -echo "* Set up code-signing" - -if test -z "${CODESIGN_PASSWORD}"; then - echo "! Secrets not available, skip code-signing" -else - echo "1. Extract PKCS12" - echo "${CODESIGN_P12}" | base64 -D -o codesign.p12 - stat codesign.p12 - echo "2. Extract CA certificate" - echo "${SFZTOOLS_CRT}" | base64 -D -o sfztools.crt - stat sfztools.crt - - echo "3. Create a new keychain" - security create-keychain -p dummypasswd build.keychain - echo "4. Configure the new keychain as default" - security default-keychain -s build.keychain - echo "5. Unlock the new keychain" - security unlock-keychain -p dummypasswd build.keychain - - echo "6. Import the code-signing key pair" - security import codesign.p12 -k build.keychain -P "${CODESIGN_PASSWORD}" -T /usr/bin/codesign - rm -f codesign.p12 - echo "7. Import the trusted CA certificate" - sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain sfztools.crt - rm -f sfztools.crt - - echo "8. Set up the code-signing ACL" - security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k dummypasswd build.keychain - - echo "9. Check the code-signing identity" - security find-identity -p codesigning build.keychain -fi -# -- /secret -- - -set -x - -# -- Install if necessary; only if using external libraries (eg. jack, sndfile) -#brew install dylibbundler - -cd ~; npm install appdmg; cd - -~/node_modules/appdmg/bin/appdmg.js --version From cb2c1e96506572412d1280fedc2c8d6a7dab9c44 Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Mon, 25 Jul 2022 11:01:54 +0200 Subject: [PATCH 4/7] Correct AU bundle vendor; match the other plugins --- plugins/vst/CMakeLists.txt | 2 +- scripts/package-osx-bundles.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/vst/CMakeLists.txt b/plugins/vst/CMakeLists.txt index 635658098..44ac023a8 100644 --- a/plugins/vst/CMakeLists.txt +++ b/plugins/vst/CMakeLists.txt @@ -244,7 +244,7 @@ elseif(SFIZZ_AU) set(SFIZZ_AU_BUNDLE_IDENTIFIER "tools.sfz.sfizz.au") set(SFIZZ_AU_BUNDLE_TYPE "aumu") set(SFIZZ_AU_BUNDLE_SUBTYPE "samp") - set(SFIZZ_AU_BUNDLE_MANUFACTURER "Sfzt") + set(SFIZZ_AU_BUNDLE_MANUFACTURER "Paul Ferrand") math(EXPR SFIZZ_AU_DECIMAL_VERSION "${PROJECT_VERSION_MAJOR}*10000 + ${PROJECT_VERSION_MINOR}*100 + ${PROJECT_VERSION_PATCH}") execute_process( diff --git a/scripts/package-osx-bundles.sh b/scripts/package-osx-bundles.sh index 8d24bf37f..b858f9861 100755 --- a/scripts/package-osx-bundles.sh +++ b/scripts/package-osx-bundles.sh @@ -21,7 +21,7 @@ mv sfizz.vst3 vst3/ pkgbuild \ --identifier "sfz.tools.sfizz.au.bundle" \ - --install-location "/Library/Audio/Plug-Ins/Component/" \ + --install-location "/Library/Audio/Plug-Ins/Components/" \ --root "${PWD}/au/" \ sfz-tools-sfizz-au-bundle.pkg @@ -37,4 +37,4 @@ pkgbuild \ --root "${PWD}/vst3/" \ sfz-tools-sfizz-vst3-bundle.pkg -cd .. \ No newline at end of file +cd .. From 0953936184445432553fa13e6fdb66c7045c5db2 Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Mon, 25 Jul 2022 11:46:19 +0200 Subject: [PATCH 5/7] Correct some clang warnings --- plugins/common/plugin/RMSFollower.h | 2 ++ plugins/editor/src/editor/Editor.cpp | 2 +- plugins/editor/src/editor/GUIHelpers.cpp | 8 +++---- plugins/vst/SfizzVstProcessor.cpp | 28 ++++++++++++------------ src/sfizz/MidiState.cpp | 1 + src/sfizz/parser/Parser.cpp | 2 +- 6 files changed, 23 insertions(+), 20 deletions(-) diff --git a/plugins/common/plugin/RMSFollower.h b/plugins/common/plugin/RMSFollower.h index 77274b92c..10d2f0275 100644 --- a/plugins/common/plugin/RMSFollower.h +++ b/plugins/common/plugin/RMSFollower.h @@ -40,6 +40,8 @@ class RMSFollower { memSize_ = numOutputs % 4 == 0 ? numOutputs * sizeof(float) : (numOutputs / 4 + 1) * 4 * sizeof(float); #ifdef _WIN32 mem_ = (float *)_aligned_malloc(memSize_, 4 * sizeof(float)); +#elif __APPLE__ + mem_ = (float *)malloc(memSize_); // Should be 16 aligned #else mem_ = (float *)aligned_alloc(4 * sizeof(float), memSize_); #endif diff --git a/plugins/editor/src/editor/Editor.cpp b/plugins/editor/src/editor/Editor.cpp index a286981ee..38a6e5c71 100644 --- a/plugins/editor/src/editor/Editor.cpp +++ b/plugins/editor/src/editor/Editor.cpp @@ -1042,7 +1042,7 @@ void Editor::Impl::createFrameContents() return panel; }; - auto createCheckbox = [this, &palette](const CRect& bounds, int tag, const char* label, CHoriTxtAlign, int) { + auto createCheckbox = [this](const CRect& bounds, int tag, const char* label, CHoriTxtAlign, int) { auto* checkbox = new CCheckBox(bounds, this, tag, label); return checkbox; }; diff --git a/plugins/editor/src/editor/GUIHelpers.cpp b/plugins/editor/src/editor/GUIHelpers.cpp index 634101726..e0ab21971 100644 --- a/plugins/editor/src/editor/GUIHelpers.cpp +++ b/plugins/editor/src/editor/GUIHelpers.cpp @@ -25,10 +25,10 @@ class SFrameDisabler::KeyAndMouseHook : public CBaseObject, void onKeyboardEvent(KeyboardEvent& event, CFrame* frame) override; void onMouseEvent(MouseEvent& event, CFrame* frame) override; #else - int32_t onKeyDown(const VstKeyCode&, CFrame*) { return enabled_ ? -1 : 1; } - int32_t onKeyUp(const VstKeyCode&, CFrame*) { return enabled_ ? -1 : 1; } - CMouseEventResult onMouseMoved(CFrame*, const CPoint&, const CButtonState&) { return enabled_ ? kMouseEventNotHandled : kMouseEventHandled; } - CMouseEventResult onMouseDown(CFrame*, const CPoint&, const CButtonState&) { return enabled_ ? kMouseEventNotHandled : kMouseEventHandled; } + int32_t onKeyDown(const VstKeyCode&, CFrame*) override { return enabled_ ? -1 : 1; } + int32_t onKeyUp(const VstKeyCode&, CFrame*) override { return enabled_ ? -1 : 1; } + CMouseEventResult onMouseMoved(CFrame*, const CPoint&, const CButtonState&) override { return enabled_ ? kMouseEventNotHandled : kMouseEventHandled; } + CMouseEventResult onMouseDown(CFrame*, const CPoint&, const CButtonState&) override { return enabled_ ? kMouseEventNotHandled : kMouseEventHandled; } #endif private: diff --git a/plugins/vst/SfizzVstProcessor.cpp b/plugins/vst/SfizzVstProcessor.cpp index 7df8689d3..115bf47f7 100644 --- a/plugins/vst/SfizzVstProcessor.cpp +++ b/plugins/vst/SfizzVstProcessor.cpp @@ -655,44 +655,44 @@ bool SfizzVstProcessor::processUpdate(FUnknown* changedUnknown, int32 message) } if (OSCUpdate* update = FCast(changedUnknown)) { - if (IPtr message = update->convertToMessage(this)) - sendMessage(message); + if (IPtr msg = update->convertToMessage(this)) + sendMessage(msg); return true; } if (PlayStateUpdate* update = FCast(changedUnknown)) { - if (IPtr message = update->convertToMessage(this)) - sendMessage(message); + if (IPtr msg = update->convertToMessage(this)) + sendMessage(msg); return true; } if (NoteUpdate* update = FCast(changedUnknown)) { - if (IPtr message = update->convertToMessage(this)) - sendMessage(message); + if (IPtr msg = update->convertToMessage(this)) + sendMessage(msg); return true; } if (SfzUpdate* update = FCast(changedUnknown)) { - if (IPtr message = update->convertToMessage(this)) - sendMessage(message); + if (IPtr msg = update->convertToMessage(this)) + sendMessage(msg); return true; } if (SfzDescriptionUpdate* update = FCast(changedUnknown)) { - if (IPtr message = update->convertToMessage(this)) - sendMessage(message); + if (IPtr msg = update->convertToMessage(this)) + sendMessage(msg); return true; } if (ScalaUpdate* update = FCast(changedUnknown)) { - if (IPtr message = update->convertToMessage(this)) - sendMessage(message); + if (IPtr msg = update->convertToMessage(this)) + sendMessage(msg); return true; } if (AutomationUpdate* update = FCast(changedUnknown)) { - if (IPtr message = update->convertToMessage(this)) - sendMessage(message); + if (IPtr msg = update->convertToMessage(this)) + sendMessage(msg); return true; } diff --git a/src/sfizz/MidiState.cpp b/src/sfizz/MidiState.cpp index b1992f26c..354750c08 100644 --- a/src/sfizz/MidiState.cpp +++ b/src/sfizz/MidiState.cpp @@ -300,6 +300,7 @@ int sfz::MidiState::getProgram() const noexcept void sfz::MidiState::programChangeEvent(int delay, int program) noexcept { + UNUSED(delay); ASSERT(program >= 0 && program <= 127); currentProgram = program; } diff --git a/src/sfizz/parser/Parser.cpp b/src/sfizz/parser/Parser.cpp index f8ffa9338..26911739d 100644 --- a/src/sfizz/parser/Parser.cpp +++ b/src/sfizz/parser/Parser.cpp @@ -293,7 +293,7 @@ void Parser::processOpcode() // If we're parsing a base64 data field, ignore comments and process until the next header/directive if (nameExpanded == "base64data") { std::string valueRaw; - reader.extractWhile(&valueRaw, [&reader](char c) { + reader.extractWhile(&valueRaw, [&](char c) { if (c == '<' || c == '#') return false; From dd0d3b232771f9b32d6606b351a5ea2bb1b5b9d0 Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Mon, 25 Jul 2022 10:42:29 +0200 Subject: [PATCH 6/7] Fix macos tests and run them in CI --- .github/workflows/build.yml | 22 ++++++++++++++++++---- src/sfizz/simd/HelpersSSE.cpp | 2 +- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 967141ff3..9f503aa76 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,9 +80,12 @@ jobs: shell: bash working-directory: ${{runner.workspace}}/build run: cmake --build . --config "$BUILD_TYPE" -j 2 --target sfizz_tests - - name: Test + - name: Run tests shell: bash run: ${{runner.workspace}}/build/tests/sfizz_tests + # Reenable with newer cmakes + # working-directory: ${{runner.workspace}}/build + # run: ctest -j 2 -C "$BUILD_TYPE" --output-on-failure - name: Build all shell: bash working-directory: ${{runner.workspace}}/build @@ -117,19 +120,30 @@ jobs: working-directory: ${{runner.workspace}}/build run: | cmake "$GITHUB_WORKSPACE" \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \ -DSFIZZ_AU=ON \ -DSFIZZ_LV2=ON \ -DSFIZZ_LV2_UI=ON \ -DSFIZZ_VST=ON \ -DSFIZZ_JACK=OFF \ - -DSFIZZ_TESTS=OFF \ + -DSFIZZ_TESTS=ON \ -DSFIZZ_SHARED=OFF \ -DSFIZZ_STATIC_DEPENDENCIES=OFF + - name: Build tests + shell: bash + working-directory: ${{runner.workspace}}/build + run: | + cmake --build . --config "$BUILD_TYPE" -j 2 --target sfizz_tests + - name: Run tests + shell: bash + run: ${{runner.workspace}}/build/tests/sfizz_tests + # Reenable with newer cmakes + # working-directory: ${{runner.workspace}}/build + # run: ctest -j 2 -C "$BUILD_TYPE" --output-on-failure - name: Build plugins shell: bash working-directory: ${{runner.workspace}}/build - run: cmake --build . --config "Release" -j 2 + run: cmake --build . --config "$BUILD_TYPE" -j 2 - name: Package OSX bundles shell: bash working-directory: ${{runner.workspace}} diff --git a/src/sfizz/simd/HelpersSSE.cpp b/src/sfizz/simd/HelpersSSE.cpp index 3a9d65c4a..a9d4ca9c4 100644 --- a/src/sfizz/simd/HelpersSSE.cpp +++ b/src/sfizz/simd/HelpersSSE.cpp @@ -108,7 +108,7 @@ void gainSSE(const float* gain, const float* input, float* output, unsigned size #if SFIZZ_HAVE_SSE2 const auto* lastAligned = prevAligned(sentinel); - while (unaligned(input, output) && output < lastAligned) + while (unaligned(input, output, gain) && output < lastAligned) *output++ = (*gain++) * (*input++); while (output < lastAligned) { From f2f37d73b040856e91260034a17ef9d221cd8dc5 Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Mon, 25 Jul 2022 13:32:37 +0200 Subject: [PATCH 7/7] Correct plugin descriptions/versions --- cmake/VSTConfig.cmake | 2 +- plugins/vst/CMakeLists.txt | 5 +++-- plugins/vst/mac/Info.au.plist | 2 +- plugins/vst/mac/audiounitconfig.h.in | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cmake/VSTConfig.cmake b/cmake/VSTConfig.cmake index 8d23c1df1..a2dde6dd0 100644 --- a/cmake/VSTConfig.cmake +++ b/cmake/VSTConfig.cmake @@ -1,5 +1,5 @@ set(VSTPLUGIN_NAME "sfizz") -set(VSTPLUGIN_VENDOR "Paul Ferrand") +set(VSTPLUGIN_VENDOR "SFZTools") set(VSTPLUGIN_URL "http://sfztools.github.io/sfizz") set(VSTPLUGIN_EMAIL "paul@ferrand.cc") diff --git a/plugins/vst/CMakeLists.txt b/plugins/vst/CMakeLists.txt index 44ac023a8..fe64f50c9 100644 --- a/plugins/vst/CMakeLists.txt +++ b/plugins/vst/CMakeLists.txt @@ -244,9 +244,10 @@ elseif(SFIZZ_AU) set(SFIZZ_AU_BUNDLE_IDENTIFIER "tools.sfz.sfizz.au") set(SFIZZ_AU_BUNDLE_TYPE "aumu") set(SFIZZ_AU_BUNDLE_SUBTYPE "samp") - set(SFIZZ_AU_BUNDLE_MANUFACTURER "Paul Ferrand") + set(SFIZZ_AU_BUNDLE_MANUFACTURER "sfzt") + set(SFIZZ_AU_BUNDLE_AUTHOR "SFZTools") math(EXPR SFIZZ_AU_DECIMAL_VERSION - "${PROJECT_VERSION_MAJOR}*10000 + ${PROJECT_VERSION_MINOR}*100 + ${PROJECT_VERSION_PATCH}") + "${PROJECT_VERSION_MAJOR}*256*256 + ${PROJECT_VERSION_MINOR}*256 + ${PROJECT_VERSION_PATCH}") execute_process( COMMAND "sh" "-c" "echo 'obase=16;${SFIZZ_AU_DECIMAL_VERSION}' | bc" OUTPUT_VARIABLE SFIZZ_AU_HEXADECIMAL_VERSION diff --git a/plugins/vst/mac/Info.au.plist b/plugins/vst/mac/Info.au.plist index 44dd255f3..f0a80fd2c 100644 --- a/plugins/vst/mac/Info.au.plist +++ b/plugins/vst/mac/Info.au.plist @@ -30,7 +30,7 @@ manufacturer @SFIZZ_AU_BUNDLE_MANUFACTURER@ name - @SFIZZ_AU_BUNDLE_MANUFACTURER@: @PROJECT_NAME@ + @SFIZZ_AU_BUNDLE_AUTHOR@: @PROJECT_NAME@ sandboxSafe type diff --git a/plugins/vst/mac/audiounitconfig.h.in b/plugins/vst/mac/audiounitconfig.h.in index a6fb289fe..0207e5851 100644 --- a/plugins/vst/mac/audiounitconfig.h.in +++ b/plugins/vst/mac/audiounitconfig.h.in @@ -1,12 +1,12 @@ #define kAudioUnitBundleIdentifier @SFIZZ_AU_BUNDLE_IDENTIFIER@ #define kAudioUnitVersion 0x@SFIZZ_AU_HEXADECIMAL_VERSION@ -#define kAUPluginName @SFIZZ_AU_BUNDLE_MANUFACTURER@: @PROJECT_NAME@ +#define kAUPluginName @SFIZZ_AU_BUNDLE_AUTHOR@: @PROJECT_NAME@ #define kAUPluginDescription @PROJECT_NAME@ #define kAUPluginType @SFIZZ_AU_BUNDLE_TYPE@ #define kAUPluginSubType @SFIZZ_AU_BUNDLE_SUBTYPE@ #define kAUPluginManufacturer @SFIZZ_AU_BUNDLE_MANUFACTURER@ -#define kAudioUnitName "@SFIZZ_AU_BUNDLE_MANUFACTURER@: @PROJECT_NAME@" +#define kAudioUnitName "@SFIZZ_AU_BUNDLE_AUTHOR@: @PROJECT_NAME@" #define kAudioUnitDescription "@PROJECT_NAME@" #define kAudioUnitType '@SFIZZ_AU_BUNDLE_TYPE@' #define kAudioUnitComponentSubType '@SFIZZ_AU_BUNDLE_SUBTYPE@'