Browse Source

Fix macOS installer for systems without rosetta2

Signed-off-by: falkTX <falktx@falktx.com>
tags/22.06
falkTX 2 weeks ago
parent
commit
31f8436494
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 8 additions and 2 deletions
  1. +4
    -0
      .github/workflows/build.yml
  2. +3
    -1
      utils/create-macos-installer.sh
  3. +1
    -1
      utils/macOS/package.xml.in

+ 4
- 0
.github/workflows/build.yml View File

@@ -454,6 +454,8 @@ jobs:
pushd jucewrapper/build; cmake -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.8 -DCMAKE_BUILD_TYPE=Release .. && make VERBOSE=1 -j $(sysctl -n hw.logicalcpu); popd
mv jucewrapper/build/*_artefacts/Release/AU/*.component bin/
- name: Build macOS intel (packaging)
env:
MACOS_ARCHS: 'x86_64'
run: |
pushd deps/PawPaw; source local.env macos; popd
./utils/create-macos-installer.sh
@@ -542,6 +544,8 @@ jobs:
pushd jucewrapper/build; cmake -DCMAKE_OSX_ARCHITECTURES='arm64;x86_64' -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DCMAKE_BUILD_TYPE=Release .. && make VERBOSE=1 -j $(sysctl -n hw.logicalcpu); popd
mv jucewrapper/build/*_artefacts/Release/AU/*.component bin/
- name: Build macOS universal (packaging)
env:
MACOS_ARCHS: 'arm64,x86_64'
run: |
pushd deps/PawPaw; source local.env macos-universal; popd
./utils/create-macos-installer.sh


+ 3
- 1
utils/create-macos-installer.sh View File

@@ -57,7 +57,9 @@ pkgbuild \

cd ..

sed -e "s|@builddir@|${PWD}/build|" utils/macOS/package.xml.in > build/package.xml
sed -e "s|@builddir@|${PWD}/build|" \
-e "s|@buildarchs@|${MACOS_ARCHS}|" \
utils/macOS/package.xml.in > build/package.xml

productbuild \
--distribution build/package.xml \


+ 1
- 1
utils/macOS/package.xml.in View File

@@ -3,7 +3,7 @@
<title>Cardinal</title>
<domains enable_anywhere="false" enable_currentUserHome="false" enable_localSystem="true" />
<license file="@builddir@/../LICENSE" mime-type="text/plain" />
<options customize="always" hostArchitectures="x86_64" require-scripts="false" rootVolumeOnly="true" />
<options customize="always" hostArchitectures="@buildarchs@" require-scripts="false" rootVolumeOnly="true" />
<pkg-ref id="studio.kx.distrho.cardinal" />
<welcome file="@builddir@/../utils/macOS/welcome.txt" mime-type="text/plain" />
<choice id="studio.kx.distrho.cardinal-res" title="Resources" description="Install resources" visible="false">


Loading…
Cancel
Save