From f6cc3c4c662771d76355f876dd6e0317b890676b Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Wed, 9 Apr 2014 14:58:49 +0200 Subject: [PATCH] Build mono client packages on Mac OS X When deploying on Mac OS X, also build a disk image (dmg) for the mono client. Also updated cmake files for OS X 10.8. --- cmake/QuasselCompileSettings.cmake | 5 ++--- scripts/build/macosx_makePackage.sh | 32 ++++++++++++++++++----------- src/CMakeLists.txt | 2 ++ 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/cmake/QuasselCompileSettings.cmake b/cmake/QuasselCompileSettings.cmake index 1fc81610..bf2e4ea9 100644 --- a/cmake/QuasselCompileSettings.cmake +++ b/cmake/QuasselCompileSettings.cmake @@ -65,7 +65,6 @@ endif() # Mac build stuff if(APPLE AND DEPLOY) set(CMAKE_OSX_ARCHITECTURES "x86_64") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.6") - set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.6.sdk/") - add_definitions(-DMAC_10_6_SDK) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.8") + set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk") endif() diff --git a/scripts/build/macosx_makePackage.sh b/scripts/build/macosx_makePackage.sh index 646f8a10..007d3f22 100755 --- a/scripts/build/macosx_makePackage.sh +++ b/scripts/build/macosx_makePackage.sh @@ -51,19 +51,27 @@ if [[ ! -n $2 ]]; then fi WORKINGDIR="${WORKINGDIR}/" PACKAGETMPDIR="${WORKINGDIR}PACKAGE_TMP_DIR_${BUILDTYPE}" -if [[ $BUILDTYPE = "Core" ]] || [[ $BUILDTYPE = "Client" ]]; then - QUASSEL_DMG="Quassel${BUILDTYPE}_MacOSX-x86_64_${QUASSEL_VERSION}.dmg" - mkdir $PACKAGETMPDIR - if [[ $BUILDTYPE = "Client" ]]; then +QUASSEL_DMG="Quassel${BUILDTYPE}_MacOSX-x86_64_${QUASSEL_VERSION}.dmg" + +mkdir $PACKAGETMPDIR +case $BUILDTYPE in +"Client") cp -r ${WORKINGDIR}Quassel\ Client.app ${PACKAGETMPDIR}/ ${SCRIPTDIR}/macosx_DeployApp.py "${PACKAGETMPDIR}/Quassel Client.app" - else + ;; +"Core") cp ${WORKINGDIR}quasselcore ${PACKAGETMPDIR}/ ${SCRIPTDIR}/macosx_DeployApp.py --nobundle ${PACKAGETMPDIR} - fi - #hdiutil create -srcfolder ${PACKAGETMPDIR} -format UDBZ -volname "Quassel ${BUILDTYPE} - ${QUASSEL_VERSION}" "${WORKINGDIR}Quassel${BUILDTYPE}_MacOSX-universal_${QUASSEL_VERSION}.dmg" >/dev/null - hdiutil create -srcfolder ${PACKAGETMPDIR} -format UDBZ -volname "Quassel ${BUILDTYPE} - ${QUASSEL_VERSION}" "${WORKINGDIR}${QUASSEL_DMG}" >/dev/null - rm -rf ${PACKAGETMPDIR} -else - echo >&2 "Valid parameters are \"Client\" or \"Core\"" -fi + ;; +"Mono") + cp -r ${WORKINGDIR}Quassel.app ${PACKAGETMPDIR}/ + ${SCRIPTDIR}/macosx_DeployApp.py "${PACKAGETMPDIR}/Quassel.app" + ;; +*) + echo >&2 "Valid parameters are \"Client\", \"Core\", or \"Mono\"." + rmdir ${PACKAGETMPDIR} + exit 1 + ;; +esac +hdiutil create -srcfolder ${PACKAGETMPDIR} -format UDBZ -volname "Quassel ${BUILDTYPE} - ${QUASSEL_VERSION}" "${WORKINGDIR}${QUASSEL_DMG}" >/dev/null +rm -rf ${PACKAGETMPDIR} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a644934f..59facd84 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -85,5 +85,7 @@ if(APPLE) COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Client ..) add_custom_command(TARGET quasselcore POST_BUILD COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Core ..) + add_custom_command(TARGET quasselcore POST_BUILD + COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Mono ..) endif(DEPLOY) endif(APPLE) -- 2.20.1