From dcf7a407c14214a85941d3759ff759b5bdec4ccc Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 24 Jul 2015 19:03:08 +0200 Subject: [PATCH] tweak OSX packaging --- tools/osx_packaging/osx_build | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 72234dcf89..a60633e674 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -620,7 +620,7 @@ if test x$WITH_HARVID != x ; then HVLIBS=${PRODUCT_PKG_DIR}/$APPROOT/lib/harvid for file in ${XJCONTENT}/MacOS/Jadeo-bin ${XJCONTENT}/Frameworks/*.dylib ${HVLIBS}/*.dylib ${PRODUCT_PKG_DIR}/$APPROOT/MacOS/*harvid* ; do - lipo -thin ${OSX_ARCH} ${file} -output ${file}.thin + lipo -extract_family ${OSX_ARCH} ${file} -output ${file}.thin && \ mv ${file}.thin ${file} done @@ -709,9 +709,8 @@ TMPDMG="${TMPDMG}.dmg" trap "rm -rf $MNTPATH $TMPDMG ${TMPDMG}.dmg $ICNSTMP" EXIT -hdiutil create -megabytes $DMGMEGABYTES "$TMPDMG" +hdiutil create -megabytes $DMGMEGABYTES -fs HFS+ -volname "${VOLNAME}" "$TMPDMG" DiskDevice=$(hdid -nomount "$TMPDMG" | grep Apple_HFS | cut -f 1 -d ' ') -newfs_hfs -v "${VOLNAME}" "${DiskDevice}" mount -t hfs -o nobrowse "${DiskDevice}" "${MNTPATH}" cp -r ${PRODUCT_PKG_DIR}/* "${MNTPATH}" || exit