brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix macOS installer for systems without rosetta2

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-06-17 22:39:35 +01:00
parent d4e1ae6a45
commit 31f8436494
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/build.yml vendored
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 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/ mv jucewrapper/build/*_artefacts/Release/AU/*.component bin/
- name: Build macOS intel (packaging) - name: Build macOS intel (packaging)
env:
MACOS_ARCHS: 'x86_64'
run: | run: |
pushd deps/PawPaw; source local.env macos; popd pushd deps/PawPaw; source local.env macos; popd
./utils/create-macos-installer.sh ./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 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/ mv jucewrapper/build/*_artefacts/Release/AU/*.component bin/
- name: Build macOS universal (packaging) - name: Build macOS universal (packaging)
env:
MACOS_ARCHS: 'arm64,x86_64'
run: | run: |
pushd deps/PawPaw; source local.env macos-universal; popd pushd deps/PawPaw; source local.env macos-universal; popd
./utils/create-macos-installer.sh ./utils/create-macos-installer.sh

4
utils/create-macos-installer.sh
View file

@ -57,7 +57,9 @@ pkgbuild \
cd .. 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 \ productbuild \
--distribution build/package.xml \ --distribution build/package.xml \

2
utils/macOS/package.xml.in
View file

@ -3,7 +3,7 @@
<title>Cardinal</title> <title>Cardinal</title>
<domains enable_anywhere="false" enable_currentUserHome="false" enable_localSystem="true" /> <domains enable_anywhere="false" enable_currentUserHome="false" enable_localSystem="true" />
<license file="@builddir@/../LICENSE" mime-type="text/plain" /> <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" /> <pkg-ref id="studio.kx.distrho.cardinal" />
<welcome file="@builddir@/../utils/macOS/welcome.txt" mime-type="text/plain" /> <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"> <choice id="studio.kx.distrho.cardinal-res" title="Resources" description="Install resources" visible="false">