ardour/livetrax
13
0
Fork 0
Code

The return of the -x86_64 suffix for macOS DMG

Browse Source 
We previously dropped it when we discontinued 32bit builds.
But now that we have -arm64, it is only consistent.
This commit is contained in:
Robin Gareus 2023-10-09 20:42:27 +02:00
parent 5a7f750e7c
commit bb211564a8
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tools/osx_packaging/osx_build
View File

@ -655,29 +655,33 @@ if file ${PRODUCT_PKG_DIR}/$APPROOT/MacOS/$MAIN_EXECUTABLE | grep -q x86_64; the
OSX_X42URI=x42-plugins.com/x42/osx OSX_X42URI=x42-plugins.com/x42/osx
OSX_X42ID=osx OSX_X42ID=osx
OSX_BENSID=osx64 OSX_BENSID=osx64
TXZ_ARCH="osx" # harvid HARVID_ARCH="osx"
DMG_ARCH="" # Jadeo XJADEO_ARCH=""
ARDOUR_ARCH="-x86_64"
elif file ${PRODUCT_PKG_DIR}/$APPROOT/MacOS/$MAIN_EXECUTABLE | grep -q ppc; then elif file ${PRODUCT_PKG_DIR}/$APPROOT/MacOS/$MAIN_EXECUTABLE | grep -q ppc; then
OSX_ARCH=ppc OSX_ARCH=ppc
OSX_X42URI=x42-plugins.com/x42/osx OSX_X42URI=x42-plugins.com/x42/osx
OSX_X42ID=osx OSX_X42ID=osx
OSX_BENSID=osxppc OSX_BENSID=osxppc
TXZ_ARCH="osx" HARVID_ARCH="osx"
DMG_ARCH="" XJADEO_ARCH=""
ARDOUR_ARCH=""
elif file ${PRODUCT_PKG_DIR}/$APPROOT/MacOS/$MAIN_EXECUTABLE | grep -q arm64; then elif file ${PRODUCT_PKG_DIR}/$APPROOT/MacOS/$MAIN_EXECUTABLE | grep -q arm64; then
OSX_ARCH=arm64 OSX_ARCH=arm64
OSX_X42URI=x42-plugins.com/x42/mac OSX_X42URI=x42-plugins.com/x42/mac
OSX_X42ID="macOS" OSX_X42ID="macOS"
OSX_BENSID=macarm64 OSX_BENSID=macarm64
TXZ_ARCH="macOS-arm64" HARVID_ARCH="macOS-arm64"
DMG_ARCH="-arm64" XJADEO_ARCH="-arm64"
ARDOUR_ARCH="-arm64"
else else
OSX_ARCH=i386 OSX_ARCH=i386
OSX_X42URI=x42-plugins.com/x42/osx OSX_X42URI=x42-plugins.com/x42/osx
OSX_X42ID=osx OSX_X42ID=osx
OSX_BENSID=osx32 OSX_BENSID=osx32
TXZ_ARCH="osx" HARVID_ARCH="osx"
DMG_ARCH="" XJADEO_ARCH=""
ARDOUR_ARCH="-i386"
fi fi
if test x$WITH_HARRISON_LV2 != x ; then if test x$WITH_HARRISON_LV2 != x ; then
@ -705,18 +709,18 @@ if test x$WITH_HARVID != x ; then
echo "copying harvid and xjadeo ..." echo "copying harvid and xjadeo ..."
rsync -Pa \ rsync -Pa \
rsync://ardour.org/video-tools/harvid-${TXZ_ARCH}-${HARVID_VERSION}.tgz \ rsync://ardour.org/video-tools/harvid-${HARVID_ARCH}-${HARVID_VERSION}.tgz \
"$CACHEDIR/harvid-${TXZ_ARCH}-${HARVID_VERSION}.tgz" "$CACHEDIR/harvid-${HARVID_ARCH}-${HARVID_VERSION}.tgz"
rsync -Pa \ rsync -Pa \
rsync://ardour.org/video-tools/jadeo${DMG_ARCH}-${XJADEO_VERSION:1}.dmg \ rsync://ardour.org/video-tools/jadeo${XJADEO_ARCH}-${XJADEO_VERSION:1}.dmg \
"$CACHEDIR/jadeo${DMG_ARCH}-${XJADEO_VERSION:1}.dmg" "$CACHEDIR/jadeo${XJADEO_ARCH}-${XJADEO_VERSION:1}.dmg"
tar -x -z \ tar -x -z \
-C $PRODUCT_PKG_DIR/$APPROOT \ -C $PRODUCT_PKG_DIR/$APPROOT \
-f "$CACHEDIR/harvid-${TXZ_ARCH}-${HARVID_VERSION}.tgz" || exit 1 -f "$CACHEDIR/harvid-${HARVID_ARCH}-${HARVID_VERSION}.tgz" || exit 1
JADEO=$(hdiutil attach "$CACHEDIR/jadeo${DMG_ARCH}-${XJADEO_VERSION:1}.dmg" | grep Apple_HFS | grep dev/ | cut -f 3) JADEO=$(hdiutil attach "$CACHEDIR/jadeo${XJADEO_ARCH}-${XJADEO_VERSION:1}.dmg" | grep Apple_HFS | grep dev/ | cut -f 3)
cp -r "${JADEO}/Jadeo.app" "$PRODUCT_PKG_DIR/" cp -r "${JADEO}/Jadeo.app" "$PRODUCT_PKG_DIR/"
hdiutil detach "${JADEO}" hdiutil detach "${JADEO}"
@ -1030,7 +1034,7 @@ if [ x$DEBUG$FREEBI = xTT ]; then
BUILDTYPE="-demo-dbg" BUILDTYPE="-demo-dbg"
fi fi
UC_DMG=$APPNAME-$release_version${BUILDTYPE}${DMG_ARCH}.dmg UC_DMG=$APPNAME-$release_version${BUILDTYPE}${ARDOUR_ARCH}.dmg
VOLNAME=$APPNAME-$release_version VOLNAME=$APPNAME-$release_version