forked from osmocom/wireshark
macOS: Name our .dmgs according to our architecture.
In osx-dmg.sh, add "ARM 64" or "Intel 64" to our .dmg name depending on the architecture of Wireshark.app/Contents/MacOS/Wireshark.
This commit is contained in:
parent
f4e18241b9
commit
a714805628
|
@ -8,7 +8,7 @@ set -e
|
||||||
dmgbuild="@DMGBUILD_EXECUTABLE@"
|
dmgbuild="@DMGBUILD_EXECUTABLE@"
|
||||||
version="@VERSION@"
|
version="@VERSION@"
|
||||||
settings_file="@CMAKE_BINARY_DIR@/packaging/macosx/dmgbuild-settings.py"
|
settings_file="@CMAKE_BINARY_DIR@/packaging/macosx/dmgbuild-settings.py"
|
||||||
architecture="Intel 64"
|
architecture=""
|
||||||
|
|
||||||
# Help message
|
# Help message
|
||||||
#----------------------------------------------------------
|
#----------------------------------------------------------
|
||||||
|
@ -34,6 +34,15 @@ if [ ! -x "$dmgbuild" ] ; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if lipo Wireshark.app/Contents/MacOS/Wireshark -verify_arch arm64e ; then
|
||||||
|
architecture="ARM 64"
|
||||||
|
elif lipo Wireshark.app/Contents/MacOS/Wireshark -verify_arch x86_64 ; then
|
||||||
|
architecture="Intel 64"
|
||||||
|
else
|
||||||
|
echo "Error: Wireshark.app missing or has unknown architecture."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
# Parse command line arguments
|
# Parse command line arguments
|
||||||
while [ "$1" != "" ]
|
while [ "$1" != "" ]
|
||||||
do
|
do
|
||||||
|
|
Loading…
Reference in New Issue