export OBJC=gcc-4.0
export CXX=g++-4.0
;;
- 10.5|10.6|10.7|10.8)
+ 10.5|10.6|10.7|10.8|10.9|10.10)
SDKROOT="${DEVELOPER_SDKS}/MacOSX${SDKROOT}.sdk"
;;
*)
LyXVersionSuffix=${LyXVersionSuffix:-$(echo "${LyXVersion}" | cut -d. -f1-2)}
case "${LyXVersion}" in
*dev*)
- LyXGitCommitHash=$(cd "${LyxSourceDir}" ; git log -1 --pretty=format:%H)
+ LyXGitCommitHash=$(cd "${LyxSourceDir}" ; git log -1 --pretty=format:%h)
;;
esac
;;
esac
-DMGNAME="${LyxBase}"
+DMGNAME="${LyxBase}${LyXGitCommitHash:+-}${LyXGitCommitHash}"
DMGSIZE="550m"
# Check for existing SDKs
CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"
LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"
- if [ -n "${LyXGitCommitHash}" ]; then
- CPPFLAGS="${CPPFLAGS} -DLYX_GIT_COMMIT_HASH='${LyXGitCommitHash}'"
- fi
-
if [ "$configure_qt_frameworks" = "yes" ]; then
export QT_CORE_CFLAGS="-FQtCore"
export QT_CORE_LIBS="-framework QtCore"
hdiutil create -type SPARSE -size ${DMGSIZE:-"250m"} -fs HFS+ -volname "${LyxBase}" "${DMGNAME}"
# Unmount currently mounted disk image
- test -d /Volumes/"${LyxBase}" && umount /Volumes/"${LyxBase}"
+ mount | grep "${LyxBase}" && umount /Volumes/"${LyxBase}"
+ test -d /Volumes/"${LyxBase}" && rmdir /Volumes/"${LyxBase}"
# Mount the disk image
hdiutil attach "${DMGNAME}.sparseimage"